Merge pull request #550 from nimblehq/release/3.25.0

[Release] 3.25.0
nimblehq · Oct 31, 2023 · 1958f2a · 1958f2a
2 parents e0136b9 + 7a75d19
commit 1958f2a
Show file tree

Hide file tree

Showing 455 changed files with 115 additions and 222 deletions.
diff --git a/.cicdtemplate/.github/workflows/bump_version.yml b/.cicdtemplate/.github/workflows/bump_version.yml
@@ -8,21 +8,21 @@ on:
         required: true
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   bump_version:
     name: Bump version
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the latest code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout source code
+        uses: actions/checkout@v4
 
       - name: Bump version name
-        uses: chkfung/[email protected]
-        with:
-          gradlePath: app/build.gradle.kts
-          versionName: ${{ github.event.inputs.newVersion }}
+        run: |
+          perl -i -pe 's/ANDROID_VERSION_NAME =(.*)$/ANDROID_VERSION_NAME = "${{ github.event.inputs.newVersion }}"/g' buildSrc/src/main/java/Versions.kt
 
       - name: Create pull request
         uses: peter-evans/create-pull-request@v4

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
@@ -13,19 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Set up timezone
         uses: zcong1993/setup-timezone@master
         with:
           timezone: Asia/Bangkok
 
       - name: Checkout source code
-        uses: actions/checkout@v2.3.2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
         uses: actions/cache@v2

diff --git a/.cicdtemplate/.github/workflows/review_pull_request.yml b/.cicdtemplate/.github/workflows/review_pull_request.yml
@@ -4,20 +4,24 @@ on:
   pull_request:
     types: [ opened, edited, reopened, synchronize ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   review_pull_request:
     name: Review pull request
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Checkout source code
-        uses: actions/checkout@v2.3.2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
         uses: actions/cache@v2

diff --git a/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml b/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml
@@ -10,25 +10,29 @@ on:
       - develop
       - 'release/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run_detekt_and_unit_tests:
     name: Run Detekt and unit tests
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Set up timezone
         uses: zcong1993/setup-timezone@master
         with:
           timezone: Asia/Bangkok
 
       - name: Checkout source code
-        uses: actions/checkout@v2.3.2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
         uses: actions/cache@v2

diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml
@@ -8,24 +8,22 @@ on:
         required: true
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   bump_version:
     name: Bump version
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the latest code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout source code
+        uses: actions/checkout@v4
 
       - name: Bump version script
         run: |
           perl -i -pe 's/^(templateScriptVersion=(.*))$/"templateScriptVersion=${{ github.event.inputs.newVersion }}"/e' version.properties
 
-      - name: Bump version XML
-        run: |
-          perl -i -pe 's/ANDROID_VERSION_NAME =(.*)$/ANDROID_VERSION_NAME = "${{ github.event.inputs.newVersion }}"/g' sample-xml/buildSrc/src/main/java/Versions.kt
-
       - name: Bump version Compose
         run: |
           perl -i -pe 's/ANDROID_VERSION_NAME =(.*)$/ANDROID_VERSION_NAME = "${{ github.event.inputs.newVersion }}"/g' sample-compose/buildSrc/src/main/java/Versions.kt

diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -8,15 +8,19 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   draft_new_release:
     permissions:
       contents: write
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - name: Checkout source code
+        uses: actions/checkout@v4
 
       - name: Install Kscript
         run: |

diff --git a/.github/workflows/publish_docs_to_wiki.yml b/.github/workflows/publish_docs_to_wiki.yml
@@ -13,8 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
+      - name: Checkout source code
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/review_pull_request.yml b/.github/workflows/review_pull_request.yml
@@ -4,21 +4,25 @@ on:
   pull_request:
     types: [ opened, edited, reopened, synchronize ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   review_pull_request:
     name: Review pull request
     runs-on: ubuntu-latest
     timeout-minutes: 30
     environment: template-compose
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Checkout source code
-        uses: actions/checkout@v2.3.2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
         uses: actions/cache@v2
@@ -31,28 +35,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      # template-xml
-
-      - name: Run Detekt on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew detekt
-
-      - name: Run Android Lint on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew lint
-
-      - name: Run unit tests with Kover on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew koverXmlReport
-
       # 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
@@ -2,14 +2,18 @@ name: Run Detekt and unit tests
 
 on: push
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run_detekt_and_unit_tests:
     name: Run Detekt and unit tests
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2.3.2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
         uses: actions/cache@v2
@@ -50,56 +54,6 @@ jobs:
           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@v3
-        with:
-          name: DetektReportsTemplateXML
-          path: sample-xml/build/reports/detekt/
-
-      - name: Run unit tests with Kover on sample-xml
-        working-directory: ./sample-xml
-        run: ./gradlew koverHtmlReport
-
-      - name: Archive code coverage reports on sample-xml
-        uses: actions/upload-artifact@v3
-        with:
-          name: CodeCoverageReportsTemplateXML
-          path: sample-xml/app/build/reports/kover/
-
       # sample-compose
 
       - name: Run Detekt on sample-compose

diff --git a/.github/workflows/verify_newproject_script.yml b/.github/workflows/verify_newproject_script.yml
@@ -5,20 +5,24 @@ on:
     types: [ opened, reopened, synchronize ]
     branches: [ develop ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   verify_newproject_script:
     name: Verify newproject script
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Checkout source code
-        uses: actions/checkout@v2.3.2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
         uses: actions/cache@v2
@@ -40,16 +44,6 @@ jobs:
           sdk install kscript $kscriptVersion
           echo $PATH >> $GITHUB_PATH
 
-      - name: Verify generating new project from template-xml
-        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/Dangerfile b/Dangerfile
@@ -32,10 +32,6 @@ end
 # Show Danger test coverage report from Kover for templates
 # Report coverage of modified files, warn if total project coverage is under 80%
 # or if any modified file's coverage is under 95%
-kover_file_template_xml = "template-xml/app/build/reports/kover/report.xml"
-markdown "## Kover report for template-xml:"
-shroud.reportKover "Template - XML Unit Tests", kover_file_template_xml, 80, 95, false
-
 kover_file_template_compose = "template-compose/app/build/reports/kover/report.xml"
 markdown "## Kover report for template-compose:"
 shroud.reportKover "Template - Compose Unit Tests", kover_file_template_compose, 80, 95, false