[build] update to kotlin 1.7.21 (ExpediaGroup#1627)

* chore: update kotlin to 1.7.21

* feat: use a kotlin-compile-testing fork compatible with kotlin 1.7.22

* chore: comments on kotlin-compile-testing

* chore: use 1.7.21 as 1.7.22 plugin is not available

* chore: update reactor extensions version

Author: samuelAndalon

gradle.properties

@@ -14,10 +14,10 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
 
 # dependencies
-kotlinVersion = 1.7.10
+kotlinVersion = 1.7.21
 kotlinJvmVersion = 1.8
 kotlinxCoroutinesVersion = 1.6.4
-kotlinxSerializationVersion = 1.4.0
+kotlinxSerializationVersion = 1.4.1
 
 androidPluginVersion = 7.1.2
 classGraphVersion = 4.8.149
@@ -27,15 +27,19 @@ graphQLJavaDataLoaderVersion = 3.2.0
 jacksonVersion = 2.13.3
 kotlinPoetVersion = 1.12.0
 ktorVersion = 2.0.3
-reactorVersion = 3.4.21
-reactorExtensionsVersion = 1.1.7
+# reactorVersion should be the same reactor-core version pulled from spring-boot-starter-webflux
+reactorVersion = 3.4.26
+reactorExtensionsVersion = 1.1.9
 slf4jVersion = 1.7.36
-springBootVersion = 2.7.5
-springVersion = 5.3.22
+springBootVersion = 2.7.7
+springVersion = 5.3.24
 
 # test dependency versions
+
 # kotlin-compile-testing has to be using the same kotlin version as the kotlinx-serialization compiler
-compileTestingVersion = 1.4.9
+# https://github.com/tschuchortdev/kotlin-compile-testing the latest version targets kotlin 1.7.10 which blocks updates to newer
+# versions of kotlin, switching to a fork https://github.com/ZacSweers/kotlin-compile-testing
+compileTestingVersion = 0.1.0
 icuVersion=71.1
 junitVersion = 5.8.2
 mockkVersion = 1.12.5

plugins/client/graphql-kotlin-client-generator/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     testImplementation(project(path = ":graphql-kotlin-client-jackson"))
     testImplementation(project(path = ":graphql-kotlin-client-serialization"))
     testImplementation("com.github.tomakehurst:wiremock-jre8:$wireMockVersion")
-    testImplementation("com.github.tschuchortdev:kotlin-compile-testing:$compileTestingVersion")
+    testImplementation("dev.zacsweers.kctfork:core:$compileTestingVersion")
     testImplementation("com.ibm.icu:icu4j:$icuVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-params:$junitVersion")
     testImplementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/app/build.gradle.kts

@@ -17,7 +17,7 @@ android {
 }
 
 val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
-val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
+val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
 dependencies {
     implementation("com.expediagroup:graphql-kotlin-ktor-client:$graphQLKotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/build.gradle.kts

@@ -11,7 +11,7 @@ buildscript {
 
     val androidPluginVersion = System.getenv("ANDROID_PLUGIN_VERSION") ?: "7.0.1"
     val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
-    val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
+    val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
     dependencies {
         classpath("com.android.tools.build:gradle:$androidPluginVersion")
         classpath("com.expediagroup:graphql-kotlin-gradle-plugin:$graphQLKotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/custom_scalars_jackson/build.gradle.kts

@@ -19,9 +19,9 @@ buildscript {
 }
 
 plugins {
-    id("org.springframework.boot") version "2.7.5"
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.spring") version "1.7.10"
+    id("org.springframework.boot") version "2.7.7"
+    kotlin("jvm") version "1.7.21"
+    kotlin("plugin.spring") version "1.7.21"
 }
 
 apply(plugin = "com.expediagroup.graphql")
@@ -41,8 +41,8 @@ repositories {
 val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
 val icuVersion = System.getenv("ICU_VERSION") ?: "70.1"
 val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.8.2"
-val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
-val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.7.5"
+val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
+val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.7.7"
 dependencies {
     implementation("com.expediagroup:graphql-kotlin-hooks-provider:$graphQLKotlinVersion")
     implementation("com.expediagroup:graphql-kotlin-spring-client:$graphQLKotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/custom_scalars_kotlinx/build.gradle.kts

@@ -19,8 +19,8 @@ buildscript {
 }
 
 plugins {
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("jvm") version "1.7.21"
+    kotlin("plugin.serialization") version "1.7.21"
 }
 
 apply(plugin = "com.expediagroup.graphql")
@@ -40,7 +40,7 @@ repositories {
 val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
 val icuVersion = System.getenv("ICU_VERSION") ?: "71.1"
 val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.8.2"
-val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
+val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
 val ktorVersion = System.getenv("KTOR_VERSION") ?: "2.0.0"
 val logbackVersion = System.getenv("LOGBACK_VERSION") ?: "1.2.1"
 dependencies {

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/jacoco/build.gradle.kts

@@ -16,7 +16,7 @@ buildscript {
 }
 
 plugins {
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.7.21"
     jacoco
 }
 

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/polymorphic_types_jackson/build.gradle.kts

@@ -18,9 +18,9 @@ buildscript {
 }
 
 plugins {
-    id("org.springframework.boot") version "2.7.5"
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.spring") version "1.7.10"
+    id("org.springframework.boot") version "2.7.7"
+    kotlin("jvm") version "1.7.21"
+    kotlin("plugin.spring") version "1.7.21"
 }
 
 apply(plugin = "com.expediagroup.graphql")
@@ -39,8 +39,8 @@ repositories {
 
 val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
 val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.8.2"
-val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
-val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.7.5"
+val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
+val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.7.7"
 dependencies {
     implementation("com.expediagroup:graphql-kotlin-spring-client:$graphQLKotlinVersion")
     implementation("com.expediagroup:graphql-kotlin-spring-server:$graphQLKotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/polymorphic_types_kotlinx/build.gradle.kts

@@ -18,8 +18,8 @@ buildscript {
 }
 
 plugins {
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("jvm") version "1.7.21"
+    kotlin("plugin.serialization") version "1.7.21"
 }
 
 apply(plugin = "com.expediagroup.graphql")
@@ -38,7 +38,7 @@ repositories {
 
 val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
 val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.8.2"
-val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
+val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
 val ktorVersion = System.getenv("KTOR_VERSION") ?: "2.0.0"
 val logbackVersion = System.getenv("LOGBACK_VERSION") ?: "1.2.1"
 dependencies {

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/skip_include/build.gradle.kts

@@ -18,9 +18,9 @@ buildscript {
 }
 
 plugins {
-    id("org.springframework.boot") version "2.7.5"
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.spring") version "1.7.10"
+    id("org.springframework.boot") version "2.7.7"
+    kotlin("jvm") version "1.7.21"
+    kotlin("plugin.spring") version "1.7.21"
 }
 
 apply(plugin = "com.expediagroup.graphql")
@@ -40,8 +40,8 @@ repositories {
 val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "7.0.0-SNAPSHOT"
 val icuVersion = System.getenv("ICU_VERSION") ?: "70.1"
 val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.8.2"
-val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.10"
-val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.7.5"
+val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.7.21"
+val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.7.7"
 dependencies {
     implementation("com.expediagroup:graphql-kotlin-hooks-provider:$graphQLKotlinVersion")
     implementation("com.expediagroup:graphql-kotlin-spring-client:$graphQLKotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGenerateClientIT.kt

@@ -34,7 +34,7 @@ class GraphQLGenerateClientIT {
         sourceDirectory.copyRecursively(testProjectDirectory)
 
         val junitVersion = System.getProperty("junitVersion") ?: "5.8.2"
-        val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.7.10"
+        val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.7.21"
         val mockkVersion = System.getProperty("mockkVersion") ?: "1.12.5"
         val buildResult = GradleRunner.create()
             .withProjectDir(testProjectDirectory)

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAbstractIT.kt

@@ -35,9 +35,9 @@ abstract class GraphQLGradlePluginAbstractIT {
 
     // unsure if there is a better way - correct values are set from Gradle build
     // when running directly from IDE you will need to manually update those to correct values
-    private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.7.10"
+    private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.7.21"
     private val junitVersion = System.getProperty("junitVersion") ?: "5.8.2"
-    private val springBootVersion = System.getProperty("springBootVersion") ?: "2.7.5"
+    private val springBootVersion = System.getProperty("springBootVersion") ?: "2.7.7"
 
     val testSchema = loadResource("mocks/schema.graphql")
     val introspectionResult = loadResource("mocks/IntrospectionResult.json")

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAndroidIT.kt

@@ -38,7 +38,7 @@ class GraphQLGradlePluginAndroidIT {
         sourceDirectory.copyRecursively(testProjectDirectory)
 
         val androidPluginVersion = System.getProperty("androidPluginVersion") ?: "7.0.1"
-        val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.7.10"
+        val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.7.21"
         val buildResult = GradleRunner.create()
             .withProjectDir(testProjectDirectory)
             .withPluginClasspath()