Upgrade Kotlin to 1.7.10 and Gradle to 6.9.4

taymyr · Aug 10, 2023 · 79cb7fd · 79cb7fd
1 parent 9be8590
commit 79cb7fd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,6 @@ allprojects {
     version = projectVersion
     repositories {
         mavenCentral()
-        jcenter()
     }
 }
 

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-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
@@ -22,7 +22,7 @@ val lagomVersion = project.properties["lagomVersion"] as String? ?: Versions.lag
 val scalaBinaryVersion = project.properties["scalaBinaryVersion"] as String? ?: Versions.scalaBinary
 
 plugins {
-    kotlin("jvm") version "1.3.50"
+    kotlin("jvm") version "1.7.10"
     id("org.jetbrains.dokka") version "0.10.0"
     id("org.jlleitschuh.gradle.ktlint") version "9.1.0"
     `maven-publish`
@@ -42,19 +42,19 @@ val compileTestJava: JavaCompile by tasks
 compileTestJava.options.compilerArgs.add("-parameters")
 
 dependencies {
-    compile(kotlin("stdlib-jdk8"))
-    compile(kotlin("reflect"))
-    compile("com.fasterxml.jackson.module", "jackson-module-kotlin", Versions.jackson)
-    compile("com.fasterxml.jackson.datatype", "jackson-datatype-jsr310", Versions.jackson)
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("reflect"))
+    implementation("com.fasterxml.jackson.module", "jackson-module-kotlin", Versions.jackson)
+    implementation("com.fasterxml.jackson.datatype", "jackson-datatype-jsr310", Versions.jackson)
     compileOnly("com.lightbend.lagom", "lagom-javadsl-server_$scalaBinaryVersion", lagomVersion)
 
-    testCompile("org.junit.jupiter", "junit-jupiter-api", Versions.junit5)
-    testCompile("org.junit.jupiter", "junit-jupiter-params", Versions.junit5)
-    testRuntime("org.junit.jupiter", "junit-jupiter-engine", Versions.junit5)
-    testCompile("org.assertj", "assertj-core", Versions.assertj)
-    testCompile("net.javacrumbs.json-unit", "json-unit-assertj", Versions.`json-unit`)
-    testCompile("com.lightbend.lagom", "lagom-javadsl-integration-client_$scalaBinaryVersion", lagomVersion)
-    testCompile("com.lightbend.lagom", "lagom-logback_$scalaBinaryVersion", lagomVersion)
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.junit5)
+    testImplementation("org.junit.jupiter", "junit-jupiter-params", Versions.junit5)
+    testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.junit5)
+    testImplementation("org.assertj", "assertj-core", Versions.assertj)
+    testImplementation("net.javacrumbs.json-unit", "json-unit-assertj", Versions.`json-unit`)
+    testImplementation("com.lightbend.lagom", "lagom-javadsl-integration-client_$scalaBinaryVersion", lagomVersion)
+    testImplementation("com.lightbend.lagom", "lagom-logback_$scalaBinaryVersion", lagomVersion)
     testImplementation("org.testcontainers", "testcontainers", Versions.testcontainers)
     testImplementation("org.testcontainers", "junit-jupiter", Versions.testcontainers)
     testImplementation("org.testcontainers", "elasticsearch", Versions.testcontainers)
@@ -86,13 +86,13 @@ tasks.jacocoTestReport {
 }
 
 val sourcesJar by tasks.creating(Jar::class) {
-    classifier = "sources"
+    archiveClassifier.set("sources")
     from(sourceSets.main.get().allSource)
 }
 
 val dokkaJar by tasks.creating(Jar::class) {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
-    classifier = "javadoc"
+    archiveClassifier.set("javadoc")
     from(tasks.dokka)
 }