diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..c2bae49 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..148fdd2 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/ktlint-plugin.xml b/.idea/ktlint-plugin.xml new file mode 100644 index 0000000..bee5678 --- /dev/null +++ b/.idea/ktlint-plugin.xml @@ -0,0 +1,6 @@ + + + + DISTRACT_FREE + + \ No newline at end of file diff --git a/.idea/palantir-java-format.xml b/.idea/palantir-java-format.xml new file mode 100644 index 0000000..8d17be0 --- /dev/null +++ b/.idea/palantir-java-format.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build-logic/convention/src/main/kotlin/Versions.kt b/build-logic/convention/src/main/kotlin/Versions.kt index f94c6e8..301b07f 100644 --- a/build-logic/convention/src/main/kotlin/Versions.kt +++ b/build-logic/convention/src/main/kotlin/Versions.kt @@ -12,7 +12,7 @@ object Versions { const val versionCode = 2401 // https://developer.android.com/jetpack/androidx/releases/compose-compiler?hl=zh-cn - const val composeCompiler = "1.5.12" + const val composeCompiler = "1.5.14" // jvmToolchain const val jdkVersion = 17 diff --git a/build.gradle.kts b/build.gradle.kts index 55576fb..4d7e20e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,11 +66,11 @@ allprojects { } gradle.taskGraph.whenReady { - tasks.forEach { task -> + tasks.forEach { /* Encountering the “Unable to make progress running work” Error in Gradle? */ // gradle.startParameter.excludedTaskNames.addAll(listOf(":build-logic:convention:testClasses")) - if (task?.name?.contains(":testClasses", ignoreCase = false) == true) { - task.enabled = false + if (it.name.contains(":testClasses", ignoreCase = false)) { + it.enabled = false } } } diff --git a/gradle.properties b/gradle.properties index 51f97dc..5befbaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,9 @@ org.gradle.caching=true org.gradle.configureondemand=true org.gradle.configuration-cache=true -# Android -android.useAndroidX=true -android.nonTransitiveRClass=true -android.debug.obsoleteApi=true -# https://developer.android.com/build/releases/gradle-plugin?hl=zh-cn -# Turn on Precise resource shrinking -android.enableNewResourceShrinker.preciseShrinking=true -# Run 'aapt optimize' on resources to minimize their APK size impact. -android.enableResourceOptimizations=true +# This is needed for the JB Compose runtime to link on native targets. They also use this flag +# in their samples. Over time it should be removed once they figure out why it was needed. +kotlin.native.cacheKind=none # Kotlin kotlin.code.style=official @@ -28,6 +22,16 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 # Compose #org.jetbrains.compose.experimental.wasm.enabled=true +# Android +android.useAndroidX=true +android.nonTransitiveRClass=true +android.debug.obsoleteApi=true +# https://developer.android.com/build/releases/gradle-plugin?hl=zh-cn +# Turn on Precise resource shrinking +android.enableNewResourceShrinker.preciseShrinking=true +# Run 'aapt optimize' on resources to minimize their APK size impact. +android.enableResourceOptimizations=true + # moko-resources moko.resources.disableStaticFrameworkWarning=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cfded76..91bcf83 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "1.9.23" +kotlin = "1.9.24" agp = "8.2.2" -redwood = "0.10.0" +redwood = "0.11.0" androidx-activityCompose = "1.9.0" androidx-appcompat = "1.6.1" @@ -9,8 +9,8 @@ androidx-constraintlayout = "2.1.4" androidx-core-ktx = "1.13.0" androidx-material = "1.11.0" -jetpack-compose = "1.6.6" -jetbrains-compose = "1.6.2" +jetpackCompose = "1.6.6" +jetbrainsCompose = "1.6.2" compose-material3 = "1.2.1" @@ -28,21 +28,21 @@ androidx-material = { group = "com.google.android.material", name = "material", androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } -# -------- JetBrains Compose: https://github.com/JetBrains/compose-multiplatform/releases -------- -jetbrains-compose-compiler = "org.jetbrains.compose.compiler:compiler:1.5.10.1" -jetbrains-compose-gradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrains-compose" } -jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrains-compose" } -jetbrains-compose-runtime-saveable = { module = "org.jetbrains.compose.runtime:runtime-saveable", version.ref = "jetbrains-compose" } -jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "jetbrains-compose" } -jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "jetbrains-compose" } -jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "jetbrains-compose" } -jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "jetbrains-compose" } -jetbrains-compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "jetbrains-compose" } -jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jetbrains-compose" } -jetbrains-compose-animation = { module = "org.jetbrains.compose.animation:animation-core", version.ref = "jetbrains-compose" } -jetbrains-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "jetbrains-compose" } +# JetBrains Compose: https://github.com/JetBrains/compose-multiplatform +jetbrains-compose-compiler = "org.jetbrains.compose.compiler:compiler:1.5.14" +jetbrains-compose-gradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrainsCompose" } +jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrainsCompose" } +jetbrains-compose-runtime-saveable = { module = "org.jetbrains.compose.runtime:runtime-saveable", version.ref = "jetbrainsCompose" } +jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "jetbrainsCompose" } +jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "jetbrainsCompose" } +jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "jetbrainsCompose" } +jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "jetbrainsCompose" } +jetbrains-compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "jetbrainsCompose" } +jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jetbrainsCompose" } +jetbrains-compose-animation = { module = "org.jetbrains.compose.animation:animation-core", version.ref = "jetbrainsCompose" } +jetbrains-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "jetbrainsCompose" } -# -------- redwood: https://github.com/cashapp/redwood -------- +# Redwood: https://github.com/cashapp/redwood redwood-compose = { module = "app.cash.redwood:redwood-compose", version.ref = "redwood" } redwood-composeui = { module = "app.cash.redwood:redwood-composeui", version.ref = "redwood" } redwood-widget-compose = { module = "app.cash.redwood:redwood-widget-compose", version.ref = "redwood" } @@ -64,7 +64,7 @@ android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" } -jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" } +jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" } cashapp-redwood = { id = "app.cash.redwood", version.ref = "redwood" } diff --git a/gradle/moko.versions.toml b/gradle/moko.versions.toml index 19aad1f..c5a5c37 100644 --- a/gradle/moko.versions.toml +++ b/gradle/moko.versions.toml @@ -1,6 +1,6 @@ [versions] # https://repo.maven.apache.org/maven2/dev/icerock/moko/resources/ -resources = "0.24.0-beta-4" +resources = "0.24.0-beta-5" [plugins]