chore: Upgrade Kotlin to 2.0.21

pact-foundation · Nov 21, 2024 · 84bd88f · 84bd88f
1 parent 5a8dcc9
commit 84bd88f
Show file tree

Hide file tree

Showing 7 changed files with 316 additions and 164 deletions.
diff --git a/README.md b/README.md
@@ -46,12 +46,12 @@ and in the [Pact-JVM wiki](https://github.com/pact-foundation/pact-jvm/wiki). [S
 
 ## Supported JDK and specification versions:
 
-| Branch                                                                            | Specification | JDK        | Kotlin Version | Latest Version | Notes |
-|-----------------------------------------------------------------------------------|---------------|------------|----------------|----------------|-------|
-| [4.7.x](https://github.com/pact-foundation/pact-jvm/blob/v4.7.x/README.md)        | V4 + plugins  | 17-19      | 1.8.22         | 4.7.0-beta.0   |       |
-| [4.6.x](https://github.com/pact-foundation/pact-jvm/blob/v4.6.x/README.md) master | V4 + plugins  | 17-18      | 1.8.22         | 4.6.15         |       |
-| [4.5.x](https://github.com/pact-foundation/pact-jvm/blob/v4.5.x/README.md)        | V4 + plugins  | 11+/17+(1) | 1.7.20         | 4.5.13         |       |
-| [4.1.x](https://github.com/pact-foundation/pact-jvm/blob/v4.1.x/README.md)        | V3            | 8-12       | 1.3.72         | 4.1.43         |       |
+| Branch                                                                            | Specification | JDK                   | Kotlin Version | Latest Version | Notes |
+|-----------------------------------------------------------------------------------|---------------|-----------------------|----------------|----------------|-------|
+| [4.7.x](https://github.com/pact-foundation/pact-jvm/blob/v4.7.x/README.md)        | V4 + plugins  | 17+ (tested up to 23) | 2.0.21         | 4.7.0-beta.0   |       |
+| [4.6.x](https://github.com/pact-foundation/pact-jvm/blob/v4.6.x/README.md) master | V4 + plugins  | 17-18                 | 1.8.22         | 4.6.15         |       |
+| [4.5.x](https://github.com/pact-foundation/pact-jvm/blob/v4.5.x/README.md)        | V4 + plugins  | 11+/17+(1)            | 1.7.20         | 4.5.13         |       |
+| [4.1.x](https://github.com/pact-foundation/pact-jvm/blob/v4.1.x/README.md)        | V3            | 8-12                  | 1.3.72         | 4.1.43         |       |
 
 **Notes:**
 * **1:** Spring6 support library requires JDK 17+. The rest of Pact-JVM 4.5.x libs require 11+.

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
-    implementation 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0'
-    implementation 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.20'
+    implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21'
+    implementation 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.7'
+    implementation 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.20'
     implementation 'org.apache.commons:commons-text:1.5'
 }
diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle
@@ -35,7 +35,7 @@ dependencies {
         api 'org.apache.tika:tika-core:2.9.1'
         api 'io.github.oshai:kotlin-logging-jvm:5.1.4'
 
-        implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+        implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.21'
         implementation 'org.apache.commons:commons-lang3:3.12.0'
         implementation 'org.apache.commons:commons-text:1.10.0'
         implementation 'org.apache.commons:commons-collections4:4.4'
@@ -70,11 +70,11 @@ dependencies {
     }
 
     // Align versions of all Kotlin components
-    implementation platform('org.jetbrains.kotlin:kotlin-bom')
+    implementation platform('org.jetbrains.kotlin:kotlin-bom:2.0.21')
 
     // Use the Kotlin JDK 8 standard library.
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.21'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:2.0.21'
 
     codenarc('org.codenarc:CodeNarc:3.5.0-groovy-4.0')
     codenarc('org.apache.groovy:groovy:4.0.23')
@@ -112,6 +112,5 @@ codenarcTest {
 }
 
 detekt {
-    failFast = false
     config = files(rootProject.file("config/detekt-config.yml"))
 }