Merge pull request #523 from nimblehq/release/3.24.0

[Release] 3.24.0
nimblehq · Oct 2, 2023 · e0136b9 · e0136b9
2 parents 832b35e + 0a6b800
commit e0136b9
Show file tree

Hide file tree

Showing 105 changed files with 561 additions and 404 deletions.
diff --git a/...template/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml b/...template/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -42,7 +42,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReports
           path: build/reports/detekt/
@@ -51,7 +51,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReports
           path: app/build/reports/kover/

diff --git a/.cicdtemplate/.github/workflows/review_pull_request.yml b/.cicdtemplate/.github/workflows/review_pull_request.yml
@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml b/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -45,7 +45,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReports
           path: build/reports/detekt/
@@ -54,7 +54,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: CodeCoverageReports

diff --git a/.github/workflows/review_pull_request.yml b/.github/workflows/review_pull_request.yml
@@ -12,7 +12,7 @@ jobs:
     environment: template-compose
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -47,6 +47,12 @@ jobs:
 
       # template-compose
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Run Detekt on template-compose
         working-directory: ./template-compose
         run: ./gradlew detekt

diff --git a/.github/workflows/run_detekt_and_unit_tests.yml b/.github/workflows/run_detekt_and_unit_tests.yml
@@ -8,12 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-
       - name: Checkout source code
         uses: actions/[email protected]
 
@@ -28,36 +22,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      # template-xml
-
-      - name: Run Detekt on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew detekt
-
-      - name: Archive Detekt reports on template-xml
-        uses: actions/upload-artifact@v2
-        with:
-          name: DetektReportsTemplateXML
-          path: template-xml/build/reports/detekt/
-
-      - name: Run unit tests with Kover on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew koverHtmlReport
+      # template-compose
 
-      - name: Archive code coverage reports on template-xml
-        uses: actions/upload-artifact@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          name: CodeCoverageReportsTemplateXML
-          path: template-xml/app/build/reports/kover/
-
-      # template-compose
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Run Detekt on template-compose
         working-directory: ./template-compose
         run: ./gradlew detekt
 
       - name: Archive Detekt reports on template-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReportsTemplateCompose
           path: template-compose/build/reports/detekt/
@@ -67,19 +45,47 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports on template-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReportsTemplateCompose
           path: template-compose/app/build/reports/kover/
 
+      # template-xml
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Run Detekt on template-xml
+        working-directory: ./template-xml
+        run: ./gradlew detekt
+
+      - name: Archive Detekt reports on template-xml
+        uses: actions/upload-artifact@v3
+        with:
+          name: DetektReportsTemplateXML
+          path: template-xml/build/reports/detekt/
+
+      - name: Run unit tests with Kover on template-xml
+        working-directory: ./template-xml
+        run: ./gradlew koverHtmlReport
+
+      - name: Archive code coverage reports on template-xml
+        uses: actions/upload-artifact@v3
+        with:
+          name: CodeCoverageReportsTemplateXML
+          path: template-xml/app/build/reports/kover/
+
       # sample-xml
 
       - name: Run Detekt on sample-xml
         working-directory: ./sample-xml
         run: ./gradlew detekt
 
       - name: Archive Detekt reports on sample-xml
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReportsTemplateXML
           path: sample-xml/build/reports/detekt/
@@ -89,7 +95,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports on sample-xml
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReportsTemplateXML
           path: sample-xml/app/build/reports/kover/
@@ -101,7 +107,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports on sample-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReportsTemplateCompose
           path: sample-compose/build/reports/detekt/
@@ -111,7 +117,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports on sample-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReportsTemplateCompose
           path: sample-compose/app/build/reports/kover/
diff --git a/.github/workflows/verify_newproject_script.yml b/.github/workflows/verify_newproject_script.yml
@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -44,6 +44,12 @@ jobs:
         working-directory: scripts
         run: kscript new_project.kts package-name=co.myxmlproject.example app-name="My XML Project" template=xml
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Verify generating new project from template-compose
         working-directory: scripts
         run: kscript new_project.kts package-name=co.mycomposeproject.example app-name="My Compose Project" template=compose

diff --git a/sample-compose/buildSrc/src/main/java/Versions.kt b/sample-compose/buildSrc/src/main/java/Versions.kt
@@ -6,7 +6,7 @@ object Versions {
     const val ANDROID_TARGET_SDK_VERSION = 33
 
     const val ANDROID_VERSION_CODE = 1
-    const val ANDROID_VERSION_NAME = "3.23.0"
+    const val ANDROID_VERSION_NAME = "3.24.0"
 
     // Dependencies (Alphabet sorted)
     const val ACCOMPANIST_PERMISSIONS_VERSION = "0.30.1"

diff --git a/sample-xml/buildSrc/src/main/java/Versions.kt b/sample-xml/buildSrc/src/main/java/Versions.kt
@@ -6,7 +6,7 @@ object Versions {
     const val ANDROID_TARGET_SDK_VERSION = 33
 
     const val ANDROID_VERSION_CODE = 1
-    const val ANDROID_VERSION_NAME = "3.23.0"
+    const val ANDROID_VERSION_NAME = "3.24.0"
 
     // Dependencies (Alphabet sorted)
     const val ANDROID_COMMON_KTX_VERSION = "0.1.1"

diff --git a/scripts/new_project.kts b/scripts/new_project.kts
@@ -388,6 +388,16 @@ object NewProject {
                     newValue = appName
                 )
             }
+        File(projectPath)
+            .walk()
+            .filter { it.name == "settings.gradle.kts" }
+            .forEach { filePath ->
+                rename(
+                    sourcePath = filePath.toString(),
+                    oldValue = templateAppName,
+                    newValue = appName
+                )
+            }
     }
 
     private fun rename(sourcePath: String, oldValue: String, newValue: String) {

diff --git a/template-compose/.gitignore b/template-compose/.gitignore
@@ -36,14 +36,8 @@ captures/
 *.iml
 .idea/*
 
-# Keystore files
-secret/
-
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 
-# Google services
-google-services.json
-
 # Keystore
 config/release.keystore
diff --git a/template-compose/app/.gitignore b/template-compose/app/.gitignore
@@ -1 +1,4 @@
 /build
+
+# Google services
+google-services.json