From 8a9e71fba920a107f8cdef58fc129bc3b7d2ee28 Mon Sep 17 00:00:00 2001 From: Sam Pritchard Date: Thu, 13 Dec 2018 22:44:51 +0000 Subject: [PATCH 1/7] add elixir lib --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dba5651aa..8f7d29bc8 100644 --- a/README.md +++ b/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: From f88938819976c7973d38d5dabff777cd4faa5fcd Mon Sep 17 00:00:00 2001 From: "Frederik Ar. Mikkelsen" Date: Sun, 13 Jan 2019 23:45:50 +0100 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b96b8e82b..a966febea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ Each release usually includes various fixes and improvements. The most noteworthy of these, as well as any features and breaking changes, are listed here. ## 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 From 994bbb086972473235d12b4b96c4ceac515403a7 Mon Sep 17 00:00:00 2001 From: "Frederik Ar. Mikkelsen" Date: Sun, 13 Jan 2019 23:45:50 +0100 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c04aff6b..1aaf7095a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,12 @@ Contributor: [@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 From f8c6dd535ab8a1a136108386bb12b7e7d9a05672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Spie=C3=9F?= Date: Wed, 16 Jan 2019 11:41:06 +0100 Subject: [PATCH 4/7] Use java 8 --- LavalinkServer/build.gradle | 6 +++--- .../src/main/java/lavalink/server/config/ServerConfig.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LavalinkServer/build.gradle b/LavalinkServer/build.gradle index e17c7df9b..bb75488f4 100644 --- a/LavalinkServer/build.gradle +++ b/LavalinkServer/build.gradle @@ -18,8 +18,8 @@ bootJar { archiveName = "Lavalink.jar" } -sourceCompatibility = 11 -targetCompatibility = 11 +sourceCompatibility = 8 +targetCompatibility = 8 bootRun { //compiling tests during bootRun increases the likelihood of catching broken tests locally instead of on the CI @@ -38,7 +38,7 @@ test { } dependencies { - compile group: 'space.npstr', name: 'Magma', version: magmaVersion + compile group: 'com.github.minndevelopment', name: 'magma', version: 'master-SNAPSHOT' 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 diff --git a/LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java b/LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java index 11c44023e..bd498b31d 100644 --- a/LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java +++ b/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; } From d674671100d741c0d013552a3df9d62be327ae0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Spie=C3=9F?= Date: Wed, 16 Jan 2019 14:46:39 +0100 Subject: [PATCH 5/7] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 469410499..d738fba21 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ build/* *.jar !gradle/wrapper/gradle-wrapper.jar +.project +.classpath +.settings From 76006831a73597c0e5d720650abfcfffd3591bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Spie=C3=9F?= Date: Wed, 16 Jan 2019 14:58:51 +0100 Subject: [PATCH 6/7] Switch magma dependency --- LavalinkServer/build.gradle | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LavalinkServer/build.gradle b/LavalinkServer/build.gradle index bb75488f4..df81b2004 100644 --- a/LavalinkServer/build.gradle +++ b/LavalinkServer/build.gradle @@ -38,7 +38,7 @@ test { } dependencies { - compile group: 'com.github.minndevelopment', name: 'magma', version: 'master-SNAPSHOT' + 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 diff --git a/build.gradle b/build.gradle index bae7f7044..dc023c53b 100644 --- a/build.gradle +++ b/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' From 08220eed16f725eac48cf338b9464b5e20bc4a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Spie=C3=9F?= Date: Wed, 16 Jan 2019 15:01:49 +0100 Subject: [PATCH 7/7] Cleanup java version --- LavalinkServer/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/LavalinkServer/build.gradle b/LavalinkServer/build.gradle index df81b2004..67ae635ac 100644 --- a/LavalinkServer/build.gradle +++ b/LavalinkServer/build.gradle @@ -18,8 +18,7 @@ bootJar { archiveName = "Lavalink.jar" } -sourceCompatibility = 8 -targetCompatibility = 8 +sourceCompatibility = targetCompatibility = 1.8 bootRun { //compiling tests during bootRun increases the likelihood of catching broken tests locally instead of on the CI