wip

saket · Feb 13, 2024 · a0452d1 · a0452d1
1 parent 31e4e17
commit a0452d1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/test_and_release_snapshot.yml b/.github/workflows/test_and_release_snapshot.yml
@@ -2,7 +2,6 @@ name: Run tests and publish snapshot
 
 on:
   push:
-    branches: [ trunk ]
   pull_request:
 
 jobs:
@@ -26,7 +25,7 @@ jobs:
           secrets: ${{ toJSON(secrets) }}
 
       - name: Run unit tests and friends
-        run: ./gradlew check
+        run: ./gradlew check --info --stacktrace
 
       - name: Run paparazzi screenshot tests
         run: ./gradlew verifyPaparazziDebug

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -22,3 +22,18 @@ dependencies  {
   implementation(libs.plugin.metalava)
   implementation(libs.plugin.poko)
 }
+
+// Worksaround https://github.com/JetBrains/compose-multiplatform/issues/3933.
+if (libs.versions.jetbrains.compose.get().startsWith("1.5")) {
+  configurations.configureEach {
+    if (name.contains("test", ignoreCase = true)) {
+      resolutionStrategy.eachDependency {
+        if (requested.module == libs.plugin.jetbrains.compose.get().module) {
+          useVersion("1.6.0-beta02")
+        }
+      }
+    }
+  }
+} else {
+  throw RuntimeException("no longer needed.")
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ minSdk = "23"
 compileSdk = "34"
 kotlin = "1.9.22"
 agp = "8.1.4"
-jetbrains-compose = "1.5.12" # https://github.com/JetBrains/compose-multiplatform/releases
+jetbrains-compose = "1.6.0-beta02" # https://github.com/JetBrains/compose-multiplatform/releases
 androidx-compose-runtime = "1.6.1" # https://developer.android.com/jetpack/androidx/releases/compose
 androidx-compose-ui = "1.6.1"
 androidx-compose-ui-material3 = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/compose-material3