Update various dependencies

Update to Kotlin 1.9.20, KotlinPoet 1.14.2, JavaPoet 1.13.0, as well as various other updates. Also fix inconsistencies in subprojects that were still using Kotlin 1.8. Updating to a newer KotlinPoet is necessary to avoid issues where an older version of kotlin-stdlib was being pulled in.
Netflix · Nov 16, 2023 · 070055f · 070055f
1 parent 0daccaf
commit 070055f
Show file tree

Hide file tree

Showing 124 changed files with 584 additions and 477 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version "1.9.0" apply false
+    id 'org.jetbrains.kotlin.jvm' version "1.9.20" apply false
     id 'com.netflix.nebula.netflixoss' version '11.3.2'
     id "org.jmailen.kotlinter" version "3.11.1"
 }
@@ -28,7 +28,7 @@ allprojects {
 
     ext {
         Versions = [
-                KOTLIN_VERSION: '1.9.0'
+                KOTLIN_VERSION: '1.9.20'
         ]
     }
 
@@ -38,27 +38,20 @@ allprojects {
 
     apply plugin: 'com.netflix.nebula.netflixoss'
     apply plugin: 'com.netflix.nebula.info'
-   apply plugin: 'org.jetbrains.kotlin.jvm'
+    apply plugin: 'org.jetbrains.kotlin.jvm'
 
     group = 'com.netflix.graphql.dgs.codegen'
 
     dependencies {
-        testImplementation "org.jetbrains.kotlin:kotlin-compiler:${Versions.KOTLIN_VERSION}"
+        implementation platform("org.jetbrains.kotlin:kotlin-bom:${Versions.KOTLIN_VERSION}")
+        testImplementation "org.jetbrains.kotlin:kotlin-compiler"
 
-        testImplementation platform('org.junit:junit-bom:5.8.+')
-        testImplementation 'org.assertj:assertj-core:3.23.+'
+        testImplementation platform('org.junit:junit-bom:5.10.+')
+        testImplementation 'org.assertj:assertj-core:3.24.+'
         testImplementation 'org.junit.jupiter:junit-jupiter'
         testImplementation 'org.junit.jupiter:junit-jupiter-params'
     }
 
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-        compileKotlin {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-
     tasks.withType(Test).configureEach {
         useJUnitPlatform()
     }

diff --git a/dependencies.lock b/dependencies.lock
@@ -1,107 +1,125 @@
 {
     "apiDependenciesMetadata": {
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         }
     },
     "compileClasspath": {
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-bom": {
+            "locked": "1.9.20"
+        },
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         }
     },
     "implementationDependenciesMetadata": {
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-bom": {
+            "locked": "1.9.20"
+        },
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         }
     },
     "kotlinBuildToolsApiClasspath": {
         "org.jetbrains.kotlin:kotlin-build-tools-impl": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         }
     },
     "kotlinCompilerClasspath": {
         "org.jetbrains.kotlin:kotlin-compiler-embeddable": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         }
     },
     "kotlinCompilerPluginClasspathMain": {
         "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         }
     },
     "kotlinCompilerPluginClasspathTest": {
         "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         }
     },
     "kotlinKlibCommonizerClasspath": {
         "org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         }
     },
     "runtimeClasspath": {
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-bom": {
+            "locked": "1.9.20"
+        },
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         }
     },
     "testCompileClasspath": {
         "org.assertj:assertj-core": {
-            "locked": "3.23.1"
+            "locked": "3.24.2"
+        },
+        "org.jetbrains.kotlin:kotlin-bom": {
+            "locked": "1.9.20"
         },
         "org.jetbrains.kotlin:kotlin-compiler": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         },
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         },
         "org.junit.jupiter:junit-jupiter": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         },
         "org.junit.jupiter:junit-jupiter-params": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         },
         "org.junit:junit-bom": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         }
     },
     "testImplementationDependenciesMetadata": {
         "org.assertj:assertj-core": {
-            "locked": "3.23.1"
+            "locked": "3.24.2"
+        },
+        "org.jetbrains.kotlin:kotlin-bom": {
+            "locked": "1.9.20"
         },
         "org.jetbrains.kotlin:kotlin-compiler": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         },
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         },
         "org.junit.jupiter:junit-jupiter": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         },
         "org.junit.jupiter:junit-jupiter-params": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         },
         "org.junit:junit-bom": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         }
     },
     "testRuntimeClasspath": {
         "org.assertj:assertj-core": {
-            "locked": "3.23.1"
+            "locked": "3.24.2"
+        },
+        "org.jetbrains.kotlin:kotlin-bom": {
+            "locked": "1.9.20"
         },
         "org.jetbrains.kotlin:kotlin-compiler": {
-            "locked": "1.9.0"
+            "locked": "1.9.20"
         },
-        "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
-            "locked": "1.9.0"
+        "org.jetbrains.kotlin:kotlin-stdlib": {
+            "locked": "1.9.20"
         },
         "org.junit.jupiter:junit-jupiter": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         },
         "org.junit.jupiter:junit-jupiter-params": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         },
         "org.junit:junit-bom": {
-            "locked": "5.8.2"
+            "locked": "5.10.1"
         }
     }
 }
diff --git a/graphql-dgs-codegen-core/build.gradle b/graphql-dgs-codegen-core/build.gradle
@@ -20,7 +20,6 @@ plugins {
     id 'java-library'
     id 'application'
     id 'com.netflix.nebula.integtest'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10'
 }
 
 
@@ -29,20 +28,20 @@ dependencies {
 
     implementation(project(":graphql-dgs-codegen-shared-core"))
 
-	implementation('com.netflix.graphql.dgs:graphql-dgs') { transitive = false }
+    implementation('com.netflix.graphql.dgs:graphql-dgs') { transitive = false }
     implementation 'com.graphql-java:graphql-java'
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.slf4j:slf4j-api'
 
-    implementation 'com.squareup:javapoet:1.13.0'
-    implementation 'com.squareup:kotlinpoet:1.12.0'
-    implementation 'com.github.ajalt.clikt:clikt:3.5.0'
+    implementation 'com.squareup:javapoet:1.13.+'
+    implementation 'com.squareup:kotlinpoet:1.14.+'
+    implementation 'com.github.ajalt.clikt:clikt:4.2.+'
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.+'
 
     testImplementation 'com.google.testing.compile:compile-testing:0.+'
-    testImplementation "org.jetbrains.kotlin:kotlin-compiler:${Versions.KOTLIN_VERSION}"
+    testImplementation "org.jetbrains.kotlin:kotlin-compiler"
 }
 
 application {