Skip to content

Commit 74635d9

Browse files
steve-the-edwardssteve-the-edwards
authored
Merge pull request #1242 from square/sedwards/update-versions
Update to Kotlin 1.9.24, w/ corresponding Compose, KSP
2 parents 7a0d51d + 6e59250 commit 74635d9

File tree

46 files changed

+333
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+333
-287
lines changed

‎benchmarks/performance-poetry/complex-benchmark/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ android {
4444
}
4545

4646
// Unclear: there are kotlin_builtins duplication between 1.5.20 and 1.6.10?
47-
packagingOptions {
47+
packaging {
4848
resources.excludes.add("**/*.kotlin_*")
4949
}
5050

‎benchmarks/performance-poetry/complex-poetry/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ android {
4444
}
4545

4646
// Collisions in packaging.
47-
packagingOptions {
47+
packaging {
4848
resources.excludes.add("META-INF/AL2.0")
4949
resources.excludes.add("META-INF/LGPL2.1")
5050
}

‎build-logic/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
// Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
3-
kotlin("jvm") version "1.9.10" apply false
3+
kotlin("jvm") version "1.9.24" apply false
44
}
55

66
dependencyResolutionManagement {

‎build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.squareup.workflow1.buildsrc
33
import com.android.build.gradle.TestedExtension
44
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
55
import com.rickbusarow.kgx.dependency
6+
import com.rickbusarow.kgx.library
67
import com.rickbusarow.kgx.libsCatalog
78
import com.squareup.workflow1.buildsrc.internal.implementation
89
import com.squareup.workflow1.buildsrc.internal.invoke
@@ -31,8 +32,8 @@ class AndroidSampleAppPlugin : Plugin<Project> {
3132
implementation(target.project(":workflow-runtime"))
3233
implementation(target.project(":workflow-config:config-android"))
3334

34-
implementation(target.libsCatalog.dependency("androidx-appcompat"))
35-
implementation(target.libsCatalog.dependency("timber"))
35+
implementation(target.libsCatalog.library("androidx-appcompat"))
36+
implementation(target.libsCatalog.library("timber"))
3637
}
3738
}
3839
}

‎build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidUiTestsPlugin.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.squareup.workflow1.buildsrc
22

33
import com.android.build.gradle.TestedExtension
44
import com.rickbusarow.kgx.dependency
5+
import com.rickbusarow.kgx.library
56
import com.rickbusarow.kgx.libsCatalog
67
import com.squareup.workflow1.buildsrc.internal.androidTestImplementation
78
import com.squareup.workflow1.buildsrc.internal.invoke
@@ -28,9 +29,9 @@ class AndroidUiTestsPlugin : Plugin<Project> {
2829
target.dependencies {
2930
androidTestImplementation(target.project(":workflow-ui:internal-testing-android"))
3031

31-
androidTestImplementation(target.libsCatalog.dependency("androidx-test-espresso-core"))
32-
androidTestImplementation(target.libsCatalog.dependency("androidx-test-junit"))
33-
androidTestImplementation(target.libsCatalog.dependency("squareup-leakcanary-instrumentation"))
32+
androidTestImplementation(target.libsCatalog.library("androidx-test-espresso-core"))
33+
androidTestImplementation(target.libsCatalog.library("androidx-test-junit"))
34+
androidTestImplementation(target.libsCatalog.library("squareup-leakcanary-instrumentation"))
3435
}
3536
}
3637
}

‎build-logic/src/main/java/com/squareup/workflow1/buildsrc/ComposeUiTestsPlugin.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.squareup.workflow1.buildsrc
22

33
import com.rickbusarow.kgx.dependency
4+
import com.rickbusarow.kgx.library
45
import com.rickbusarow.kgx.libsCatalog
56
import com.squareup.workflow1.buildsrc.internal.androidTestImplementation
67
import com.squareup.workflow1.buildsrc.internal.invoke
@@ -15,7 +16,7 @@ class ComposeUiTestsPlugin : Plugin<Project> {
1516
target.dependencies {
1617
androidTestImplementation(target.project(":workflow-ui:internal-testing-compose"))
1718

18-
androidTestImplementation(target.libsCatalog.dependency("androidx-compose-ui-test-junit4"))
19+
androidTestImplementation(target.libsCatalog.library("androidx-compose-ui-test-junit4"))
1920
}
2021
}
2122
}

‎build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinMultiplatformExtensions.kt‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
package com.squareup.workflow1.buildsrc
22

3-
import org.gradle.api.Project
43
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
5-
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
64

