Merge pull request #32 from nimblehq/feature/29-reuse-android-module-…

…from-android-templates [#29] 2/2 - Reuse the "android" module from android-templates
nimblehq · Oct 2, 2023 · b8b14cd · b8b14cd
2 parents b69e044 + d745c42
commit b8b14cd
Show file tree

Hide file tree

Showing 90 changed files with 1,129 additions and 851 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,6 +19,26 @@ jobs:
           ref: ${{ github.head_ref }}
           submodules: "recursive"
 
+      - name: Cache Gradle
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Install Kscript
+        run: |
+          curl -s "https://get.sdkman.io" | bash
+          source "$HOME/.sdkman/bin/sdkman-init.sh"
+          source android/version.properties
+          sdk install kotlin $kotlinVersion
+          sdk install kscript $kscriptVersion
+          echo $PATH >> $GITHUB_PATH
+
       # To avoid code change in git when refreshing the "sample" project
       - name: Preserve the ArkanaKeys
         run: mv -f ./sample/ios/ArkanaKeys ../

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "ios"]
 	path = ios
 	url = https://github.com/nimblehq/ios-templates.git
+[submodule "android"]
+	path = android
+	url = [email protected]:nimblehq/android-templates.git
+	branch = feature/replace-hilt-with-koin
diff --git a/android b/android
diff --git a/android/.gitignore b/android/.gitignore
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
diff --git a/android/src/debug/java/co/nimblehq/kmm/template/util/LogUtil.kt b/android/src/debug/java/co/nimblehq/kmm/template/util/LogUtil.kt
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/java/co/nimblehq/kmm/template/MainApplication.kt b/android/src/main/java/co/nimblehq/kmm/template/MainApplication.kt
diff --git a/android/src/main/java/co/nimblehq/kmm/template/di/ViewModelModule.kt b/android/src/main/java/co/nimblehq/kmm/template/di/ViewModelModule.kt
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
diff --git a/android/src/main/java/co/nimblehq/kmm/template/ui/base/BaseViewModel.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/base/BaseViewModel.kt
diff --git a/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppDestination.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppDestination.kt
diff --git a/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppNavigation.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppNavigation.kt
diff --git a/android/src/main/java/co/nimblehq/kmm/template/ui/screens/MainActivity.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/screens/MainActivity.kt