Initial end commit

Author: bentrengrove

get-started/androidApp/build.gradle.kts

@@ -53,6 +53,8 @@ android {
 }
 
 dependencies {
+    implementation(projects.shared)
+
     val composeBom = platform(libs.compose.bom)
     implementation(composeBom)
 

get-started/androidApp/src/main/java/com/example/kmp/getstarted/android/MainActivity.kt

@@ -10,6 +10,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import com.example.kmp.shared.platform
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -23,7 +24,7 @@ class MainActivity : ComponentActivity() {
                             .padding(innerPadding),
                         contentAlignment = Alignment.Center,
                     ) {
-                        Text("Hello KMP")
+                        Text("Hello ${platform()}")
                     }
                 }
             }

get-started/build.gradle.kts

@@ -22,6 +22,9 @@ plugins {
     alias(libs.plugins.kotlinAndroid) apply false
     alias(libs.plugins.kotlinCompose) apply false
     alias(libs.plugins.spotless) apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.androidKotlinMultiplatformLibrary) apply false
+    alias(libs.plugins.skie) apply false
 }
 
 subprojects {

get-started/gradle/libs.versions.toml

@@ -25,7 +25,12 @@ kotlinx-coroutines = "1.10.1"
 spotless = "7.0.2"
 composeBom = "2025.01.00"
 ktlint = "1.3.1"
-
+kotlinStdlib = "2.1.0"
+kotlinTest = "2.1.0"
+runner = "1.6.2"
+core = "1.6.1"
+junit = "1.2.1"
+skie = "0.10.1"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
@@ -39,10 +44,18 @@ compose-material3 = { module = "androidx.compose.material3:material3" }
 ## Compose BOM End ##
 
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdlib" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinTest" }
+androidx-runner = { group = "androidx.test", name = "runner", version.ref = "runner" }
+androidx-core = { group = "androidx.test", name = "core", version.ref = "core" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
 
 [plugins]
+skie = { id = "co.touchlab.skie", version.ref = "skie" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+androidKotlinMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }

get-started/iosApp/KMPGetStartedCodelab.xcodeproj/project.pbxproj

@@ -52,7 +52,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2DCC1BFC2D4100C80017AC11 /* Build configuration list for PBXNativeTarget "KMPGetStartedCodelab" */;
 			buildPhases = (
-				2DCC1BFF2D4101410017AC11 /* ShellScript */,
+				2DCC1BFF2D4101410017AC11 /* Run Script */,
 				2DCC1BEA2D4100C60017AC11 /* Sources */,
 				2DCC1BEB2D4100C60017AC11 /* Frameworks */,
 				2DCC1BEC2D4100C60017AC11 /* Resources */,
@@ -116,7 +116,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2DCC1BFF2D4101410017AC11 /* ShellScript */ = {
+		2DCC1BFF2D4101410017AC11 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -125,6 +125,7 @@
 			);
 			inputPaths = (
 			);
+			name = "Run Script";
 			outputFileListPaths = (
 			);
 			outputPaths = (
@@ -183,7 +184,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -246,7 +247,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -274,6 +275,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"KMPGetStartedCodelab/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -302,6 +304,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"KMPGetStartedCodelab/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;

get-started/iosApp/KMPGetStartedCodelab/ContentView.swift

@@ -5,14 +5,15 @@
 //
 
 import SwiftUI
+import sharedKit
 
 struct ContentView: View {
     var body: some View {
         VStack {
             Image(systemName: "globe")
                 .imageScale(.large)
                 .foregroundStyle(.tint)
-            Text("Hello, KMP!")
+            Text("Hello, \(platform())!")
         }
         .padding()
     }

get-started/settings.gradle.kts

@@ -44,4 +44,5 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "KmpGetStartedCodelab"
-include(":androidApp")
+include(":androidApp")
+include(":shared")

migrate-room/androidApp/build.gradle.kts

@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.kotlinCompose)
     alias(libs.plugins.kotlinxSerialization)
     alias(libs.plugins.ksp)
-    alias(libs.plugins.room)
     alias(libs.plugins.spotless)
     alias(libs.plugins.hilt)
 }
@@ -69,9 +68,6 @@ android {
             languageVersion = JavaLanguageVersion.of(17)
         }
     }
-    ksp {
-        arg("room.generateKotlin", "true")
-    }
 }
 
 dependencies {
@@ -93,8 +89,7 @@ dependencies {
     debugImplementation(libs.compose.ui.tooling)
 
     // TODO switch this dependency to KMP-ready version
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.room.runtime)
 
     implementation(libs.hilt.android)
     ksp(libs.hilt.compiler)
@@ -111,7 +106,3 @@ dependencies {
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation(libs.kotlinx.coroutines.test)
 }
-
-room {
-    schemaDirectory("$projectDir/schemas")
-}

migrate-room/androidApp/src/main/kotlin/com/example/fruitties/kmptutorial/android/di/DatabaseModule.kt

@@ -16,8 +16,9 @@
 package com.example.fruitties.kmptutorial.android.di
 
 import android.content.Context
-import androidx.room.Room
 import com.example.fruitties.kmptutorial.android.database.AppDatabase
+import com.example.fruitties.kmptutorial.android.database.buildAppDatabase
+import com.example.fruitties.kmptutorial.android.database.getDatabaseBuilder
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -31,13 +32,13 @@ internal object DatabaseModule {
 
     @Provides
     @Singleton
-    fun providesAppDatabase(@ApplicationContext context: Context): AppDatabase = Room
-        .databaseBuilder(context, AppDatabase::class.java, "fruits.db")
-        .build()
+    fun providesAppDatabase(@ApplicationContext context: Context): AppDatabase {
+        return getDatabaseBuilder(context).buildAppDatabase()
+    }
 
     @Provides
     fun providesFruittieDao(appDatabase: AppDatabase) = appDatabase.fruittieDao()
 
     @Provides
     fun providesCartDao(appDatabase: AppDatabase) = appDatabase.cartDao()
-}
+}