GH-40 Start 6.x release line: Move to Gradle 8.5, Kotlin 1.9.20 & Jav…

…alin 6.0.0-SNAPSHOT
javalin · Nov 10, 2023 · 034e74f · 034e74f
1 parent 8559cf8
commit 034e74f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.8.22"
-    kotlin("kapt") version "1.8.22"
+    kotlin("jvm") version "1.9.20"
+    kotlin("kapt") version "1.9.20"
     jacoco
     signing
     `maven-publish`
@@ -18,10 +18,11 @@ allprojects {
     apply(plugin = "signing")
 
     group = "io.javalin.community.routing"
-    version = "5.6.2-RC.1"
+    version = "6.0.0-SNAPSHOT"
 
     repositories {
         mavenCentral()
+        maven("https://maven.reposilite.com/snapshots")
     }
 
     if (version.toString().endsWith("-SNAPSHOT")) {
@@ -101,8 +102,8 @@ allprojects {
 
     tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {
-            jvmTarget = "11"
-            languageVersion = "1.8"
+            jvmTarget = JavaVersion.VERSION_11.toString()
+            languageVersion = "1.9"
             javaParameters = true
             freeCompilerArgs = listOf(
                 "-Xjvm-default=all", // For generating default methods in interfaces
@@ -116,22 +117,22 @@ subprojects {
     apply(plugin = "org.jetbrains.kotlin.kapt")
 
     dependencies {
-        val javalin = "5.6.2"
+        val javalin = "6.0.0-SNAPSHOT"
         compileOnly("io.javalin:javalin:$javalin")
         testImplementation("io.javalin:javalin:$javalin")
         testImplementation("io.javalin:javalin-testtools:$javalin")
         kaptTest("io.javalin.community.openapi:openapi-annotation-processor:$javalin")
         testImplementation("io.javalin.community.openapi:javalin-openapi-plugin:$javalin")
 
-        val jackson = "2.15.2"
+        val jackson = "2.15.3"
         testImplementation("com.fasterxml.jackson.core:jackson-databind:$jackson")
         testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson")
         testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson")
 
-        val unirest = "3.14.2"
+        val unirest = "3.14.5"
         testImplementation("com.konghq:unirest-java:$unirest")
 
-        val junit = "5.9.3"
+        val junit = "5.10.1"
         testImplementation("org.junit.jupiter:junit-jupiter-params:$junit")
         testImplementation("org.junit.jupiter:junit-jupiter-api:$junit")
         testImplementation("org.junit.jupiter:junit-jupiter-engine:$junit")
@@ -140,10 +141,10 @@ subprojects {
         val assertj = "3.24.2"
         testImplementation("org.assertj:assertj-core:$assertj")
 
-        val logback = "1.4.7"
+        val logback = "1.4.11"
         testImplementation("ch.qos.logback:logback-core:$logback")
         testImplementation("ch.qos.logback:logback-classic:$logback")
-        testImplementation("org.slf4j:slf4j-api:2.0.7")
+        testImplementation("org.slf4j:slf4j-api:2.0.9")
     }
 
     tasks.test {
@@ -190,7 +191,7 @@ subprojects {
 }
 
 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.11"
 }
 
 nexusPublishing {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/routing-coroutines/build.gradle.kts b/routing-coroutines/build.gradle.kts
@@ -2,10 +2,5 @@ description = "Routing Coroutines | Module provides coroutines support for Routi
 
 dependencies {
     api(project(":routing-dsl"))
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
-
-    val logback = "1.4.5"
-    testImplementation("ch.qos.logback:logback-core:$logback")
-    testImplementation("ch.qos.logback:logback-classic:$logback")
-    testImplementation("org.slf4j:slf4j-api:2.0.7")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 }