Skip to content

Commit 14e96ac

Browse files
committed
Bump dependecies
1 parent b0e9ef9 commit 14e96ac

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ plugins {
2929
idea
3030
application
3131

32-
kotlin("jvm") version "1.6.0"
32+
kotlin("jvm") version "1.7.10"
3333
id("org.liquibase.gradle") version "2.0.4"
3434
// id("org.jmailen.kotlinter") version "3.9.0" // removes star imports :(
35-
id("org.jmailen.kotlinter") version "3.6.0"
35+
id("org.jmailen.kotlinter") version "3.11.1"
3636
id("com.github.johnrengelman.shadow") version "7.1.2"
3737
id("com.github.breadmoirai.github-release") version "2.2.12"
3838
}
@@ -93,7 +93,7 @@ dependencies {
9393
implementation(group = "ch.qos.logback", name = "logback-classic", version = "1.2.10")
9494

9595
//Spotify API
96-
implementation(group = "se.michaelthelin.spotify", name = "spotify-web-api-java", version = "6.5.4")
96+
implementation(group = "se.michaelthelin.spotify", name = "spotify-web-api-java", version = "7.2.0")
9797

9898
// Youtube Cache
9999
implementation(group = "net.notfab.cache", name = "cache-client", version = "2.2.1")
@@ -149,8 +149,9 @@ dependencies {
149149
implementation(group = "redis.clients", name = "jedis", version = "3.7.0")
150150

151151
implementation(group = "com.zaxxer", name = "HikariCP", version = "5.0.0")
152+
// TODO: replace with official? https://jdbc.postgresql.org/
152153
implementation(group = "com.impossibl.pgjdbc-ng", name = "pgjdbc-ng", version = "0.8.9")
153-
implementation(group = "org.liquibase", name = "liquibase-core", version = "4.5.0")
154+
implementation(group = "org.liquibase", name = "liquibase-core", version = "4.8.0")
154155
runtimeOnly(group = "com.mattbertolini", name = "liquibase-slf4j", version = "4.0.0")
155156
}
156157

@@ -260,7 +261,6 @@ tasks.withType<Wrapper> {
260261

261262
kotlinter {
262263
ignoreFailures = false
263-
indentSize = 4
264264
reporters = arrayOf("checkstyle", "plain")
265265
experimentalRules = true
266266
disabledRules = arrayOf(

src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
2727
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
2828
import com.sedmelluq.discord.lavaplayer.track.*;
29-
import com.wrapper.spotify.SpotifyApi;
30-
import com.wrapper.spotify.exceptions.SpotifyWebApiException;
31-
import com.wrapper.spotify.model_objects.IPlaylistItem;
32-
import com.wrapper.spotify.model_objects.credentials.ClientCredentials;
33-
import com.wrapper.spotify.model_objects.specification.*;
34-
import com.wrapper.spotify.requests.authorization.client_credentials.ClientCredentialsRequest;
29+
import se.michaelthelin.spotify.SpotifyApi;
30+
import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
31+
import se.michaelthelin.spotify.model_objects.IPlaylistItem;
32+
import se.michaelthelin.spotify.model_objects.credentials.ClientCredentials;
33+
import se.michaelthelin.spotify.model_objects.specification.*;
34+
import se.michaelthelin.spotify.requests.authorization.client_credentials.ClientCredentialsRequest;
3535
import ml.duncte123.skybot.audio.BigChungusPlaylist;
3636
import ml.duncte123.skybot.audio.TrackScheduler;
3737
import ml.duncte123.skybot.audio.sourcemanagers.DBAudioRef;

src/main/kotlin/ml/duncte123/skybot/database/PostgreDatabase.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ class PostgreDatabase : AbstractDatabase() {
5050

5151
init {
5252
val config = HikariConfig()
53-
config.jdbcUrl = "jdbc:postgresql://localhost:5432/skybot?user=skybot&password=password" // &ssl=true
53+
// TODO: unhardcode
54+
config.jdbcUrl = "jdbc:pgsql://localhost:5432/skybot?user=skybot&password=password" // &ssl=true
5455

5556
this.ds = HikariDataSource(config)
5657

0 commit comments

Comments
 (0)