Fix CI (#265)

* fix android * import kotlin.reflect.KClass * fixed following JetBrains/compose-multiplatform#4831 (comment) JetBrains/compose-multiplatform#4831 * isStatic = true * macos-13 * Update standalone-sample.yml
hoc081098 · May 30, 2024 · 6885bf9 · 6885bf9
1 parent 88f90b0
commit 6885bf9
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/standalone-sample.yml b/.github/workflows/standalone-sample.yml
@@ -18,7 +18,7 @@ jobs:
   kmpviewmodel-compose-sample-android:
     strategy:
       matrix:
-        os: [ macos-11 ]
+        os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -66,7 +66,7 @@ jobs:
   kmpviewmodel-compose-sample-ios:
     strategy:
       matrix:
-        os: [ macos-12 ]
+        os: [ macos-14 ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     defaults:

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ compose-rules-detekt = "0.4.1"
 androidx-lifecycle = "2.8.0"
 androidx-annotation = "1.8.0"
 androidx-activity = "1.9.0"
-androidx-compose-compiler = "1.5.14-dev-k1.9.24-50022def4af" # TODO: back to stable version
+androidx-compose-compiler = "1.5.14" # TODO: back to stable version
 androidx-navigation = "2.7.7"
 android-gradle = "8.4.0"
 

diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -36,6 +36,7 @@ kotlin {
     podfile = project.file("../iosApp/Podfile")
     framework {
       baseName = "shared"
+      isStatic = true
 
       export(projects.viewmodel)
       export(projects.viewmodelSavedstate)

diff --git a/standalone-sample/kmpviewmodel_compose_koin_sample/android/build.gradle.kts b/standalone-sample/kmpviewmodel_compose_koin_sample/android/build.gradle.kts
@@ -3,13 +3,23 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
   alias(libs.plugins.jetbrains.compose)
   alias(libs.plugins.android.app)
-  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlin.multiplatform)
 }
 
 compose {
   kotlinCompilerPlugin.set(libs.versions.jetbrains.compose.compiler)
 }
 
+kotlin {
+  androidTarget {
+    compilations.configureEach {
+      compilerOptions.configure {
+        jvmTarget.set(JvmTarget.fromTarget(libs.versions.java.target.get()))
+      }
+    }
+  }
+}
+
 repositories {
   jcenter()
 }
@@ -47,10 +57,6 @@ android {
     }
   }
 
-  kotlinOptions {
-    jvmTarget = JvmTarget.fromTarget(libs.versions.java.target.get()).target
-  }
-
   buildFeatures {
     buildConfig = true
   }

diff --git a/...mple/android/src/main/AndroidManifest.xml → ...droid/src/androidMain/AndroidManifest.xml b/...mple/android/src/main/AndroidManifest.xml → ...droid/src/androidMain/AndroidManifest.xml
diff --git a/...098/android/KmpViewModelComposeKoinApp.kt → ...098/android/KmpViewModelComposeKoinApp.kt b/...098/android/KmpViewModelComposeKoinApp.kt → ...098/android/KmpViewModelComposeKoinApp.kt
diff --git a/...ava/com/hoc081098/android/MainActivity.kt → ...ava/com/hoc081098/android/MainActivity.kt b/...ava/com/hoc081098/android/MainActivity.kt → ...ava/com/hoc081098/android/MainActivity.kt
diff --git a/...oc081098/android/MainActivityViewModel.kt → ...oc081098/android/MainActivityViewModel.kt b/...oc081098/android/MainActivityViewModel.kt → ...oc081098/android/MainActivityViewModel.kt
diff --git a/...e/android/src/main/res/values/strings.xml → ...id/src/androidMain/res/values/strings.xml b/...e/android/src/main/res/values/strings.xml → ...id/src/androidMain/res/values/strings.xml
diff --git a/viewmodel/src/androidMain/kotlin/com/hoc081098/kmp/viewmodel/ViewModelFactory.android.kt b/viewmodel/src/androidMain/kotlin/com/hoc081098/kmp/viewmodel/ViewModelFactory.android.kt
@@ -1,10 +1,11 @@
 package com.hoc081098.kmp.viewmodel
 
 import androidx.lifecycle.ViewModelProvider
+import kotlin.reflect.KClass
 
 public fun <VM : ViewModel> ViewModelFactory<VM>.toAndroidX(): ViewModelProvider.Factory =
   object : ViewModelProvider.Factory {
-    override fun <T : androidx.lifecycle.ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
+    override fun <T : androidx.lifecycle.ViewModel> create(modelClass: KClass<T>, extras: CreationExtras): T {
       @Suppress("UNCHECKED_CAST")
       return this@toAndroidX.create(extras) as T
     }