Skip to content

Commit

Permalink
AGP8 post-revert due to publication problems
Browse files Browse the repository at this point in the history
  • Loading branch information
motorro committed Apr 21, 2023
1 parent ecec5bf commit 18dde8d
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 579 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ build
.externalNativeBuild
.cxx
local.properties
/kotlin-js-store/yarn.lock
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion commonapi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ kotlin {
}
}
val androidMain by getting
val androidTest by getting
val androidUnitTest by getting
val jsMain by getting
val jsTest by getting
}
Expand Down
2 changes: 1 addition & 1 deletion commoncore/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ kotlin {
implementation(libs.timber)
}
}
val androidTest by getting
val androidUnitTest by getting
val jsMain by getting
val jsTest by getting
}
Expand Down
2 changes: 1 addition & 1 deletion commonregister/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ kotlin {
implementation(libs.timber)
}
}
val androidTest by getting
val androidUnitTest by getting
val jsMain by getting
val jsTest by getting
}
Expand Down
2 changes: 1 addition & 1 deletion commonstatemachine/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ kotlin {
val androidMain by getting {
dependsOn(jvmMain)
}
val androidTest by getting {
val androidUnitTest by getting {
dependsOn(commonTest)
}
val jsMain by getting
Expand Down
2 changes: 1 addition & 1 deletion coroutines/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ kotlin {
val androidMain by getting {
dependsOn(jvmMain)
}
val androidTest by getting {
val androidUnitTest by getting {
dependsOn(commonTest)
}
val jsMain by getting
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true

kotlin.mpp.androidSourceSetLayoutVersion=2

org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configureondemand=true
Expand Down
26 changes: 13 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
kotlin = "1.8.20"
dokka = "1.8.10"
coroutines = "1.6.4"
compose = "1.3.1"
compose_compiler = "1.4.2"
hilt = "2.44.2"
compose = "1.4.2"
compose_compiler = "1.4.6"
hilt = "2.45"

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

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

androidx-core = { module = "androidx.core:core-ktx", version = "1.9.0" }
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.5.1" }
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.5.1" }
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.5.1" }
androidx-core = { module = "androidx.core:core-ktx", version = "1.10.0" }
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.6.1" }
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.6.1" }
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.6.1" }

compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
compose-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
compose-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
compose-activity = { module = "androidx.activity:activity-compose", version = "1.6.1" }
compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.5.1" }
compose-activity = { module = "androidx.activity:activity-compose", version = "1.7.1" }
compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.6.1" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose-foundation-layouts = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }

Expand All @@ -54,13 +54,13 @@ test-kotlin-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref =
test-kotlin-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
test-junit = { module = "junit:junit", version = "4.13.2" }
test-androidx-core = { module = "androidx.test:core", version = "1.5.0" }
test-androidx-arch = { module = "androidx.arch.core:core-testing", version = "2.1.0" }
test-androidx-arch = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
test-androidx-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.3" }
test-androidx-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.0-alpha05" }
test-compose-ui = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
test-compose-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
test-mockk = { module = "io.mockk:mockk", version = "1.12.3" }
test-mockk-common = { module = "io.mockk:mockk-common", version = "1.12.3" }
test-mockk = { module = "io.mockk:mockk", version = "1.13.5" }
test-mockk-common = { module = "io.mockk:mockk-common", version = "1.13.5" }
test-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }

[bundles]
Expand Down
Loading

0 comments on commit 18dde8d

Please sign in to comment.