Kmp migration

.github/workflows/build.yaml

@@ -24,6 +24,9 @@ jobs:
           java-version: 17
           distribution: 'zulu'
 
+      - name: Run JVM Unit Tests
+        run: ./gradlew jvmTest --continue
+
       - name: Run Debug Tests
         run: ./gradlew testDebugUnitTest --continue
 

.gitignore

@@ -16,6 +16,7 @@ captures/
 .cxx/
 *.apk
 output.json
+.kotlin/
 
 # IntelliJ
 *.iml
@@ -37,3 +38,20 @@ google-services.json
 
 **.DS_Store
 **/build
+
+#IOS
+*.xcodeproj/xcuserdata/
+*.xcodeproj/project.xcworkspace/xcuserdata/
+*.xcworkspace/xcuserdata/
+DerivedData/
+*.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+*.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+xcuserdata/
+*.moved-aside
+Pods/
+Podfile.lock

README.md

@@ -15,7 +15,7 @@ To build this project, you require:
 
 * From Android Studio Giraffe upward
 * Gradle 8.0
-* Kotlin 1.9.20
+* Kotlin 2.2.20
 * Android Gradle Plugin 8.1.0
 
 ## Features 🎨

app/build.gradle.kts

@@ -1,22 +1,94 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.kotlinxSerialization)
+    alias(libs.plugins.compose.compiler)
+}
+
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+    jvm()
+
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "ComposeApp"
+            isStatic = true
+        }
+    }
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(projects.feature.allbreeds.ui)
+            implementation(projects.feature.breedDetails.ui)
+            implementation(projects.feature.favorites.ui)
+            implementation(projects.feature.subbreeds.ui)
+
+            implementation(projects.core.network.api)
+            implementation(projects.core.database.api)
+
+            implementation(projects.core.designsystem)
+            implementation(libs.navigation.compose)
+            implementation(projects.core.network.implementation)
+            implementation(projects.core.database.implementation)
+            implementation(projects.core.coroutine)
+
+            implementation(project.dependencies.platform(libs.koin.bom))
+            implementation(libs.koin.core)
+        }
+        androidMain.dependencies {
+            implementation(libs.koin.android)
+            implementation(libs.compose.activity)
+        }
+        androidInstrumentedTest.dependencies {
+            implementation(project.dependencies.platform(libs.koin.bom))
+            implementation(libs.androidx.test.core)
+            implementation(libs.androidx.test.runner)
+            implementation(libs.android.junit)
+            implementation(projects.core.testing)
+            implementation(projects.core.testing.ui) {
+                exclude(group = "org.robolectric", module = "robolectric")
+            }
+            implementation(projects.core.testing.integration)
+
+            implementation(libs.androidx.test.rules)
+            implementation(libs.espresso.core)
+            implementation(libs.koin.test)
+            implementation(libs.koin.test.junit4)
+        }
+    }
+}
+
+compose.resources {
+    packageOfResClass = "com.tobioyelekan.dogbreed"
+    generateResClass = auto
 }
 
 android {
     namespace = "com.tobioyelekan.dogbreed"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.tobioyelekan.dogbreed"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
-        testInstrumentationRunner = "com.tobioyelekan.dogbreed.testing.DogBreedTestRunner"
+        testInstrumentationRunner =
+            "com.tobioyelekan.dogbreed.core.testing.integration.DogBreedTestRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -42,16 +114,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         buildConfig = true
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
-    }
     packaging {
         resources {
             excludes += setOf(
@@ -60,42 +126,13 @@ android {
                 "META-INF/LICENSE-notice.md",
                 "META-INF/DEPENDENCIES",
                 "META-INF/NOTICE",
-                "META-INF/LICENSE"
+                "META-INF/LICENSE",
+                "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
             )
         }
     }
 }
 
 dependencies {
-    implementation(projects.feature.allbreeds.ui)
-    implementation(projects.feature.breedDetails.ui)
-    implementation(projects.feature.favorites.ui)
-    implementation(projects.feature.subbreeds.ui)
-
-    implementation(projects.core.designsystem)
-
-    implementation(libs.compose.icons.extended)
-
-    implementation(libs.hilt.compose)
-    implementation(libs.hilt.core)
-    implementation(libs.androidx.test.core)
-    ksp(libs.hilt.compiler)
-
-    kspTest(libs.hilt.compiler)
-    kspAndroidTest(libs.hilt.compiler)
-
     debugImplementation(libs.compose.test.manifest)
-    debugImplementation(libs.hilt.android.testing)
-
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.hilt.android.testing)
-    androidTestImplementation(libs.compose.ui.test)
-    androidTestImplementation(libs.android.junit)
-    androidTestImplementation(projects.core.database)
-    androidTestImplementation(projects.core.network)
-    androidTestImplementation(projects.core.testing)
-
-    androidTestImplementation(libs.androidx.test.core)
-    androidTestImplementation(libs.androidx.test.rules)
-    androidTestImplementation(libs.espresso.core)
 }