Merge pull request #41 from nimblehq/feature/29-prepare-before-applyi…

…ng-android-submodule
nimblehq · Sep 12, 2023 · b69e044 · b69e044
2 parents 23f777f + a526a92
commit b69e044
Show file tree

Hide file tree

Showing 103 changed files with 533 additions and 532 deletions.
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -9,12 +9,12 @@ plugins {
 val keystoreProperties = loadProperties("$rootDir/signing.properties")
 
 android {
-    namespace = "co.nimblehq.kmm.template.android"
-    compileSdk = Versions.ANDROID_COMPILE_SDK_VERSION
+    namespace = "co.nimblehq.kmm.template"
+    compileSdk = Versions.ANDROID_COMPILE_SDK
     defaultConfig {
-        applicationId = "co.nimblehq.kmm.template.android"
-        minSdk = Versions.ANDROID_MIN_SDK_VERSION
-        targetSdk = Versions.ANDROID_TARGET_SDK_VERSION
+        applicationId = "co.nimblehq.kmm.template"
+        minSdk = Versions.ANDROID_MIN_SDK
+        targetSdk = Versions.ANDROID_TARGET_SDK
         versionCode = Versions.ANDROID_VERSION_CODE
         versionName = Versions.ANDROID_VERSION_NAME
     }

diff --git a/...lehq/kmm/template/android/util/LogUtil.kt → .../co/nimblehq/kmm/template/util/LogUtil.kt b/...lehq/kmm/template/android/util/LogUtil.kt → .../co/nimblehq/kmm/template/util/LogUtil.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import timber.log.Timber
 

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.kmm.template.android">
+    package="co.nimblehq.kmm.template">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name=".MyApplication"
+        android:name=".MainApplication"
         android:allowBackup="false"
         android:label="@string/app_name"
         android:supportsRtl="true"

diff --git a/...ehq/kmm/template/android/MyApplication.kt → .../nimblehq/kmm/template/MainApplication.kt b/...ehq/kmm/template/android/MyApplication.kt → .../nimblehq/kmm/template/MainApplication.kt
@@ -1,12 +1,12 @@
-package co.nimblehq.kmm.template.android
+package co.nimblehq.kmm.template
 
 import android.app.Application
-import co.nimblehq.kmm.template.android.di.androidViewModelModule
-import co.nimblehq.kmm.template.android.util.LogUtil
+import co.nimblehq.kmm.template.di.androidViewModelModule
+import co.nimblehq.kmm.template.util.LogUtil
 import co.nimblehq.kmm.template.di.initKoin
 import org.koin.android.ext.koin.androidContext
 
-class MyApplication : Application() {
+class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()

diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/lib/TypeAlias.kt b/android/src/main/java/co/nimblehq/kmm/template/android/lib/TypeAlias.kt
diff --git a/...mm/template/android/di/ViewModelModule.kt → ...mblehq/kmm/template/di/ViewModelModule.kt b/...mm/template/android/di/ViewModelModule.kt → ...mblehq/kmm/template/di/ViewModelModule.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.di
+package co.nimblehq.kmm.template.di
 
 import org.koin.core.module.Module
 import org.koin.dsl.module

diff --git a/android/src/main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt b/android/src/main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt
@@ -0,0 +1,3 @@
+package co.nimblehq.kmm.template.lib
+
+typealias IsLoading = Boolean
diff --git a/...template/android/ui/base/BaseViewModel.kt → ...ehq/kmm/template/ui/base/BaseViewModel.kt b/...template/android/ui/base/BaseViewModel.kt → ...ehq/kmm/template/ui/base/BaseViewModel.kt
@@ -1,12 +1,12 @@
-package co.nimblehq.kmm.template.android.ui.base
+package co.nimblehq.kmm.template.ui.base
 
 import androidx.compose.runtime.*
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import co.nimblehq.kmm.template.android.lib.IsLoading
-import co.nimblehq.kmm.template.android.ui.navigation.AppDestination
+import co.nimblehq.kmm.template.lib.IsLoading
+import co.nimblehq.kmm.template.ui.navigation.AppDestination
 
 @Suppress("PropertyName")
 abstract class BaseViewModel : ViewModel() {

diff --git a/...e/android/ui/navigation/AppDestination.kt → .../template/ui/navigation/AppDestination.kt b/...e/android/ui/navigation/AppDestination.kt → .../template/ui/navigation/AppDestination.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.navigation
+package co.nimblehq.kmm.template.ui.navigation
 
 import androidx.navigation.NamedNavArgument
 

diff --git a/...te/android/ui/navigation/AppNavigation.kt → ...m/template/ui/navigation/AppNavigation.kt b/...te/android/ui/navigation/AppNavigation.kt → ...m/template/ui/navigation/AppNavigation.kt
@@ -1,9 +1,9 @@
-package co.nimblehq.kmm.template.android.ui.navigation
+package co.nimblehq.kmm.template.ui.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.*
 import androidx.navigation.compose.*
-import co.nimblehq.kmm.template.android.ui.screens.home.HomeScreen
+import co.nimblehq.kmm.template.ui.screens.home.HomeScreen
 
 @Composable
 fun AppNavigation(

diff --git a/...mplate/android/ui/screens/MainActivity.kt → ...q/kmm/template/ui/screens/MainActivity.kt b/...mplate/android/ui/screens/MainActivity.kt → ...q/kmm/template/ui/screens/MainActivity.kt
@@ -1,10 +1,10 @@
-package co.nimblehq.kmm.template.android.ui.screens
+package co.nimblehq.kmm.template.ui.screens
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import co.nimblehq.kmm.template.android.ui.navigation.AppNavigation
-import co.nimblehq.kmm.template.android.ui.theme.ComposeTheme
+import co.nimblehq.kmm.template.ui.navigation.AppNavigation
+import co.nimblehq.kmm.template.ui.theme.ComposeTheme
 
 class MainActivity : ComponentActivity() {
 

diff --git a/...ate/android/ui/screens/home/HomeScreen.kt → ...mm/template/ui/screens/home/HomeScreen.kt b/...ate/android/ui/screens/home/HomeScreen.kt → ...mm/template/ui/screens/home/HomeScreen.kt
@@ -1,12 +1,12 @@
-package co.nimblehq.kmm.template.android.ui.screens.home
+package co.nimblehq.kmm.template.ui.screens.home
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import co.nimblehq.kmm.template.Greeting
-import co.nimblehq.kmm.template.android.ui.theme.ComposeTheme
+import co.nimblehq.kmm.template.ui.theme.ComposeTheme
 
 @Composable
 fun HomeScreen() {

diff --git a/...mm/template/android/ui/theme/AppColors.kt → ...mblehq/kmm/template/ui/theme/AppColors.kt b/...mm/template/android/ui/theme/AppColors.kt → ...mblehq/kmm/template/ui/theme/AppColors.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.material.*
 import androidx.compose.runtime.staticCompositionLocalOf

diff --git a/...emplate/android/ui/theme/AppDimensions.kt → ...hq/kmm/template/ui/theme/AppDimensions.kt b/...emplate/android/ui/theme/AppDimensions.kt → ...hq/kmm/template/ui/theme/AppDimensions.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.runtime.staticCompositionLocalOf
 

diff --git a/...mm/template/android/ui/theme/AppStyles.kt → ...mblehq/kmm/template/ui/theme/AppStyles.kt b/...mm/template/android/ui/theme/AppStyles.kt → ...mblehq/kmm/template/ui/theme/AppStyles.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.runtime.staticCompositionLocalOf
 

diff --git a/...hq/kmm/template/android/ui/theme/Theme.kt → ...o/nimblehq/kmm/template/ui/theme/Theme.kt b/...hq/kmm/template/android/ui/theme/Theme.kt → ...o/nimblehq/kmm/template/ui/theme/Theme.kt
@@ -1,5 +1,5 @@
 @file:Suppress("MatchingDeclarationName")
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.shape.RoundedCornerShape

diff --git a/...plate/android/util/DispatchersProvider.kt → .../kmm/template/util/DispatchersProvider.kt b/...plate/android/util/DispatchersProvider.kt → .../kmm/template/util/DispatchersProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers

diff --git a/...lehq/kmm/template/android/util/LogUtil.kt → .../co/nimblehq/kmm/template/util/LogUtil.kt b/...lehq/kmm/template/android/util/LogUtil.kt → .../co/nimblehq/kmm/template/util/LogUtil.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import timber.log.Timber
 

diff --git a/...emplate/android/test/CoroutineTestRule.kt → ...hq/kmm/template/test/CoroutineTestRule.kt b/...emplate/android/test/CoroutineTestRule.kt → ...hq/kmm/template/test/CoroutineTestRule.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.test
+package co.nimblehq.kmm.template.test
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.test.*

diff --git a/buildKonfig.properties.sample → buildKonfig.properties b/buildKonfig.properties.sample → buildKonfig.properties
diff --git a/buildSrc/src/main/java/BuildTypes.kt b/buildSrc/src/main/java/BuildTypes.kt
@@ -0,0 +1,4 @@
+object BuildTypes {
+    const val DEBUG = "debug"
+    const val RELEASE = "release"
+}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -1,45 +1,3 @@
-object Versions {
-    const val ANDROID_COMPILE_SDK_VERSION = 33
-    const val ANDROID_MIN_SDK_VERSION = 24
-    const val ANDROID_TARGET_SDK_VERSION = 33
-    const val ANDROID_VERSION_CODE = 1
-    const val ANDROID_VERSION_NAME = "1.0.0"
-    const val ANDROIDX_ACTIVITY_COMPOSE = "1.7.1"
-
-    const val BUILD_KONFIG = "0.13.3"
-
-    const val COMPOSE = "1.4.3"
-    const val COMPOSE_COMPILER = "1.4.7"
-    const val COMPOSE_NAVIGATION = "2.6.0"
-
-    const val DETEKT = "1.23.0"
-
-    const val GRADLE = "8.0.2"
-
-    const val JUNIT = "4.13.2"
-
-    const val KOIN = "3.3.2"
-    const val KOIN_ANDROID = "3.3.2"
-    const val KOIN_ANDROIDX_COMPOSE = "3.4.1"
-    const val KOTLIN = "1.8.21"
-    const val KOTLIN_COROUTINES = "1.7.3"
-    const val KOTEST = "5.5.4"
-    const val KOTLINX_RESOURCES = "0.2.4"
-    const val KOVER = "0.7.3"
-    const val KSP = "1.8.21-1.0.11"
-    const val KTOR = "2.1.1"
-
-    const val MOCKATIVE = "1.3.0"
-    const val MOCKK = "1.13.3"
-
-    const val NAPIER = "2.6.1"
-
-    const val ROBOLECTRIC = "4.9.1"
-
-    const val TIMBER = "5.0.1"
-    const val TURBINE = "0.12.1"
-}
-
 object Dependencies {
 
     object AndroidX {
@@ -94,7 +52,7 @@ object Dependencies {
 
         const val JUNIT = "junit:junit:${Versions.JUNIT}"
 
-        const val KOTEST_ASSERTIONS = "io.kotest:kotest-assertions-core:${Versions.KOTEST}"
+        const val KOTEST = "io.kotest:kotest-assertions-core:${Versions.KOTEST}"
         const val KOTLINX_RESOURCES = "com.goncalossilva:resources:${Versions.KOTLINX_RESOURCES}"
 
         const val MOCKATIVE = "io.mockative:mockative:${Versions.MOCKATIVE}"

diff --git a/buildSrc/src/main/java/Flavors.kt b/buildSrc/src/main/java/Flavors.kt
@@ -0,0 +1,5 @@
+object Flavors {
+    const val PRODUCTION = "production"
+    const val STAGING = "staging"
+    const val DIMENSION_VERSION = "version"
+}
diff --git a/buildSrc/src/main/java/Modules.kt b/buildSrc/src/main/java/Modules.kt
@@ -0,0 +1,3 @@
+object Modules {
+    const val SHARED = ":shared"
+}
diff --git a/.../buildSrc/src/main/java/Configurations.kt → buildSrc/src/main/java/Plugins.kt b/.../buildSrc/src/main/java/Configurations.kt → buildSrc/src/main/java/Plugins.kt
@@ -1,18 +1,3 @@
-object Flavors {
-    const val PRODUCTION = "production"
-    const val STAGING = "staging"
-    const val DIMENSION_VERSION = "version"
-}
-
-object BuildTypes {
-    const val DEBUG = "debug"
-    const val RELEASE = "release"
-}
-
-object Modules {
-    const val SHARED = ":shared"
-}
-
 object Plugins {
     const val ANDROID = "android"
     const val ANDROID_APPLICATION = "com.android.application"

diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -0,0 +1,42 @@
+object Versions {
+    const val ANDROID_COMPILE_SDK = 33
+    const val ANDROID_MIN_SDK = 24
+    const val ANDROID_TARGET_SDK = 33
+    const val ANDROID_VERSION_CODE = 1
+    const val ANDROID_VERSION_NAME = "1.0.0"
+
+    const val ANDROIDX_ACTIVITY_COMPOSE = "1.7.1"
+
+    const val BUILD_KONFIG = "0.13.3"
+
+    const val COMPOSE = "1.4.3"
+    const val COMPOSE_COMPILER = "1.4.7"
+    const val COMPOSE_NAVIGATION = "2.6.0"
+
+    const val DETEKT = "1.23.0"
+
+    const val GRADLE = "8.0.2"
+
+    const val JUNIT = "4.13.2"
+
+    const val KOIN = "3.3.2"
+    const val KOIN_ANDROID = "3.3.2"
+    const val KOIN_ANDROIDX_COMPOSE = "3.4.1"
+    const val KOTLIN = "1.8.21"
+    const val KOTLIN_COROUTINES = "1.7.3"
+    const val KOTEST = "5.5.4"
+    const val KOTLINX_RESOURCES = "0.2.4"
+    const val KOVER = "0.7.3"
+    const val KSP = "1.8.21-1.0.11"
+    const val KTOR = "2.1.1"
+
+    const val MOCKATIVE = "1.3.0"
+    const val MOCKK = "1.13.3"
+
+    const val NAPIER = "2.6.1"
+
+    const val ROBOLECTRIC = "4.9.1"
+
+    const val TIMBER = "5.0.1"
+    const val TURBINE = "0.12.1"
+}
diff --git a/make.sh b/make.sh
@@ -98,9 +98,8 @@ if ! [[ $minimum_ios_version =~ $version_regex ]]; then
     minimum_ios_version="14.0"
 fi
 
+# Generate iOS module
 sh make_ios.sh  -b ${bundle_id_production} -s ${bundle_id_staging} -n ${project_name} -iv ${minimum_ios_version}
-rm -rf make_ios.sh
-rm -rf make.sh
 
 # =====GENERATE ANDROID AND SHARED MODULES + REST OF COMPONENTS=====
 # TODO: Fully generate the KMM project later
@@ -111,5 +110,12 @@ rsync -av \
     --exclude '.git' \
     --exclude '.gitmodules' \
     --exclude 'make.sh' \
-    --exclude './sample' \
+    --exclude 'make_ios.sh' \
+    --exclude '/sample' \
     ./ sample/
+
+# Reset all git submodules
+cd ios
+git add .
+git reset --hard
+cd ..
diff --git a/make_ios.sh b/make_ios.sh
@@ -38,6 +38,11 @@ cd ios
 
 echo "=> Removing unnecessary files and folders"
 rm -rf {PROJECT_NAME}/sources/data
+rm -rf ${project_name}
+rm -rf ${project_name}.xcodeproj
+rm -rf ${project_name}.xcworkspace
+rm -rf ${project_name}KIFUITests
+rm -rf ${project_name}Tests
 
 # Bypass this bug in iOS Template: https://github.com/nimblehq/ios-templates/issues/307
 rm -f {PROJECT_NAME}KIFUITests/Sources/Specs/Application/ApplicationSpec.swift

diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts
@@ -9,12 +9,12 @@ plugins {
 val keystoreProperties = loadProperties("$rootDir/signing.properties")
 
 android {
-    namespace = "co.nimblehq.kmm.template.android"
-    compileSdk = Versions.ANDROID_COMPILE_SDK_VERSION
+    namespace = "co.nimblehq.kmm.template"
+    compileSdk = Versions.ANDROID_COMPILE_SDK
     defaultConfig {
-        applicationId = "co.nimblehq.kmm.template.android"
-        minSdk = Versions.ANDROID_MIN_SDK_VERSION
-        targetSdk = Versions.ANDROID_TARGET_SDK_VERSION
+        applicationId = "co.nimblehq.kmm.template"
+        minSdk = Versions.ANDROID_MIN_SDK
+        targetSdk = Versions.ANDROID_TARGET_SDK
         versionCode = Versions.ANDROID_VERSION_CODE
         versionName = Versions.ANDROID_VERSION_NAME
     }

diff --git a/...lehq/kmm/template/android/util/LogUtil.kt → .../co/nimblehq/kmm/template/util/LogUtil.kt b/...lehq/kmm/template/android/util/LogUtil.kt → .../co/nimblehq/kmm/template/util/LogUtil.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import timber.log.Timber
 

diff --git a/sample/android/src/main/AndroidManifest.xml b/sample/android/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.kmm.template.android">
+    package="co.nimblehq.kmm.template">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name=".MyApplication"
+        android:name=".MainApplication"
         android:allowBackup="false"
         android:label="@string/app_name"
         android:supportsRtl="true"

diff --git a/...ehq/kmm/template/android/MyApplication.kt → .../nimblehq/kmm/template/MainApplication.kt b/...ehq/kmm/template/android/MyApplication.kt → .../nimblehq/kmm/template/MainApplication.kt
@@ -1,12 +1,12 @@
-package co.nimblehq.kmm.template.android
+package co.nimblehq.kmm.template
 
 import android.app.Application
-import co.nimblehq.kmm.template.android.di.androidViewModelModule
-import co.nimblehq.kmm.template.android.util.LogUtil
+import co.nimblehq.kmm.template.di.androidViewModelModule
+import co.nimblehq.kmm.template.util.LogUtil
 import co.nimblehq.kmm.template.di.initKoin
 import org.koin.android.ext.koin.androidContext
 
-class MyApplication : Application() {
+class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()