build: Improve build scripts

Author: panpf

build.gradle.kts

@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
@@ -82,9 +83,9 @@ fun Project.jvmTargetConfig() {
 fun Project.composeConfig() {
     plugins.withId("org.jetbrains.kotlin.plugin.compose") {
         extensions.configure<ComposeCompilerGradlePluginExtension> {
-            enableIntrinsicRemember = true
-            enableNonSkippingGroupOptimization = true
-            enableStrongSkippingMode = true
+            featureFlags.addAll(
+                ComposeFeatureFlag.OptimizeNonSkippingGroups
+            )
             stabilityConfigurationFile = rootDir.resolve("sketch-core/compose_compiler_config.conf")
 
             /**

buildSrc/src/main/kotlin/multiplatform.kt

@@ -14,6 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+@file:Suppress("unused")
+
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.Project
@@ -132,11 +136,11 @@ fun Project.applyKotlinJsImplicitDependencyWorkaround() {
             dependsOn(named("jsProductionExecutableCompileSync"))
             dependsOn(named("jsTestTestDevelopmentExecutableCompileSync"))
 
-            dependsOn(getByPath(":sketch-singleton:jsDevelopmentLibraryCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:jsDevelopmentExecutableCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:jsProductionLibraryCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:jsProductionExecutableCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:jsTestTestDevelopmentExecutableCompileSync"))
+            dependsOn(getByPath(":sketch-core:jsDevelopmentLibraryCompileSync"))
+            dependsOn(getByPath(":sketch-core:jsDevelopmentExecutableCompileSync"))
+            dependsOn(getByPath(":sketch-core:jsProductionLibraryCompileSync"))
+            dependsOn(getByPath(":sketch-core:jsProductionExecutableCompileSync"))
+            dependsOn(getByPath(":sketch-core:jsTestTestDevelopmentExecutableCompileSync"))
         }
         named("jsBrowserProductionWebpack").configure(configureJs)
         named("jsBrowserProductionLibraryDistribution").configure(configureJs)
@@ -154,11 +158,11 @@ fun Project.applyKotlinWasmJsImplicitDependencyWorkaround() {
             dependsOn(named("wasmJsProductionExecutableCompileSync"))
             dependsOn(named("wasmJsTestTestDevelopmentExecutableCompileSync"))
 
-            dependsOn(getByPath(":sketch-singleton:wasmJsDevelopmentLibraryCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:wasmJsDevelopmentExecutableCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:wasmJsProductionLibraryCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:wasmJsProductionExecutableCompileSync"))
-            dependsOn(getByPath(":sketch-singleton:wasmJsTestTestDevelopmentExecutableCompileSync"))
+            dependsOn(getByPath(":sketch-core:wasmJsDevelopmentLibraryCompileSync"))
+            dependsOn(getByPath(":sketch-core:wasmJsDevelopmentExecutableCompileSync"))
+            dependsOn(getByPath(":sketch-core:wasmJsProductionLibraryCompileSync"))
+            dependsOn(getByPath(":sketch-core:wasmJsProductionExecutableCompileSync"))
+            dependsOn(getByPath(":sketch-core:wasmJsTestTestDevelopmentExecutableCompileSync"))
         }
         named("wasmJsBrowserProductionWebpack").configure(configureWasmJs)
         named("wasmJsBrowserProductionLibraryDistribution").configure(configureWasmJs)

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.9-bin.zip

libs.versions.toml

@@ -13,9 +13,9 @@ androidx-lifecycle = "2.8.2"
 androidx-navigation = "2.7.7"
 androidx-recyclerview = "1.3.2"
 androidx-swiperefreshlayout = "1.1.0"
-androidx-test-runner = "1.6.1"
-androidx-test-rules = "1.6.1"
 androidx-test-ext-junit = "1.2.1"
+androidx-test-rules = "1.6.1"
+androidx-test-runner = "1.6.1"
 
 androidgifdrawable = "1.2.15"
 androidsvg = "1.4"

sample/build.gradle.kts

@@ -1,5 +1,6 @@
+@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     id("com.android.application")
@@ -40,7 +41,6 @@ kotlin {
         binaries.executable()
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         moduleName = "composeApp"
         browser {
@@ -199,6 +199,10 @@ androidApplication(
     nameSpace = appId.replace("sketch4", "sketch"),
     applicationId = appId
 ) {
+    defaultConfig {
+        buildConfigField("String", "VERSION_NAME", "\"${property("versionName").toString()}\"")
+        buildConfigField("int", "VERSION_CODE", property("versionCode").toString())
+    }
     signingConfigs {
         create("sample") {
             storeFile = project.file("sample.keystore")