Update benchmarks to the latest Compose+Kotlin versions (#5096)

JetBrains · Jul 11, 2024 · 5d8183f · 5d8183f
1 parent 738b6c3
commit 5d8183f
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 12 deletions.
diff --git a/benchmarks/ios/jvm-vs-kotlin-native/build.gradle.kts b/benchmarks/ios/jvm-vs-kotlin-native/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.compose")
 }
 

diff --git a/benchmarks/ios/jvm-vs-kotlin-native/gradle.properties b/benchmarks/ios/jvm-vs-kotlin-native/gradle.properties
@@ -1,13 +1,7 @@
-compose.version=1.4.1
-kotlin.version=1.8.20
+compose.version=1.6.11
+kotlin.version=2.0.0
 agp.version=7.0.4
 org.gradle.jvmargs=-Xmx3g
-kotlin.code.style=official
-kotlin.native.useEmbeddableCompilerJar=true
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-# Enable kotlin/native experimental memory model
-kotlin.native.binary.memoryModel=experimental
 compose.desktop.verbose=true
 android.useAndroidX=true
 kotlin.js.webpack.major.version=4

diff --git a/benchmarks/ios/jvm-vs-kotlin-native/settings.gradle.kts b/benchmarks/ios/jvm-vs-kotlin-native/settings.gradle.kts
@@ -10,6 +10,7 @@ pluginManagement {
     plugins {
         val kotlinVersion = extra["kotlin.version"] as String
         kotlin("multiplatform").version(kotlinVersion)
+        id("org.jetbrains.kotlin.plugin.compose").version(kotlinVersion)
         val composeVersion = extra["compose.version"] as String
         id("org.jetbrains.compose").version(composeVersion)
     }

diff --git a/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/...ios/jvm-vs-kotlin-native/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt b/...ios/jvm-vs-kotlin-native/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt
@@ -13,6 +13,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import compose_benchmarks.generated.resources.Res
+import compose_benchmarks.generated.resources.compose_multiplatform
 import kotlinx.coroutines.delay
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
@@ -29,7 +31,7 @@ fun AnimatedVisibility() {
         Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
             AnimatedVisibility(showImage) {
                 Image(
-                    painterResource("compose-multiplatform.xml"),
+                    painterResource(Res.drawable.compose_multiplatform),
                     null
                 )
             }

diff --git a/benchmarks/kn-performance/build.gradle.kts b/benchmarks/kn-performance/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.compose")
 }
 

diff --git a/benchmarks/kn-performance/gradle.properties b/benchmarks/kn-performance/gradle.properties
@@ -1,5 +1,5 @@
-compose.version=1.5.10
-kotlin.version=1.9.20
+compose.version=1.6.11
+kotlin.version=2.0.0
 org.gradle.jvmargs=-Xmx3g
 kotlin.native.useEmbeddableCompilerJar=true
 compose.desktop.verbose=true

diff --git a/benchmarks/kn-performance/settings.gradle.kts b/benchmarks/kn-performance/settings.gradle.kts
@@ -10,6 +10,7 @@ pluginManagement {
     plugins {
         val kotlinVersion = extra["kotlin.version"] as String
         kotlin("multiplatform").version(kotlinVersion)
+        id("org.jetbrains.kotlin.plugin.compose").version(kotlinVersion)
         val composeVersion = extra["compose.version"] as String
         id("org.jetbrains.compose").version(composeVersion)
     }

diff --git a/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/...nMain/resources/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt
@@ -13,6 +13,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import compose_benchmarks.generated.resources.Res
+import compose_benchmarks.generated.resources.compose_multiplatform
 import kotlinx.coroutines.delay
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
@@ -29,7 +31,7 @@ fun AnimatedVisibility() {
         Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
             AnimatedVisibility(showImage) {
                 Image(
-                    painterResource("compose-multiplatform.xml"),
+                    painterResource(Res.drawable.compose_multiplatform),
                     null
                 )
             }