Merge pull request #164 from MinnDevelopment/master

Compatibility with Java 8 through 10

.gitignore

@@ -8,3 +8,6 @@
 build/*
 *.jar
 !gradle/wrapper/gradle-wrapper.jar
+.project
+.classpath
+.settings

CHANGELOG.md

@@ -12,14 +12,15 @@ Contributor:
 ## v3.2.0.1
 * Bumped to Java 11. Treating this as a patch version, as v3.2 still requires Java 11 due to a Magma update. 
 
-Contributor:
-[@Frederikam](https://github.com/Frederikam/)
+[@Frederikam](https://github.com/Frederikam)
 
 ## v3.2
-* Added resuming
+* Added support for resuming
+* Added noReplace option to the play op
+* Sending the same voice server update will not cause an existing connection to reconnect
 
 Contributor:
-[@Frederikam](https://github.com/Frederikam/)
+[@Frederikam](https://github.com/Frederikam)
 
 ## v3.1.2
 * Add API version header to all responses

LavalinkServer/build.gradle

@@ -18,8 +18,7 @@ bootJar {
     archiveName = "Lavalink.jar"
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = targetCompatibility = 1.8
 
 bootRun {
     //compiling tests during bootRun increases the likelihood of catching broken tests locally instead of on the CI
@@ -38,7 +37,7 @@ test {
 }
 
 dependencies {
-    compile group: 'space.npstr', name: 'Magma', version: magmaVersion
+    compile group: 'club.minnced', name: 'magma', version: magmaVersion
     compile group: 'com.sedmelluq', name: 'lavaplayer', version: lavaplayerVersion
     compile group: 'com.sedmelluq', name: 'jda-nas', version: jdaNasVersion
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion

LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java

@@ -50,7 +50,7 @@ public void setPassword(String password) {
     /**
      * @deprecated use {@link SentryConfigProperties} instead.
      */
-    @Deprecated(since = "3")
+    @Deprecated
     public String getSentryDsn() {
         return sentryDsn;
     }

README.md

@@ -72,6 +72,7 @@ users about the compatibility of their clients to the Lavalink server.
 * [Luna](https://github.com/CharlotteDunois/Luna) ([Yasmin](https://github.com/CharlotteDunois/Yasmin) or generic, PHP)
 * [gavalink](https://github.com/foxbot/gavalink) (Go)
 * [Magma](https://github.com/initzx/magma/) (discord.py, Python)
+* [lavapotion](https://github.com/SamOphis/lavapotion) (Elixir)
 * Or [create your own](https://github.com/Frederikam/Lavalink/blob/master/IMPLEMENTATION.md)
 
 ### Supports 2.x:

build.gradle

@@ -24,7 +24,7 @@ allprojects {
         mavenCentral()                     // main maven repo
         jcenter()                          // JDA and some other stuff
         mavenLocal()                       // useful for developing
-        maven { url "https://jitpack.io" } // build projects directly from github 
+        maven { url "https://jitpack.io" } // build projects directly from github
     }
 
     group = 'lavalink'
@@ -50,7 +50,7 @@ subprojects {
         //@formatter:off
 
         lavaplayerVersion               = '1.3.10'
-        magmaVersion                    = '0.8.3'
+        magmaVersion                    = '0.9.0'
         jdaNasVersion                   = '1.0.6'
         jappVersion                     = '1.3'