From f112d760ba80ad1137cbbb9ab14fad07d16647a8 Mon Sep 17 00:00:00 2001 From: casko1 Date: Wed, 31 Jul 2024 20:53:00 +0200 Subject: [PATCH] Bump dependencies --- .github/workflows/gradle.yml | 4 ++-- VERSION | 2 +- build.gradle | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../bot/music/lavaplayer/PlayerManager.java | 18 ++---------------- 5 files changed, 14 insertions(+), 28 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b9f1aed..99a14d3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,10 +23,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 16 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '16' + java-version: '21' distribution: 'temurin' - name: Build with Gradle uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 diff --git a/VERSION b/VERSION index c9929e3..3c80e4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.2 \ No newline at end of file +1.4.3 \ No newline at end of file diff --git a/build.gradle b/build.gradle index de447e9..1e32361 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,10 @@ repositories { mavenLocal() mavenCentral() + maven { + url = uri('https://maven.lavalink.dev/releases') + } + maven { url = uri('https://m2.dv8tion.net/releases') } @@ -28,9 +32,6 @@ repositories { url = uri('https://repo.maven.apache.org/maven2/') } - maven { - url = uri('https://maven.lavalink.dev/releases') - } maven { url = uri('https://jitpack.io') @@ -52,8 +53,7 @@ dependencies { implementation 'com.github.natanbc:lavadsp:0.7.7' implementation 'ch.qos.logback:logback-classic:1.5.0' implementation 'commons-validator:commons-validator:1.7' - implementation 'dev.lavalink.youtube:common:1.3.0' - implementation 'dev.lavalink.youtube:v2:1.4.0' + implementation 'dev.lavalink.youtube:v2:1.5.0' implementation 'dev.arbjerg:lavaplayer:2.2.1' implementation 'commons-io:commons-io:2.11.0' implementation 'net.bramp.ffmpeg:ffmpeg:0.6.2' @@ -62,9 +62,9 @@ dependencies { } group = 'com.casko1' -version = '1.4.2' +version = '1.4.3' description = 'wheelbarrow-bot' -java.sourceCompatibility = JavaVersion.VERSION_16 +java.sourceCompatibility = JavaVersion.VERSION_21 publishing { publications { @@ -84,4 +84,4 @@ jar { duplicatesStrategy 'exclude' } -targetCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83..171d876 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/casko1/wheelbarrow/bot/music/lavaplayer/PlayerManager.java b/src/main/java/com/casko1/wheelbarrow/bot/music/lavaplayer/PlayerManager.java index 4b3b278..67eadf8 100644 --- a/src/main/java/com/casko1/wheelbarrow/bot/music/lavaplayer/PlayerManager.java +++ b/src/main/java/com/casko1/wheelbarrow/bot/music/lavaplayer/PlayerManager.java @@ -8,18 +8,10 @@ import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; import dev.lavalink.youtube.YoutubeAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.beam.BeamAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.getyarn.GetyarnAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.nico.NicoAudioSourceManager; import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioSourceManager; -import com.sedmelluq.discord.lavaplayer.source.yamusic.YandexMusicAudioSourceManager; import com.wrapper.spotify.SpotifyApi; import com.wrapper.spotify.exceptions.SpotifyWebApiException; import com.wrapper.spotify.model_objects.credentials.ClientCredentials; -import dev.lavalink.youtube.clients.AndroidWithThumbnail; import dev.lavalink.youtube.clients.MusicWithThumbnail; import dev.lavalink.youtube.clients.WebWithThumbnail; import net.dv8tion.jda.api.entities.Guild; @@ -67,15 +59,9 @@ public PlayerManager() throws IOException, ParseException, SpotifyWebApiExceptio this.clientCredentials = spotifyApi.clientCredentials().build().execute(); this.spotifyApi.setAccessToken(clientCredentials.getAccessToken()); - this.audioPlayerManager.registerSourceManager(new YoutubeAudioSourceManager(true, new MusicWithThumbnail(), new WebWithThumbnail(), new AndroidWithThumbnail())); - this.audioPlayerManager.registerSourceManager(new YandexMusicAudioSourceManager(true)); + YoutubeAudioSourceManager youtubeSourceManager = new YoutubeAudioSourceManager(true, new MusicWithThumbnail(), new WebWithThumbnail()); + this.audioPlayerManager.registerSourceManager(youtubeSourceManager); this.audioPlayerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault()); - this.audioPlayerManager.registerSourceManager(new BandcampAudioSourceManager()); - this.audioPlayerManager.registerSourceManager(new VimeoAudioSourceManager()); - this.audioPlayerManager.registerSourceManager(new TwitchStreamAudioSourceManager()); - this.audioPlayerManager.registerSourceManager(new BeamAudioSourceManager()); - this.audioPlayerManager.registerSourceManager(new GetyarnAudioSourceManager()); - this.audioPlayerManager.registerSourceManager(new NicoAudioSourceManager()); AudioSourceManagers.registerLocalSource(this.audioPlayerManager); }