Merge pull request #1123 from square/sedwards/update-kotlin-1.9

Update Kotlin 1.9 (and friends)
square · Oct 23, 2023 · 6014073 · 6014073
2 parents 55edfc1 + 3524e8f
commit 6014073
Show file tree

Hide file tree

Showing 40 changed files with 587 additions and 464 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -487,7 +487,7 @@ kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
 # test methods with descriptive names.
 ktlint_ignore_back_ticked_identifier = true
 
-ktlint_code_style = official
+# ktlint_code_style = official
 ktlint_function_signature_body_expression_wrapping = default
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 3
 

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -1,3 +1,8 @@
+plugins {
+  // Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
+  kotlin("jvm") version "1.9.10" apply false
+}
+
 dependencyResolutionManagement {
 
   @Suppress("UnstableApiUsage")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -85,7 +85,7 @@ subprojects {
 
           // URL showing where the source code can be accessed through the web browser
           remoteUrl.set(
-            @Suppress("ktlint:max-line-length")
+            @Suppress("ktlint:standard:max-line-length")
             URL(
               "https://github.com/square/workflow-kotlin/blob/main/$modulePath/src/${dokkaSourceSet.name}"
             )

diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt
@@ -57,7 +57,7 @@ com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.9
 com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
-com.google.devtools.ksp:symbol-processing-gradle-plugin:1.8.10-1.0.9
+com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.10-1.0.13
 com.google.errorprone:error_prone_annotations:2.11.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
@@ -70,22 +70,22 @@ com.google.protobuf:protobuf-java:3.19.3
 com.google.testing.platform:core-proto:0.0.8-alpha08
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
-com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.1.7
-com.rickbusarow.ktlint:ktlint-gradle-plugin:0.1.7
+com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.1.8
+com.rickbusarow.ktlint:ktlint-gradle-plugin:0.1.8
 com.squareup.moshi:moshi-adapters:1.15.0
 com.squareup.moshi:moshi:1.15.0
-com.squareup.okhttp3:okhttp:4.10.0
-com.squareup.okio:okio-jvm:3.0.0
-com.squareup.okio:okio:3.0.0
+com.squareup.okhttp3:okhttp:4.11.0
+com.squareup.okio:okio-jvm:3.2.0
+com.squareup.okio:okio:3.2.0
 com.squareup.retrofit2:converter-moshi:2.9.0
 com.squareup.retrofit2:retrofit:2.9.0
 com.squareup:javapoet:1.10.0
 com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.fastinfoset:FastInfoset:1.2.16
-com.vanniktech:gradle-maven-publish-plugin:0.25.2
-com.vanniktech:nexus:0.25.2
+com.vanniktech:gradle-maven-publish-plugin:0.25.3
+com.vanniktech:nexus:0.25.3
 commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.2
@@ -130,47 +130,45 @@ org.codehaus.woodstox:stax2-api:4.2.1
 org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.3.2
 org.jdom:jdom2:2.0.6
-org.jetbrains.dokka:dokka-core:1.8.20
-org.jetbrains.dokka:dokka-gradle-plugin:1.8.20
+org.jetbrains.dokka:dokka-core:1.9.0
+org.jetbrains.dokka:dokka-gradle-plugin:1.9.0
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-android-extensions:1.8.10
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.10
-org.jetbrains.kotlin:kotlin-bom:1.8.10
-org.jetbrains.kotlin:kotlin-build-common:1.8.10
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10
-org.jetbrains.kotlin:kotlin-compiler-runner:1.8.10
-org.jetbrains.kotlin:kotlin-daemon-client:1.8.10
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.10
-org.jetbrains.kotlin:kotlin-native-utils:1.8.10
-org.jetbrains.kotlin:kotlin-project-model:1.8.10
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.10
+org.jetbrains.kotlin:kotlin-bom:1.9.10
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.10
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.10
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.10
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.10
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.10
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.10
+org.jetbrains.kotlin:kotlin-native-utils:1.9.10
+org.jetbrains.kotlin:kotlin-project-model:1.9.10
 org.jetbrains.kotlin:kotlin-reflect:1.9.10
-org.jetbrains.kotlin:kotlin-scripting-common:1.8.10
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10
-org.jetbrains.kotlin:kotlin-serialization:1.8.10
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.10
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.10
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.10
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.10
+org.jetbrains.kotlin:kotlin-serialization:1.9.10
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
 org.jetbrains.kotlin:kotlin-stdlib:1.9.10
-org.jetbrains.kotlin:kotlin-tooling-core:1.8.10
-org.jetbrains.kotlin:kotlin-util-io:1.8.10
-org.jetbrains.kotlin:kotlin-util-klib:1.8.10
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.10
+org.jetbrains.kotlin:kotlin-util-io:1.9.10
+org.jetbrains.kotlin:kotlin-util-klib:1.9.10
 org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2
 org.jetbrains:annotations:13.0
-org.jetbrains:markdown-jvm:0.3.1
-org.jetbrains:markdown:0.3.1
-org.jsoup:jsoup:1.15.3
 org.jvnet.staxex:stax-ex:1.8.1
 org.ow2.asm:asm-analysis:9.2
 org.ow2.asm:asm-commons:9.2

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ androidx-activity = "1.6.1"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.1.1"
 androidx-cardview = "1.0.0"
-androidx-compose-compiler = "1.4.4"
+androidx-compose-compiler = "1.5.3"
 # see https://developer.android.com/jetpack/compose/bom/bom-mapping
 androidx-compose-bom = "2023.01.00"
 androidx-constraintlayout = "2.1.4"
@@ -37,30 +37,31 @@ androidx-tracing = "1.1.0"
 androidx-transition = "1.4.1"
 
 detekt = "1.19.0"
-dokka = "1.8.20"
+dokka = "1.9.0"
 dependencyGuard = "0.4.3"
 
 google-accompanist = "0.18.0"
 google-dagger = "2.40.5"
-google-ksp = "1.8.10-1.0.9"
+google-ksp = "1.9.10-1.0.13"
 google-material = "1.4.0"
 
 groovy = "3.0.9"
 jUnit = "4.13.2"
 java-diff-utils = "4.12"
 javaParser = "3.24.0"
 kotest = "5.1.0"
-kotlin = "1.8.10"
+# Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
+# of loading the library versions from this file but should be the same.
+kotlin = "1.9.10"
 
 kotlinx-binary-compatibility = "0.13.2"
-kotlinx-coroutines = "1.7.1"
-kotlinx-serialization-json = "1.5.1"
-kotlinx-atomicfu = "0.21.0"
+kotlinx-coroutines = "1.7.3"
+kotlinx-serialization-json = "1.6.0"
+kotlinx-atomicfu = "0.22.0"
 
 ktlint = "0.49.1"
-ktlint-gradle = "0.1.7"
+ktlint-gradle = "0.1.8"
 material = "1.3.0"
-mavenPublish = "0.13.0"
 
 mockito-core = "3.12.4"
 mockito-kotlin = "3.2.0"
@@ -85,7 +86,7 @@ squareup-workflow = "1.0.0"
 timber = "5.0.1"
 truth = "1.1.5"
 turbine = "1.0.0"
-vanniktech-publish = "0.25.2"
+vanniktech-publish = "0.25.3"
 
 [plugins]
 

diff --git a/internal-testing-utils/dependencies/runtimeClasspath.txt b/internal-testing-utils/dependencies/runtimeClasspath.txt
@@ -1,6 +1,6 @@
-org.jetbrains.kotlin:kotlin-bom:1.8.10
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10
-org.jetbrains.kotlin:kotlin-stdlib:1.8.10
+org.jetbrains.kotlin:kotlin-bom:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib:1.9.10
 org.jetbrains:annotations:13.0