Revert Kotlin 2 upgrade

adrw · adrw · commit 21cc05e429fa · 2025-02-11T13:09:15.000-05:00
diff --git a/backfila-embedded/build.gradle.kts b/backfila-embedded/build.gradle.kts
@@ -4,7 +4,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -41,13 +41,13 @@ subprojects {
   tasks.withType<KotlinCompile> {
     dependsOn("spotlessKotlinApply")
     compilerOptions {
-      jvmTarget = JvmTarget.JVM_17
+      jvmTarget = JvmTarget.JVM_11
     }
   }
 
   tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.VERSION_17.toString()
-    targetCompatibility = JavaVersion.VERSION_17.toString()
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
   }
 
   configure<AllOpenExtension> {
diff --git a/client-base/build.gradle.kts b/client-base/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-dynamodb-v2/build.gradle.kts b/client-dynamodb-v2/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-dynamodb/build.gradle.kts b/client-dynamodb/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-jooq/build.gradle.kts b/client-jooq/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
 }
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("org.flywaydb.flyway") version "7.15.0"
   id("nu.studer.jooq") version "8.1"
diff --git a/client-misk-dynamodb/build.gradle.kts b/client-misk-dynamodb/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-misk-hibernate/build.gradle.kts b/client-misk-hibernate/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-misk-jooq/build.gradle.kts b/client-misk-jooq/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-misk-static/build.gradle.kts b/client-misk-static/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-misk/build.gradle.kts b/client-misk/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-s3/build.gradle.kts b/client-s3/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-sqldelight-gradle-plugin/build.gradle.kts b/client-sqldelight-gradle-plugin/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("java-gradle-plugin")
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   id("com.github.gmazzo.buildconfig")
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-sqldelight-gradle-plugin/src/test/projects/happyPath/lib/build.gradle.kts b/client-sqldelight-gradle-plugin/src/test/projects/happyPath/lib/build.gradle.kts
@@ -3,7 +3,7 @@ import app.cash.backfila.client.sqldelight.plugin.SqlDelightRecordSource
 plugins {
   id("app.cash.backfila.client.sqldelight")
   id("app.cash.sqldelight")
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
 }
 
 sqldelight {
@@ -37,7 +37,3 @@ dependencies {
   implementation("app.cash.backfila:client:${project.property("backfilaVersion")}")
   implementation(libs.sqldelightJdbcDriver)
 }
-
-tasks.named { it == "generateMainHockeyDataDatabaseInterface" }.configureEach {
-  dependsOn("generateBackfilaRecordSourceSqlHockeyPlayerOrigin")
-}
diff --git a/client-sqldelight-test/build.gradle.kts b/client-sqldelight-test/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   id("app.cash.sqldelight")
   id("app.cash.backfila.client.sqldelight")
 }
@@ -35,18 +35,6 @@ val compileKotlin by tasks.getting {
   dependsOn("generateMainHockeyDataDatabaseMigrations")
 }
 
-tasks.named { it == "generateMainHockeyDataDatabaseInterface" }.configureEach {
-  dependsOn("generateBackfilaRecordSourceSqlHockeyPlayersBackfill")
-}
-
-tasks.named { it == "generateBackfilaRecordSourceSqlHockeyPlayersBackfill" }.configureEach {
-  dependsOn("generateMainHockeyDataDatabaseMigrations")
-}
-
-tasks.named { it == "generateMainHockeyDataDatabaseMigrations" }.configureEach {
-  dependsOn("spotlessKotlin")
-}
-
 dependencies {
   implementation(libs.guava)
   implementation(libs.moshiCore)
diff --git a/client-sqldelight/build.gradle.kts b/client-sqldelight/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-static/build.gradle.kts b/client-static/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client-testing/build.gradle.kts b/client-testing/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.vanniktech.maven.publish.base")
 }
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.squareup.wire")
   id("com.vanniktech.maven.publish.base")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 jooq = "3.18.25"
-kotlin = "2.1.10"
+kotlin = "1.9.23"
 ktlint = "0.47.1"
-misk = "2025.01.29.125750-6f470ec"
+misk = "2025.01.09.184726-680bca2"
 okhttp = "5.0.0-alpha.14"
 sqldelight = "2.0.2"
 wire = "5.2.1"
@@ -63,9 +63,9 @@ kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.18.1" }
 kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.9.0" }
-kotlinxCoroutinesLogging = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version = "1.9.0" }
-kotlinxCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.9.0" }
+kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.3" }
+kotlinxCoroutinesLogging = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version = "1.6.3" }
+kotlinxCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.3" }
 kotlinxHtml = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.12.0" }
 misk = { module = "com.squareup.misk:misk", version.ref = "misk" }
 miskActions = { module = "com.squareup.misk:misk-actions", version.ref = "misk" }
