Renamed to KMP

vitoksmile · Aug 31, 2023 · 8acb240 · 8acb240
1 parent f5ec8b0
commit 8acb240
Show file tree

Hide file tree

Showing 29 changed files with 48 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# HealthKMM
+# HealthKMP
 
 Kotlin Multiplatform Mobile wrapper for HealthKit on iOS and ~~Google Fit and~~ Health Connect on Android.
 

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -18,7 +18,7 @@ kotlin {
 
 android {
     compileSdk = (findProperty("android.compileSdk") as String).toInt()
-    namespace = "com.vitoksmile.kmm.health"
+    namespace = "com.vitoksmile.kmp.health"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 

diff --git a/...itoksmile/kmm/health/HealthApplication.kt → ...itoksmile/kmp/health/HealthApplication.kt b/...itoksmile/kmm/health/HealthApplication.kt → ...itoksmile/kmp/health/HealthApplication.kt
@@ -1,7 +1,7 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import android.app.Application
-import com.vitoksmile.kmm.health.koin.attachHealthKMM
+import com.vitoksmile.kmp.health.koin.attachHealthKMP
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
@@ -14,7 +14,7 @@ class HealthApplication : Application() {
         startKoin {
             androidContext(this@HealthApplication)
             androidLogger()
-            attachHealthKMM(this@HealthApplication)
+            attachHealthKMP(this@HealthApplication)
         }
     }
 }
diff --git a/...com/vitoksmile/kmm/health/MainActivity.kt → ...com/vitoksmile/kmp/health/MainActivity.kt b/...com/vitoksmile/kmm/health/MainActivity.kt → ...com/vitoksmile/kmp/health/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import MainView
 import android.os.Bundle

diff --git a/androidApp/src/androidMain/res/values/strings.xml b/androidApp/src/androidMain/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">HealthKMM</string>
+    <string name="app_name">HealthKMP</string>
 </resources>
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -15,13 +15,14 @@ kotlin {
     iosSimulatorArm64()
 
     cocoapods {
+        name = "HealthKMP"
         version = "0.0.1"
         summary = "Wrapper for HealthKit on iOS and Google Fit and Health Connect on Android."
-        homepage = "https://github.com/vitoksmile/HealthKMM"
+        homepage = "https://github.com/vitoksmile/HealthKMP"
         ios.deploymentTarget = "14.1"
         podfile = project.file("../iosApp/Podfile")
         framework {
-            baseName = "core"
+            baseName = "HealthKMP"
             isStatic = true
         }
     }
@@ -66,7 +67,7 @@ kotlin {
 
 android {
     compileSdk = (findProperty("android.compileSdk") as String).toInt()
-    namespace = "com.vitoksmile.kmm.health"
+    namespace = "com.vitoksmile.kmp.health"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")

diff --git a/core/src/androidMain/AndroidManifest.xml b/core/src/androidMain/AndroidManifest.xml
@@ -30,7 +30,7 @@
             android:exported="false"
             tools:node="merge">
             <meta-data
-                android:name="com.vitoksmile.kmm.health.ApplicationContextHolderInitializer"
+                android:name="com.vitoksmile.kmp.health.ApplicationContextHolderInitializer"
                 android:value="androidx.startup" />
         </provider>
     </application>

diff --git a/...toksmile/kmm/health/ApplicationContext.kt → ...toksmile/kmp/health/ApplicationContext.kt b/...toksmile/kmm/health/ApplicationContext.kt → ...toksmile/kmp/health/ApplicationContext.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import android.content.Context
 import androidx.startup.Initializer

diff --git a/...smile/kmm/health/HealthConnectDataType.kt → ...smile/kmp/health/HealthConnectDataType.kt b/...smile/kmm/health/HealthConnectDataType.kt → ...smile/kmp/health/HealthConnectDataType.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import androidx.health.connect.client.permission.HealthPermission
 import androidx.health.connect.client.records.StepsRecord

diff --git a/...ksmile/kmm/health/HealthConnectManager.kt → ...ksmile/kmp/health/HealthConnectManager.kt b/...ksmile/kmm/health/HealthConnectManager.kt → ...ksmile/kmp/health/HealthConnectManager.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import android.content.Context
 import androidx.health.connect.client.HealthConnectClient

diff --git a/...kmm/health/HealthConnectManagerFactory.kt → ...kmp/health/HealthConnectManagerFactory.kt b/...kmm/health/HealthConnectManagerFactory.kt → ...kmp/health/HealthConnectManagerFactory.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 actual class HealthManagerFactory {
 

diff --git a/...health/HealthConnectPermissionActivity.kt → ...health/HealthConnectPermissionActivity.kt b/...health/HealthConnectPermissionActivity.kt → ...health/HealthConnectPermissionActivity.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import android.content.Context
 import android.content.Intent

diff --git a/core/src/commonMain/kotlin/App.kt b/core/src/commonMain/kotlin/App.kt
@@ -16,8 +16,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.vitoksmile.kmm.health.HealthDataType
-import com.vitoksmile.kmm.health.HealthManagerFactory
+import com.vitoksmile.kmp.health.HealthDataType
+import com.vitoksmile.kmp.health.HealthManagerFactory
 import kotlinx.coroutines.launch
 
 @Composable
@@ -49,7 +49,7 @@ fun App() {
                 .padding(16.dp),
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
-            Text("Hello, this is HealthKMM for ${getPlatformName()}")
+            Text("Hello, this is HealthKMP for ${getPlatformName()}")
 
             isAvailableResult
                 .onSuccess { isAvailable ->

diff --git a/...m/vitoksmile/kmm/health/HealthDataType.kt → ...m/vitoksmile/kmp/health/HealthDataType.kt b/...m/vitoksmile/kmm/health/HealthDataType.kt → ...m/vitoksmile/kmp/health/HealthDataType.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 enum class HealthDataType {
     STEPS,

diff --git a/...om/vitoksmile/kmm/health/HealthManager.kt → ...om/vitoksmile/kmp/health/HealthManager.kt b/...om/vitoksmile/kmm/health/HealthManager.kt → ...om/vitoksmile/kmp/health/HealthManager.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 interface HealthManager {
 

diff --git a/...ksmile/kmm/health/HealthManagerFactory.kt → ...ksmile/kmp/health/HealthManagerFactory.kt b/...ksmile/kmm/health/HealthManagerFactory.kt → ...ksmile/kmp/health/HealthManagerFactory.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 expect class HealthManagerFactory() {
 

diff --git a/...itoksmile/kmm/health/HealthKitDataType.kt → ...itoksmile/kmp/health/HealthKitDataType.kt b/...itoksmile/kmm/health/HealthKitDataType.kt → ...itoksmile/kmp/health/HealthKitDataType.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import platform.HealthKit.HKQuantityType
 import platform.HealthKit.HKQuantityTypeIdentifierBodyMass

diff --git a/...vitoksmile/kmm/health/HealthKitManager.kt → ...vitoksmile/kmp/health/HealthKitManager.kt b/...vitoksmile/kmm/health/HealthKitManager.kt → ...vitoksmile/kmp/health/HealthKitManager.kt
@@ -1,6 +1,6 @@
 @file:Suppress("ClassName")
 
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException

diff --git a/...ile/kmm/health/HealthKitManagerFactory.kt → ...ile/kmp/health/HealthKitManagerFactory.kt b/...ile/kmm/health/HealthKitManagerFactory.kt → ...ile/kmp/health/HealthKitManagerFactory.kt
@@ -1,4 +1,4 @@
-package com.vitoksmile.kmm.health
+package com.vitoksmile.kmp.health
 
 actual class HealthManagerFactory {
 

diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig
@@ -1,3 +1,3 @@
 TEAM_ID=
-BUNDLE_ID=com.vitoksmile.kmm.health
-APP_NAME=HealthKMM
+BUNDLE_ID=com.vitoksmile.kmp.health
+APP_NAME=HealthKMP
diff --git a/iosApp/Podfile b/iosApp/Podfile
@@ -1,6 +1,6 @@
 target 'iosApp' do
   use_frameworks!
   platform :ios, '14.1'
-  pod 'core', :path => '../core'
-  pod 'koin', :path => '../koin'
+  pod 'HealthKMP', :path => '../core'
+  pod 'HealthKMPKoin', :path => '../koin'
 end
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -20,7 +20,7 @@
 		20ACF4E2201EBCFD0F637C2A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
 		68E4587840B67DF8CD73E3AE /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
-		7555FF7B242A565900829871 /* HealthKMM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HealthKMM.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF7B242A565900829871 /* HealthKMP.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HealthKMP.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9429AFAC2A68240500E5B251 /* iosApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iosApp.entitlements; sourceTree = "<group>"; };
@@ -70,7 +70,7 @@
 		7555FF7C242A565900829871 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				7555FF7B242A565900829871 /* HealthKMM.app */,
+				7555FF7B242A565900829871 /* HealthKMP.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -123,7 +123,7 @@
 			);
 			name = iosApp;
 			productName = iosApp;
-			productReference = 7555FF7B242A565900829871 /* HealthKMM.app */;
+			productReference = 7555FF7B242A565900829871 /* HealthKMP.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -336,7 +336,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-				DEVELOPMENT_TEAM = "${TEAM_ID}";
+				DEVELOPMENT_TEAM = Q4BFS77J38;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = iosApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -361,7 +361,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-				DEVELOPMENT_TEAM = "${TEAM_ID}";
+				DEVELOPMENT_TEAM = Q4BFS77J38;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = iosApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;

diff --git a/iosApp/iosApp/ContentView.swift b/iosApp/iosApp/ContentView.swift
@@ -6,7 +6,7 @@ import koin
 struct ComposeView: UIViewControllerRepresentable {
 
     init() {
-        Health_kmm_koinKt.start()
+        Health_kmp_koinKt.start()
     }
 
     func makeUIViewController(context: Context) -> UIViewController {

diff --git a/koin/build.gradle.kts b/koin/build.gradle.kts
@@ -17,13 +17,14 @@ kotlin {
     iosSimulatorArm64()
 
     cocoapods {
+        name = "HealthKMPKoin"
         version = "0.0.1"
         summary = "Shared Koin module for wrapper for HealthKit on iOS and Google Fit and Health Connect on Android."
-        homepage = "https://github.com/vitoksmile/HealthKMM"
+        homepage = "https://github.com/vitoksmile/HealthKMP"
         ios.deploymentTarget = "14.1"
         podfile = project.file("../iosApp/Podfile")
         framework {
-            baseName = "koin"
+            baseName = "HealthKMPKoin"
             isStatic = true
         }
     }
@@ -57,7 +58,7 @@ kotlin {
 
 android {
     compileSdk = (findProperty("android.compileSdk") as String).toInt()
-    namespace = "com.vitoksmile.kmm.health.koin"
+    namespace = "com.vitoksmile.kmp.health.koin"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 

diff --git a/koin/src/androidMain/AndroidManifest.xml b/koin/src/androidMain/AndroidManifest.xml
@@ -10,7 +10,7 @@
             android:exported="false"
             tools:node="remove">
             <meta-data
-                android:name="com.vitoksmile.kmm.health.ApplicationContextHolderInitializer"
+                android:name="com.vitoksmile.kmp.health.ApplicationContextHolderInitializer"
                 android:value="androidx.startup" />
         </provider>
     </application>

diff --git a/...e/kmm/health/koin/HealthKMMKoinAndroid.kt → ...e/kmp/health/koin/HealthKMMKoinAndroid.kt b/...e/kmm/health/koin/HealthKMMKoinAndroid.kt → ...e/kmp/health/koin/HealthKMMKoinAndroid.kt
@@ -1,10 +1,10 @@
-package com.vitoksmile.kmm.health.koin
+package com.vitoksmile.kmp.health.koin
 
 import android.app.Application
-import com.vitoksmile.kmm.health.ApplicationContextHolder
+import com.vitoksmile.kmp.health.ApplicationContextHolder
 import org.koin.core.KoinApplication
 
-fun KoinApplication.attachHealthKMM(
+fun KoinApplication.attachHealthKMP(
     application: Application,
 ) {
     ApplicationContextHolder.applicationContext = application

diff --git a/...toksmile/kmm/health/koin/HealthKMMKoin.kt → ...toksmile/kmp/health/koin/HealthKMPKoin.kt b/...toksmile/kmm/health/koin/HealthKMMKoin.kt → ...toksmile/kmp/health/koin/HealthKMPKoin.kt
@@ -1,6 +1,6 @@
-package com.vitoksmile.kmm.health.koin
+package com.vitoksmile.kmp.health.koin
 
-import com.vitoksmile.kmm.health.HealthManagerFactory
+import com.vitoksmile.kmp.health.HealthManagerFactory
 import org.koin.core.module.Module
 import org.koin.dsl.module
 

diff --git a/koin/src/iosMain/kotlin/health.kmm.koin.kt → koin/src/iosMain/kotlin/health.kmp.koin.kt b/koin/src/iosMain/kotlin/health.kmm.koin.kt → koin/src/iosMain/kotlin/health.kmp.koin.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-import com.vitoksmile.kmm.health.koin.commonModule
+import com.vitoksmile.kmp.health.koin.commonModule
 import org.koin.core.context.startKoin
 
 fun start() {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "HealthKMM"
+rootProject.name = "HealthKMP"
 
 include(":androidApp")
 include(":core")