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 1
1
plugins {
2
2
// 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
4
4
}
5
5
6
6
dependencyResolutionManagement {
Original file line number Diff line number Diff line change 1
1
[versions ]
2
2
3
- agpVersion = " 8.11 .0"
3
+ agpVersion = " 8.8 .0"
4
4
5
5
compileSdk = " 34"
6
6
minSdk = " 24"
7
7
targetSdk = " 33"
8
8
9
- jdk-target = " 11 "
9
+ jdk-target = " 1.8 "
10
10
jdk-toolchain = " 17"
11
11
12
12
androidx-activity = " 1.8.2"
@@ -46,19 +46,19 @@ filekit-dialogs-compose = "0.10.0-beta03"
46
46
47
47
google-accompanist = " 0.18.0"
48
48
google-dagger = " 2.40.5"
49
- google-ksp = " 2.2.0-2 .0.2 "
49
+ google-ksp = " 2.0.21-1 .0.26 "
50
50
google-material = " 1.4.0"
51
51
52
52
groovy = " 3.0.9"
53
53
jUnit = " 4.13.2"
54
54
java-diff-utils = " 4.12"
55
55
javaParser = " 3.24.0"
56
- jetbrains-compose-plugin = " 1.8.2 "
56
+ jetbrains-compose-plugin = " 1.7.3 "
57
57
kgx = " 0.1.12"
58
58
kotest = " 5.1.0"
59
59
# Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
60
60
# of loading the library versions from this file but should be the same.
61
- kotlin = " 2.2.0 "
61
+ kotlin = " 2.0.21 "
62
62
63
63
kotlinx-binary-compatibility = " 0.17.0"
64
64
kotlinx-coroutines = " 1.9.0"
@@ -95,10 +95,8 @@ timber = "5.0.1"
95
95
truth = " 1.4.4"
96
96
turbine = " 1.0.0"
97
97
vanniktech-publish = " 0.32.0"
98
- compose-hot-reload = " 1.0.0-beta02"
99
98
100
99
[plugins ]
101
- compose-hot-reload = { id = " org.jetbrains.compose.hot-reload" , version.ref = " compose-hot-reload" }
102
100
kotlin-jvm = { id = " org.jetbrains.kotlin.jvm" , version.ref = " kotlin" }
103
101
104
102
compose-compiler = { id = " org.jetbrains.kotlin.plugin.compose" , version.ref = " kotlin" }
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
distributionPath =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
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ buildscript {
8
8
9
9
deps = [
10
10
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" ,
12
12
appcompat : ' androidx.appcompat:appcompat:1.3.1' ,
13
13
constraintlayout : ' androidx.constraintlayout:constraintlayout:2.0.1' ,
14
14
kotlin : [
Original file line number Diff line number Diff line change 1
1
com.squareup.okio:okio-jvm:3.3.0
2
2
com.squareup.okio:okio:3.3.0
3
3
io.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
9
9
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
10
10
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
11
11
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
Original file line number Diff line number Diff line change 1
1
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2
- import org.jetbrains.compose.reload.gradle.ComposeHotRun
3
2
4
3
plugins {
5
4
id(" kotlin-multiplatform" )
6
5
alias(libs.plugins.jetbrains.compose)
7
6
alias(libs.plugins.compose.compiler)
8
- alias(libs.plugins.compose.hot.reload)
9
7
}
10
8
11
9
kotlin {
@@ -38,12 +36,7 @@ kotlin {
38
36
}
39
37
}
40
38
}
41
- tasks.withType<ComposeHotRun >().configureEach {
42
- mainClass.set(" com.squareup.workflow1.traceviewer.MainKt" )
43
- jvmArgs(
44
- " -Dapple.awt.application.appearance=system"
45
- )
46
- }
39
+
47
40
compose {
48
41
desktop {
49
42
application {
You can’t perform that action at this time.
0 commit comments