Merge pull request discord-jda#710 from DV8FromTheWorld/release/3.7.0

Release 3.7.0

Author: MinnDevelopment

.editorconfig

@@ -2,13 +2,11 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = crlf
 insert_final_newline = true
+indent_style = space
+indent_size = 4
 
 [gradlew]
 end_of_line = lf
-
-[*.{java, md, gradle, properties}]
-charset = utf-8
-indent_style = space
-indent_size = 4

.gitattributes

@@ -1,8 +1,7 @@
 # Preserve gradlew's line ending
-.gitattributes text eol=crlf
-
 gradlew binary
 
+.git* text eol=crlf
 *.java text eol=crlf
 *.gradle text eol=crlf
 *.bat text eol=crlf

README.md

@@ -172,6 +172,20 @@ Be sure to replace the **VERSION** key below with the one of the versions shown
 
 ```
 
+**Maven without Audio**
+```xml
+<dependency>
+    <groupId>net.dv8tion</groupId>
+    <artifactId>JDA</artifactId>
+    <version>VERSION</version>
+    <exclusions>
+        <exclusion>
+            <artifactId>opus-java</artifactId>
+        </exclusion>
+    </exclusions>
+</dependency>
+```
+
 **Gradle**
 ```gradle
 dependencies {
@@ -183,8 +197,26 @@ repositories {
 }
 ```
 
+**Gradle without Audio**
+```gradle
+dependencies {
+    compile ('net.dv8tion:JDA:VERSION') {
+        exclude module: 'opus-java'
+    }
+}
+```
+
 The builds are distributed using JCenter through Bintray [JDA JCenter Bintray](https://bintray.com/dv8fromtheworld/maven/JDA/)
 
+If you do not need any opus de-/encoding done by JDA (voice receive/send with PCM) you can exclude `opus-java` entirely.
+This can be done if you only send audio with an `AudioSendHandler` which only sends opus (`isOpus() = true`). (See [lavaplayer](https://github.com/sedmelluq/lavaplayer))
+
+If you want to use a custom opus library you can provide the absolute path to `OpusLibrary.loadFrom(String)` before using
+the audio api of JDA. This works without `opus-java-natives` as it only requires `opus-java-api`.
+<br>_For this setup you should only exclude `opus-java-natives` as `opus-java-api` is a requirement for en-/decoding._
+
+See [opus-java](https://github.com/discord-java/opus-java)
+
 ### Logging Framework - SLF4J
 JDA is using [SLF4J](https://www.slf4j.org/) to log its messages.
 
@@ -303,10 +335,6 @@ All dependencies are managed automatically by Gradle.
    * Version: **20160810**
    * [Github](https://github.com/douglascrockford/JSON-java)
    * [JCenter Repository](https://bintray.com/bintray/jcenter/org.json%3Ajson/view)
- * JNA
-   * Version: **4.4.0**
-   * [Github](https://github.com/java-native-access/jna)
-   * [JCenter Repository](https://bintray.com/bintray/jcenter/net.java.dev.jna%3Ajna/view)
  * Trove4j
    * Version: **3.0.3**
    * [BitBucket](https://bitbucket.org/trove4j/trove)
@@ -315,6 +343,10 @@ All dependencies are managed automatically by Gradle.
    * Version: **1.7.25**
    * [Website](https://www.slf4j.org/)
    * [JCenter Repository](https://bintray.com/bintray/jcenter/org.slf4j%3Aslf4j-api/view)
+ * opus-java
+   * Version: **1.0.2**
+   * [GitHub](https://github.com/discord-java/opus-java)
+   * [JCenter Repository](https://bintray.com/minndevelopment/maven/opus-java)
 
 ## Related Projects
 
@@ -323,4 +355,4 @@ All dependencies are managed automatically by Gradle.
 - [discord.py](https://github.com/Rapptz/discord.py)
 - [serenity](https://github.com/zeyla/serenity)
 
-**See also:** https://discordapp.com/developers/docs/topics/libraries
+**See also:** https://discordapp.com/developers/docs/topics/community-resources#libraries

build.gradle

@@ -18,6 +18,7 @@
 //to build and upload everything:  "gradlew bintrayUpload"
 
 import org.apache.tools.ant.filters.ReplaceTokens
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id 'com.jfrog.bintray' version '1.7.3'
@@ -28,7 +29,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '2.0.1'
 }
 
-def versionObj = new Version(major: 3, minor: 6, revision: 0)
+def versionObj = new Version(major: 3, minor: 7, revision: 0)
 
 group = "net.dv8tion"
 archivesBaseName = "JDA"
@@ -61,10 +62,10 @@ dependencies {
     compile 'net.sf.trove4j:trove4j:3.0.3'
 
     //Native Library Support
-    compile 'net.java.dev.jna:jna:4.4.0'
+    compile 'club.minnced:opus-java:1.0.2'
 
     //Web Connection Support
-    compile 'com.neovisionaries:nv-websocket-client:2.2'
+    compile 'com.neovisionaries:nv-websocket-client:2.4'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
 
     //Sets the dependencies for the examples
@@ -101,7 +102,22 @@ jar {
 }
 
 shadowJar {
-    classifier = "withDependencies"
+    classifier = 'withDependencies'
+}
+
+task noOpusJar(type: ShadowJar, dependsOn: shadowJar) {
+    classifier = shadowJar.classifier + '-no-opus'
+
+    configurations = [project.configurations.runtime]
+    from sourceSets.main.output
+    exclude 'natives/**'     // ~2 MB
+    exclude 'com/sun/jna/**' // ~1 MB
+    exclude 'club/minnced/opus/util/*'
+    exclude 'tomp2p/opuswrapper/*'
+
+    manifest {
+        inheritFrom jar.manifest
+    }
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -147,14 +163,9 @@ javadoc {
             'net/dv8tion/jda/core/requests/Route.java',
             'net/dv8tion/jda/core/requests/Requester.java',
             'net/dv8tion/jda/core/requests/Response.java',
-            'net/dv8tion/jda/core/requests/ratelimit',
-            'net/dv8tion/jda/core/requests/restaction/CompletedFuture.java',
-            'net/dv8tion/jda/core/requests/restaction/RequestFuture.java')
+            'net/dv8tion/jda/core/requests/ratelimit')
     exclude('net/dv8tion/jda/core/utils/cache/impl')
 
-    //opuswrapper
-    exclude('tomp2p/opuswrapper')
-
     //voice crypto
     exclude('com/iwebpp/crypto')
 }
@@ -199,16 +210,15 @@ String getProjectProperty(String propertyName)
     return property
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.2.1'
-}
+wrapper.gradleVersion = '4.6'
 
 build {
     dependsOn clean
     dependsOn jar
     dependsOn javadocJar
     dependsOn sourcesJar
     dependsOn shadowJar
+    dependsOn noOpusJar
 
     jar.mustRunAfter clean
     javadocJar.mustRunAfter jar

src/main/java/net/dv8tion/jda/client/entities/Application.java

@@ -17,7 +17,6 @@
 package net.dv8tion.jda.client.entities;
 
 import net.dv8tion.jda.client.managers.ApplicationManager;
-import net.dv8tion.jda.client.managers.ApplicationManagerUpdatable;
 import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.ISnowflake;
@@ -143,21 +142,6 @@ public interface Application extends ISnowflake
      */
     ApplicationManager getManager();
 
-    /**
-     * Returns the {@link net.dv8tion.jda.client.managers.ApplicationManagerUpdatable ApplicationManagerUpdatable} for this Application.
-     * In the ApplicationManager, you can modify things like the name and icon of this Application.
-     * <br>This can be used to bulk update application settings.
-     *
-     * @return The ApplicationManagerUpdatable of this Application
-     *
-     * @see    #getManager()
-     *
-     * @deprecated
-     *         Use {@link #getManager()} instead
-     */
-    @Deprecated
-    ApplicationManagerUpdatable getManagerUpdatable();
-
     /**
      * The name of this application.
      * <br>The application name is <b>not</b> necessarily the same as the bot's name!

src/main/java/net/dv8tion/jda/client/entities/impl/ApplicationImpl.java

@@ -34,8 +34,6 @@ public class ApplicationImpl implements Application
     private final JDA api;
     private final Object mngLock = new Object();
     private ApplicationManager manager;
-    @Deprecated
-    private net.dv8tion.jda.client.managers.ApplicationManagerUpdatable managerUpdatable;
 
     private BotImpl bot;
     private String description;
@@ -162,23 +160,6 @@ public ApplicationManager getManager()
         return mng;
     }
 
-    @Override
-    @Deprecated
-    public net.dv8tion.jda.client.managers.ApplicationManagerUpdatable getManagerUpdatable()
-    {
-        net.dv8tion.jda.client.managers.ApplicationManagerUpdatable mng = managerUpdatable;
-        if (mng == null)
-        {
-            synchronized (mngLock)
-            {
-                mng = managerUpdatable;
-                if (mng == null)
-                    mng = managerUpdatable = new net.dv8tion.jda.client.managers.ApplicationManagerUpdatable(this);
-            }
-        }
-        return mng;
-    }
-    
     @Override
     public String getName()
     {