File tree Expand file tree Collapse file tree 6 files changed +14
-23
lines changed
workflow-rx2/dependencies Expand file tree Collapse file tree 6 files changed +14
-23
lines changed Original file line number Diff line number Diff line change 11plugins {
22 // Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
3- kotlin(" jvm" ) version " 2.2.0 " apply false
3+ kotlin(" jvm" ) version " 2.0.21 " apply false
44}
55
66dependencyResolutionManagement {
Original file line number Diff line number Diff line change 11[versions ]
22
3- agpVersion = " 8.11 .0"
3+ agpVersion = " 8.8 .0"
44
55compileSdk = " 34"
66minSdk = " 24"
77targetSdk = " 33"
88
9- jdk-target = " 11 "
9+ jdk-target = " 1.8 "
1010jdk-toolchain = " 17"
1111
1212androidx-activity = " 1.8.2"
@@ -46,19 +46,19 @@ filekit-dialogs-compose = "0.10.0-beta03"
4646
4747google-accompanist = " 0.18.0"
4848google-dagger = " 2.40.5"
49- google-ksp = " 2.2.0-2 .0.2 "
49+ google-ksp = " 2.0.21-1 .0.26 "
5050google-material = " 1.4.0"
5151
5252groovy = " 3.0.9"
5353jUnit = " 4.13.2"
5454java-diff-utils = " 4.12"
5555javaParser = " 3.24.0"
56- jetbrains-compose-plugin = " 1.8.2 "
56+ jetbrains-compose-plugin = " 1.7.3 "
5757kgx = " 0.1.12"
5858kotest = " 5.1.0"
5959# Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
6060# of loading the library versions from this file but should be the same.
61- kotlin = " 2.2.0 "
61+ kotlin = " 2.0.21 "
6262
6363kotlinx-binary-compatibility = " 0.17.0"
6464kotlinx-coroutines = " 1.9.0"
@@ -95,10 +95,8 @@ timber = "5.0.1"
9595truth = " 1.4.4"
9696turbine = " 1.0.0"
9797vanniktech-publish = " 0.32.0"
98- compose-hot-reload = " 1.0.0-beta02"
9998
10099[plugins ]
101- compose-hot-reload = { id = " org.jetbrains.compose.hot-reload" , version.ref = " compose-hot-reload" }
102100kotlin-jvm = { id = " org.jetbrains.kotlin.jvm" , version.ref = " kotlin" }
103101
104102compose-compiler = { id = " org.jetbrains.kotlin.plugin.compose" , version.ref = " kotlin" }
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionUrl =https\://services.gradle.org/distributions/gradle-8.13-all .zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.13-bin .zip
44zipStoreBase =GRADLE_USER_HOME
55zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ buildscript {
88
99 deps = [
1010 activityktx : ' androidx.activity:activity-ktx:1.3.0' ,
11- agp : " com.android.tools.build:gradle:8.11 .0" ,
11+ agp : " com.android.tools.build:gradle:8.8 .0" ,
1212 appcompat : ' androidx.appcompat:appcompat:1.3.1' ,
1313 constraintlayout : ' androidx.constraintlayout:constraintlayout:2.0.1' ,
1414 kotlin : [
Original file line number Diff line number Diff line change 11com.squareup.okio:okio-jvm:3.3.0
22com.squareup.okio:okio:3.3.0
33io.reactivex.rxjava2:rxjava:2.2.21
4- org.jetbrains.kotlin:kotlin-bom:2.2.0
5- org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
6- org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0
7- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0
8- org.jetbrains.kotlin:kotlin-stdlib:2.2.0
4+ org.jetbrains.kotlin:kotlin-bom:2.0.21
5+ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
6+ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
7+ org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
8+ org.jetbrains.kotlin:kotlin-stdlib:2.0.21
99org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
1010org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
1111org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
Original file line number Diff line number Diff line change 11import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2- import org.jetbrains.compose.reload.gradle.ComposeHotRun
32
43plugins {
54 id(" kotlin-multiplatform" )
65 alias(libs.plugins.jetbrains.compose)
76 alias(libs.plugins.compose.compiler)
8- alias(libs.plugins.compose.hot.reload)
97}
108
119kotlin {
@@ -38,12 +36,7 @@ kotlin {
3836 }
3937 }
4038}
41- tasks.withType<ComposeHotRun >().configureEach {
42- mainClass.set(" com.squareup.workflow1.traceviewer.MainKt" )
43- jvmArgs(
44- " -Dapple.awt.application.appearance=system"
45- )
46- }
39+
4740compose {
4841 desktop {
4942 application {
You can’t perform that action at this time.
0 commit comments