Skip to content

Commit

Permalink
chore: bump to java21
Browse files Browse the repository at this point in the history
  • Loading branch information
ToxicMushroom committed Nov 30, 2023
1 parent 9bd44dc commit c206c4c
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Bot.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Full jdk required for font rendering on ship ect
FROM bellsoft/liberica-runtime-container:jdk-17-glibc
FROM bellsoft/liberica-runtime-container:jdk-21-glibc
RUN apk add --no-cache libxrender libxi libxtst alsa-lib libx11 fontconfig libxext freetype zlib ttf-dejavu
RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so && \
ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 && \
Expand Down
40 changes: 20 additions & 20 deletions bot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ plugins {
id("application")
id("com.apollographql.apollo3") version "3.8.2"
id("com.github.johnrengelman.shadow") version "8.1.1"
kotlin("jvm") version "1.8.20"
id("com.google.devtools.ksp") version "1.8.20-1.0.10"
kotlin("plugin.serialization") version "1.8.20"
kotlin("jvm") version "1.9.20"
id("com.google.devtools.ksp") version "1.9.20-1.0.13"
kotlin("plugin.serialization") version "1.9.20"
}

application.mainClass.set("me.melijn.bot.MelijnKt")
group = "me.melijn.bot"
version = "0.0.1-SNAPSHOT"

configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

apollo {
Expand All @@ -41,15 +41,15 @@ repositories {

val jackson = "2.14.2" // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core

val ktor = "2.3.3" // https://mvnrepository.com/artifact/io.ktor/ktor-client-cio
val ktor = "2.3.6" // https://mvnrepository.com/artifact/io.ktor/ktor-client-cio
val apollo = "3.8.2" // https://mvnrepository.com/artifact/com.apollographql.apollo3/apollo-runtime
val kotlinX = "1.7.2" // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
val kotlin = "1.8.20"
val scrimage = "4.0.34"
val kotlinX = "1.7.3" // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
val kotlin = "1.9.21"
val scrimage = "4.1.0"

val jda = "5.0.0-beta.14"
val kordEx = "1.6.3-SNAPSHOT"
val kordKommons = "0.0.9-SNAPSHOT"
val jda = "5.0.0-beta.18"
val kordEx = "1.6.4-SNAPSHOT"
val kordKommons = "0.0.12-SNAPSHOT"

dependencies {
implementation("net.dv8tion:JDA:$jda")
Expand Down Expand Up @@ -80,7 +80,7 @@ dependencies {
ksp(apRedgres)

// error reporting
implementation("io.sentry:sentry:6.2.1")
implementation("io.sentry:sentry:6.16.0")

// https://mvnrepository.com/artifact/club.minnced/discord-webhooks
implementation("club.minnced:discord-webhooks:0.8.4")
Expand Down Expand Up @@ -115,18 +115,18 @@ dependencies {
implementation("com.zaxxer:HikariCP:5.0.1")

// https://mvnrepository.com/artifact/org.postgresql/postgresql
implementation("org.postgresql:postgresql:42.6.0")
implementation("org.postgresql:postgresql:42.7.0")

// expiring map, https://search.maven.org/artifact/net.jodah/expiringmap
implementation("net.jodah:expiringmap:0.5.10")
implementation("net.jodah:expiringmap:0.5.11")

// https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinX")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$kotlinX")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-debug:${kotlinX}")

// https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-datetime
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")

// https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlinX")
Expand All @@ -135,10 +135,10 @@ dependencies {
implementation("me.duncte123:weebJava:3.0.1_7")

// https://mvnrepository.com/artifact/se.michaelthelin.spotify/spotify-web-api-java
implementation("se.michaelthelin.spotify:spotify-web-api-java:8.0.0")
implementation("se.michaelthelin.spotify:spotify-web-api-java:8.3.4")

// https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
implementation("ch.qos.logback:logback-classic:1.4.8")
implementation("ch.qos.logback:logback-classic:1.4.13")


// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
Expand Down Expand Up @@ -179,7 +179,7 @@ dependencies {
implementation("com.apollographql.apollo3:apollo-runtime:$apollo")

// https://mvnrepository.com/artifact/io.lettuce/lettuce-core
implementation("io.lettuce:lettuce-core:6.2.4.RELEASE")
implementation("io.lettuce:lettuce-core:6.2.7.RELEASE")

// https://github.com/cdimascio/dotenv-kotlin
implementation("io.github.cdimascio:dotenv-kotlin:6.4.1")
Expand Down Expand Up @@ -219,7 +219,7 @@ tasks {
}
withType(KotlinCompile::class) {
kotlinOptions {
jvmTarget = "17"
jvmTarget = "21"
freeCompilerArgs = listOf(
"-opt-in=kotlin.RequiresOptIn",
"-Xcontext-receivers",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ abstract class Service(
companion object {
private val serviceThreadFactory = { name: String ->
{ r: Runnable ->
Thread(r, "[$name-Service]")
Thread.ofVirtual().name("[$name-Service]").unstarted(r)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit c206c4c

Please sign in to comment.