diff --git a/service-self-backfill/build.gradle.kts b/service-self-backfill/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   `java-library`
   id("com.diffplug.spotless")
   id("com.vanniktech.maven.publish.base")
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -4,7 +4,7 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
 plugins {
   id("com.github.johnrengelman.shadow")
-  id("org.jetbrains.kotlin.jvm")
+  kotlin("jvm")
   id("com.diffplug.spotless")
   id("com.vanniktech.maven.publish.base")
   id("com.squareup.wire")
diff --git a/service/src/test/kotlin/app/cash/backfila/service/RunBlockingTestCancellable.kt b/service/src/test/kotlin/app/cash/backfila/service/RunBlockingTestCancellable.kt
@@ -1,9 +1,8 @@
 package app.cash.backfila.service
 
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.TestCoroutineScope
+import kotlinx.coroutines.test.runBlockingTest
 
 /**
  * Same as runBlocking but cancels the coroutines if an exception is thrown.
@@ -12,9 +11,9 @@ import kotlinx.coroutines.test.runTest
  */
 @Suppress("EXPERIMENTAL_API_USAGE")
 internal fun runBlockingTestCancellable(
-  testBody: suspend TestScope.() -> Unit,
+  testBody: suspend TestCoroutineScope.() -> Unit,
 ) {
-  runTest(UnconfinedTestDispatcher()) {
+  runBlockingTest {
     try {
       this.testBody()
     } catch (t: Throwable) {
diff --git a/service/src/test/kotlin/app/cash/backfila/service/VariableCapacityChannelTest.kt b/service/src/test/kotlin/app/cash/backfila/service/VariableCapacityChannelTest.kt
@@ -7,8 +7,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.channels.ClosedSendChannelException
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.runBlockingTest
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.fail
 import org.junit.jupiter.api.Test
@@ -17,7 +16,7 @@ import org.junit.jupiter.api.Test
 class VariableCapacityChannelTest {
   @Test
   fun empty() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -30,7 +29,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun sendBlockedUntilCoroutineRunsAndBuffers() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       assertThat(upstream.trySend("test").isSuccess).isFalse()
@@ -48,7 +47,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun receiveUnblocksSend() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -69,7 +68,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun increaseCapacityUnblocksAfterRead() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -96,7 +95,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun decreaseCapacity() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(2)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -126,7 +125,7 @@ class VariableCapacityChannelTest {
   }
 
   @Test fun closeUpstream() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -146,7 +145,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun cancelUpstream() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -166,7 +165,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun closeDownstream() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -185,7 +184,7 @@ class VariableCapacityChannelTest {
 
   @Test
   fun cancelDownstream() {
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(1)
       val upstream = variableCapacityChannel.upstream()
       launch {
@@ -205,7 +204,7 @@ class VariableCapacityChannelTest {
   @Test
   fun `listener is called`() {
     val size = AtomicInteger()
-    runTest(UnconfinedTestDispatcher()) {
+    runBlockingTest {
       val variableCapacityChannel = VariableCapacityChannel<String>(
         capacity = 3,
         queueSizeChangeListener = size::set,

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import com.vanniktech.maven.publish.KotlinJvm`
`4`	`4`	`import com.vanniktech.maven.publish.MavenPublishBaseExtension`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- id("org.jetbrains.kotlin.jvm")`
	`7`	`+ kotlin("jvm")`
`8`	`8`	`java-library`
`9`	`9`	`id("com.vanniktech.maven.publish.base")`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,13 @@ subprojects {`
`41`	`41`	`tasks.withType<KotlinCompile> {`
`42`	`42`	`dependsOn("spotlessKotlinApply")`
`43`	`43`	`compilerOptions {`
`44`		`- jvmTarget = JvmTarget.JVM_17`
	`44`	`+ jvmTarget = JvmTarget.JVM_11`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`tasks.withType<JavaCompile> {`
`49`		`- sourceCompatibility = JavaVersion.VERSION_17.toString()`
`50`		`- targetCompatibility = JavaVersion.VERSION_17.toString()`
	`49`	`+ sourceCompatibility = JavaVersion.VERSION_11.toString()`
	`50`	`+ targetCompatibility = JavaVersion.VERSION_11.toString()`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`configure<AllOpenExtension> {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.KotlinJvm`
`3`	`3`	`import com.vanniktech.maven.publish.MavenPublishBaseExtension`
`4`	`4`
`5`	`5`	`plugins {`
`6`		`- id("org.jetbrains.kotlin.jvm")`
	`6`	`+ kotlin("jvm")`
`7`	`7`	`java-library`
`8`	`8`	`id("com.vanniktech.maven.publish.base")`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`plugins {`
`18`		`- id("org.jetbrains.kotlin.jvm")`
	`18`	`+ kotlin("jvm")`
`19`	`19`	`java-library`
`20`	`20`	`id("org.flywaydb.flyway") version "7.15.0"`
`21`	`21`	`id("nu.studer.jooq") version "8.1"`