Skip to content

Commit 18dde8d

Browse files
committed
AGP8 post-revert due to publication problems
1 parent ecec5bf commit 18dde8d

10 files changed

Lines changed: 22 additions & 579 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ build
1515
.externalNativeBuild
1616
.cxx
1717
local.properties
18+
/kotlin-js-store/yarn.lock

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

commonapi/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ kotlin {
6262
}
6363
}
6464
val androidMain by getting
65-
val androidTest by getting
65+
val androidUnitTest by getting
6666
val jsMain by getting
6767
val jsTest by getting
6868
}

commoncore/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ kotlin {
6565
implementation(libs.timber)
6666
}
6767
}
68-
val androidTest by getting
68+
val androidUnitTest by getting
6969
val jsMain by getting
7070
val jsTest by getting
7171
}

commonregister/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ kotlin {
6969
implementation(libs.timber)
7070
}
7171
}
72-
val androidTest by getting
72+
val androidUnitTest by getting
7373
val jsMain by getting
7474
val jsTest by getting
7575
}

commonstatemachine/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ kotlin {
8888
val androidMain by getting {
8989
dependsOn(jvmMain)
9090
}
91-
val androidTest by getting {
91+
val androidUnitTest by getting {
9292
dependsOn(commonTest)
9393
}
9494
val jsMain by getting

coroutines/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ kotlin {
9494
val androidMain by getting {
9595
dependsOn(jvmMain)
9696
}
97-
val androidTest by getting {
97+
val androidUnitTest by getting {
9898
dependsOn(commonTest)
9999
}
100100
val jsMain by getting

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ kotlin.code.style=official
3535
# thereby reducing the size of the R class for that library
3636
android.nonTransitiveRClass=true
3737

38+
kotlin.mpp.androidSourceSetLayoutVersion=2
39+
3840
org.gradle.parallel=true
3941
org.gradle.caching=true
4042
org.gradle.configureondemand=true

gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
kotlin = "1.8.20"
33
dokka = "1.8.10"
44
coroutines = "1.6.4"
5-
compose = "1.3.1"
6-
compose_compiler = "1.4.2"
7-
hilt = "2.44.2"
5+
compose = "1.4.2"
6+
compose_compiler = "1.4.6"
7+
hilt = "2.45"
88

99
[plugins]
1010
android_app = { id = "com.android.application", version = "7.4.1" }
@@ -23,20 +23,20 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
2323
kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
2424
kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
2525

26-
desugaring = { module = "com.android.tools:desugar_jdk_libs", version = "2.0.2" }
26+
desugaring = { module = "com.android.tools:desugar_jdk_libs", version = "2.0.3" }
2727

28-
androidx-core = { module = "androidx.core:core-ktx", version = "1.9.0" }
29-
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.5.1" }
30-
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.5.1" }
31-
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.5.1" }
28+
androidx-core = { module = "androidx.core:core-ktx", version = "1.10.0" }
29+
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.6.1" }
30+
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.6.1" }
31+
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.6.1" }
3232

3333
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
3434
compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
3535
compose-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
3636
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
3737
compose-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
38-
compose-activity = { module = "androidx.activity:activity-compose", version = "1.6.1" }
39-
compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.5.1" }
38+
compose-activity = { module = "androidx.activity:activity-compose", version = "1.7.1" }
39+
compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.6.1" }
4040
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
4141
compose-foundation-layouts = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }
4242

@@ -54,13 +54,13 @@ test-kotlin-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref =
5454
test-kotlin-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
5555
test-junit = { module = "junit:junit", version = "4.13.2" }
5656
test-androidx-core = { module = "androidx.test:core", version = "1.5.0" }
57-
test-androidx-arch = { module = "androidx.arch.core:core-testing", version = "2.1.0" }
57+
test-androidx-arch = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
5858
test-androidx-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.3" }
5959
test-androidx-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.0-alpha05" }
6060
test-compose-ui = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
6161
test-compose-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
62-
test-mockk = { module = "io.mockk:mockk", version = "1.12.3" }
63-
test-mockk-common = { module = "io.mockk:mockk-common", version = "1.12.3" }
62+
test-mockk = { module = "io.mockk:mockk", version = "1.13.5" }
63+
test-mockk-common = { module = "io.mockk:mockk-common", version = "1.13.5" }
6464
test-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
6565

6666
[bundles]

0 commit comments

Comments
 (0)