7-
fun KotlinMultiplatformExtension.iosWithSimulatorArm64(target: Project) {
8-
ios()
5+
fun KotlinMultiplatformExtension.iosWithSimulatorArm64() {
6+
iosX64()
7+
iosArm64()
98
iosSimulatorArm64()
10-
11-
sourceSets.getByName("iosSimulatorArm64Main") {
12-
it.dependsOn(sourceSets.getByName("iosMain"))
13-
}
14-
sourceSets.getByName("iosSimulatorArm64Test") {
15-
it.dependsOn(sourceSets.getByName("iosTest"))
16-
}
179
}

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@ tasks.register<Copy>("siteDokka") {
137137
// Copy the files instead of configuring a different output directory on the dokka task itself
138138
// since the default output directories disambiguate between different types of outputs, and our
139139
// custom directory doesn't.
140-
from(buildDir.resolve("dokka/htmlMultiModule/workflow"))
141-
into(buildDir.resolve("dokka/workflow"))
140+
from(layout.buildDirectory.file("dokka/htmlMultiModule/workflow"))
141+
into(layout.buildDirectory.file("dokka/workflow"))
142142
}

‎dependencies/classpath.txt‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ com.google.code.findbugs:jsr305:3.0.2
5757
com.google.code.gson:gson:2.8.9
5858
com.google.crypto.tink:tink:1.7.0
5959
com.google.dagger:dagger:2.28.3
60-
com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.10-1.0.13
60+
com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20
61+
com.google.devtools.ksp:symbol-processing-common-deps:1.9.24-1.0.20
62+
com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.24-1.0.20
6163
com.google.errorprone:error_prone_annotations:2.11.0
6264
com.google.flatbuffers:flatbuffers-java:1.12.0
6365
com.google.guava:failureaccess:1.0.1
@@ -135,36 +137,36 @@ org.jdom:jdom2:2.0.6
135137
org.jetbrains.dokka:dokka-core:1.9.10
136138
org.jetbrains.dokka:dokka-gradle-plugin:1.9.10
137139
org.jetbrains.intellij.deps:trove4j:1.0.20200330
138-
org.jetbrains.kotlin:kotlin-android-extensions:1.9.10
139-
org.jetbrains.kotlin:kotlin-bom:1.9.10
140-
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.10
141-
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.10
142-
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.10
143-
org.jetbrains.kotlin:kotlin-daemon-client:1.9.10
144-
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.10
145-
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.10
146-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10
147-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.10
148-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.10
149-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.10
150-
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10
151-
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.10
152-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.10
153-
org.jetbrains.kotlin:kotlin-native-utils:1.9.10
154-
org.jetbrains.kotlin:kotlin-project-model:1.9.10
140+
org.jetbrains.kotlin:kotlin-android-extensions:1.9.24
141+
org.jetbrains.kotlin:kotlin-bom:1.9.24
142+
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24
143+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
144+
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24
145+
org.jetbrains.kotlin:kotlin-daemon-client:1.9.24
146+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
147+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24
148+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24
149+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24
150+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24
151+
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24
152+
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
153+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24
154+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24
155+
org.jetbrains.kotlin:kotlin-native-utils:1.9.24
156+
org.jetbrains.kotlin:kotlin-project-model:1.9.24
155157
org.jetbrains.kotlin:kotlin-reflect:1.9.10
156-
org.jetbrains.kotlin:kotlin-scripting-common:1.9.10
157-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.10
158-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.10
159-
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.10
160-
org.jetbrains.kotlin:kotlin-serialization:1.9.10
158+
org.jetbrains.kotlin:kotlin-scripting-common:1.9.24
159+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24
160+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24
161+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24
162+
org.jetbrains.kotlin:kotlin-serialization:1.9.24
161163
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
162-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
163-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
164+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
165+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
164166
org.jetbrains.kotlin:kotlin-stdlib:1.9.10
165-
org.jetbrains.kotlin:kotlin-tooling-core:1.9.10
166-
org.jetbrains.kotlin:kotlin-util-io:1.9.10
167-
org.jetbrains.kotlin:kotlin-util-klib:1.9.10
167+
org.jetbrains.kotlin:kotlin-tooling-core:1.9.24
168+
org.jetbrains.kotlin:kotlin-util-io:1.9.24
169+
org.jetbrains.kotlin:kotlin-util-klib:1.9.24
168170
org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2
169171
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
170172
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3

‎gradle/libs.versions.toml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ androidx-activity = "1.6.1"
1313
androidx-appcompat = "1.6.1"
1414
androidx-benchmark = "1.2.3"
1515
androidx-cardview = "1.0.0"
16-
androidx-compose-compiler = "1.5.3"
16+
androidx-compose-compiler = "1.5.14"
1717
# see https://developer.android.com/jetpack/compose/bom/bom-mapping
18-
androidx-compose-bom = "2023.01.00"
18+
androidx-compose-bom = "2024.09.02"
1919
androidx-constraintlayout = "2.1.4"
2020
androidx-core = "1.12.0"
2121
androidx-fragment = "1.3.6"
2222
androidx-gridlayout = "1.0.0"
23-
androidx-lifecycle = "2.6.1"
23+
androidx-lifecycle = "2.8.7"
2424
androidx-navigation = "2.4.0-alpha09"
2525
androidx-paging = "3.0.1"
2626
androidx-profileinstaller = "1.2.0-alpha02"
@@ -42,7 +42,7 @@ dependencyGuard = "0.4.3"
4242

4343
google-accompanist = "0.18.0"
4444
google-dagger = "2.40.5"
45-
google-ksp = "1.9.10-1.0.13"
45+
google-ksp = "1.9.24-1.0.20"
4646
google-material = "1.4.0"
4747

4848
groovy = "3.0.9"
@@ -53,7 +53,7 @@ kgx = "0.1.12"
5353
kotest = "5.1.0"
5454
# Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
5555
# of loading the library versions from this file but should be the same.
56-
kotlin = "1.9.10"
56+
kotlin = "1.9.24"
5757

5858
kotlinx-binary-compatibility = "0.13.2"
5959
kotlinx-coroutines = "1.7.3"
@@ -120,9 +120,9 @@ androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", ver
120120

121121
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
122122

123-
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
124123
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
125124

125+
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
126126
androidx-compose-material = { module = "androidx.compose.material:material" }
127127

128128
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
@@ -145,6 +145,7 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
145145
androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidx-gridlayout" }
146146

147147
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
148+
androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
148149
androidx-lifecycle-core = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
149150
androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
150151
androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "androidx-lifecycle" }

0 commit comments

Comments
 (0)