Skip to content

Commit 1958f2a

Browse files
ryan-conwayryan-conway
authored
Merge pull request #550 from nimblehq/release/3.25.0
[Release] 3.25.0
2 parents e0136b9 + 7a75d19 commit 1958f2a

File tree

455 files changed

+115
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

455 files changed

+115
-222
lines changed

‎.cicdtemplate/.github/workflows/bump_version.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ on:
88
required: true
99
type: string
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
bump_version:
1317
name: Bump version
1418
runs-on: ubuntu-latest
1519
steps:
16-
- name: Checkout the latest code
17-
uses: actions/checkout@v3
18-
with:
19-
token: ${{ secrets.GITHUB_TOKEN }}
20+
- name: Checkout source code
21+
uses: actions/checkout@v4
2022

2123
- name: Bump version name
22-
uses: chkfung/android-version-actions@v1.2.1
23-
with:
24-
gradlePath: app/build.gradle.kts
25-
versionName: ${{ github.event.inputs.newVersion }}
24+
run: |
25+
perl -i -pe 's/ANDROID_VERSION_NAME =(.*)$/ANDROID_VERSION_NAME = "${{ github.event.inputs.newVersion }}"/g' buildSrc/src/main/java/Versions.kt
2626
2727
- name: Create pull request
2828
uses: peter-evans/create-pull-request@v4

‎.cicdtemplate/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 30
1515
steps:
16-
- name: Set up JDK 11
16+
- name: Set up JDK 17
1717
uses: actions/setup-java@v3
1818
with:
1919
distribution: 'temurin'
20-
java-version: '11'
20+
java-version: '17'
2121

2222
- name: Set up timezone
2323
uses: zcong1993/setup-timezone@master
2424
with:
2525
timezone: Asia/Bangkok
2626

2727
- name: Checkout source code
28-
uses: actions/checkout@v2.3.2
28+
uses: actions/checkout@v4
2929

3030
- name: Cache Gradle
3131
uses: actions/cache@v2

‎.cicdtemplate/.github/workflows/review_pull_request.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@ on:
44
pull_request:
55
types: [ opened, edited, reopened, synchronize ]
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
jobs:
812
review_pull_request:
913
name: Review pull request
1014
runs-on: ubuntu-latest
1115
timeout-minutes: 30
1216
steps:
13-
- name: Set up JDK 11
17+
- name: Set up JDK 17
1418
uses: actions/setup-java@v3
1519
with:
1620
distribution: 'temurin'
17-
java-version: '11'
21+
java-version: '17'
1822

1923
- name: Checkout source code
20-
uses: actions/checkout@v2.3.2
24+
uses: actions/checkout@v4
2125

2226
- name: Cache Gradle
2327
uses: actions/cache@v2

‎.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,29 @@ on:
1010
- develop
1111
- 'release/**'
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1317
jobs:
1418
run_detekt_and_unit_tests:
1519
name: Run Detekt and unit tests
1620
runs-on: ubuntu-latest
1721
timeout-minutes: 30
1822
steps:
19-
- name: Set up JDK 11
23+
- name: Set up JDK 17
2024
uses: actions/setup-java@v3
2125
with:
2226
distribution: 'temurin'
23-
java-version: '11'
27+
java-version: '17'
2428

2529
- name: Set up timezone
2630
uses: zcong1993/setup-timezone@master
2731
with:
2832
timezone: Asia/Bangkok
2933

3034
- name: Checkout source code
31-
uses: actions/checkout@v2.3.2
35+
uses: actions/checkout@v4
3236

3337
- name: Cache Gradle
3438
uses: actions/cache@v2

‎.github/workflows/bump_version.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,22 @@ on:
88
required: true
99
type: string
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
bump_version:
1317
name: Bump version
1418
runs-on: ubuntu-latest
1519
steps:
16-
- name: Checkout the latest code
17-
uses: actions/checkout@v3
18-
with:
19-
token: ${{ secrets.GITHUB_TOKEN }}
20+
- name: Checkout source code
21+
uses: actions/checkout@v4
2022

2123
- name: Bump version script
2224
run: |
2325
perl -i -pe 's/^(templateScriptVersion=(.*))$/"templateScriptVersion=${{ github.event.inputs.newVersion }}"/e' version.properties
2426
25-
- name: Bump version XML
26-
run: |
27-
perl -i -pe 's/ANDROID_VERSION_NAME =(.*)$/ANDROID_VERSION_NAME = "${{ github.event.inputs.newVersion }}"/g' sample-xml/buildSrc/src/main/java/Versions.kt
28-
2927
- name: Bump version Compose
3028
run: |
3129
perl -i -pe 's/ANDROID_VERSION_NAME =(.*)$/ANDROID_VERSION_NAME = "${{ github.event.inputs.newVersion }}"/g' sample-compose/buildSrc/src/main/java/Versions.kt

‎.github/workflows/draft-new-release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@ on:
88
permissions:
99
contents: read
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
draft_new_release:
1317
permissions:
1418
contents: write
1519
runs-on: ubuntu-latest
1620
timeout-minutes: 30
1721
steps:
18-
- name: Checkout code
19-
uses: actions/checkout@v2
22+
- name: Checkout source code
23+
uses: actions/checkout@v4
2024

2125
- name: Install Kscript
2226
run: |

‎.github/workflows/publish_docs_to_wiki.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 30
1515
steps:
16-
- name: Check out the repository
17-
uses: actions/checkout@v3
16+
- name: Checkout source code
17+
uses: actions/checkout@v4
1818
with:
1919
ref: ${{ github.head_ref }}
2020

‎.github/workflows/review_pull_request.yml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,25 @@ on:
44
pull_request:
55
types: [ opened, edited, reopened, synchronize ]
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
711
jobs:
812
review_pull_request:
913
name: Review pull request
1014
runs-on: ubuntu-latest
1115
timeout-minutes: 30
1216
environment: template-compose
1317
steps:
14-
- name: Set up JDK 11
18+
- name: Set up JDK 17
1519
uses: actions/setup-java@v3
1620
with:
1721
distribution: 'temurin'
18-
java-version: '11'
22+
java-version: '17'
1923

2024
- name: Checkout source code
21-
uses: actions/checkout@v2.3.2
25+
uses: actions/checkout@v4
2226

2327
- name: Cache Gradle
2428
uses: actions/cache@v2
@@ -31,28 +35,8 @@ jobs:
3135
restore-keys: |
3236
${{ runner.os }}-gradle-
3337
34-
# template-xml
35-
36-
- name: Run Detekt on template-xml
37-
working-directory: ./template-xml
38-
run: ./gradlew detekt
39-
40-
- name: Run Android Lint on template-xml
41-
working-directory: ./template-xml
42-
run: ./gradlew lint
43-
44-
- name: Run unit tests with Kover on template-xml
45-
working-directory: ./template-xml
46-
run: ./gradlew koverXmlReport
47-
4838
# template-compose
4939

50-
- name: Set up JDK 17
51-
uses: actions/setup-java@v3
52-
with:
53-
distribution: 'temurin'
54-
java-version: '17'
55-
5640
- name: Run Detekt on template-compose
5741
working-directory: ./template-compose
5842
run: ./gradlew detekt

‎.github/workflows/run_detekt_and_unit_tests.yml

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@ name: Run Detekt and unit tests
22

33
on: push
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610
run_detekt_and_unit_tests:
711
name: Run Detekt and unit tests
812
runs-on: ubuntu-latest
913
timeout-minutes: 30
1014
steps:
1115
- name: Checkout source code
12-
uses: actions/checkout@v2.3.2
16+
uses: actions/checkout@v4
1317

1418
- name: Cache Gradle
1519
uses: actions/cache@v2
@@ -50,56 +54,6 @@ jobs:
5054
name: CodeCoverageReportsTemplateCompose
5155
path: template-compose/app/build/reports/kover/
5256

53-
# template-xml
54-
55-
- name: Set up JDK 11
56-
uses: actions/setup-java@v3
57-
with:
58-
distribution: 'temurin'
59-
java-version: '11'
60-
61-
- name: Run Detekt on template-xml
62-
working-directory: ./template-xml
63-
run: ./gradlew detekt
64-
65-
- name: Archive Detekt reports on template-xml
66-
uses: actions/upload-artifact@v3
67-
with:
68-
name: DetektReportsTemplateXML
69-
path: template-xml/build/reports/detekt/
70-
71-
- name: Run unit tests with Kover on template-xml
72-
working-directory: ./template-xml
73-
run: ./gradlew koverHtmlReport
74-
75-
- name: Archive code coverage reports on template-xml
76-
uses: actions/upload-artifact@v3
77-
with:
78-
name: CodeCoverageReportsTemplateXML
79-
path: template-xml/app/build/reports/kover/
80-
81-
# sample-xml
82-
83-
- name: Run Detekt on sample-xml
84-
working-directory: ./sample-xml
85-
run: ./gradlew detekt
86-
87-
- name: Archive Detekt reports on sample-xml
88-
uses: actions/upload-artifact@v3
89-
with:
90-
name: DetektReportsTemplateXML
91-
path: sample-xml/build/reports/detekt/
92-
93-
- name: Run unit tests with Kover on sample-xml
94-
working-directory: ./sample-xml
95-
run: ./gradlew koverHtmlReport
96-
97-
- name: Archive code coverage reports on sample-xml
98-
uses: actions/upload-artifact@v3
99-
with:
100-
name: CodeCoverageReportsTemplateXML
101-
path: sample-xml/app/build/reports/kover/
102-
10357
# sample-compose
10458

10559
- name: Run Detekt on sample-compose

‎.github/workflows/verify_newproject_script.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@ on:
55
types: [ opened, reopened, synchronize ]
66
branches: [ develop ]
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
verify_newproject_script:
1014
name: Verify newproject script
1115
runs-on: ubuntu-latest
1216
timeout-minutes: 30
1317
steps:
14-
- name: Set up JDK 11
18+
- name: Set up JDK 17
1519
uses: actions/setup-java@v3
1620
with:
1721
distribution: 'temurin'
18-
java-version: '11'
22+
java-version: '17'
1923

2024
- name: Checkout source code
21-
uses: actions/checkout@v2.3.2
25+
uses: actions/checkout@v4
2226

2327
- name: Cache Gradle
2428
uses: actions/cache@v2
@@ -40,16 +44,6 @@ jobs:
4044
sdk install kscript $kscriptVersion
4145
echo $PATH >> $GITHUB_PATH
4246
43-
- name: Verify generating new project from template-xml
44-
working-directory: scripts
45-
run: kscript new_project.kts package-name=co.myxmlproject.example app-name="My XML Project" template=xml
46-
47-
- name: Set up JDK 17
48-
uses: actions/setup-java@v3
49-
with:
50-
distribution: 'temurin'
51-
java-version: '17'
52-
5347
- name: Verify generating new project from template-compose
5448
working-directory: scripts
5549
run: kscript new_project.kts package-name=co.mycomposeproject.example app-name="My Compose Project" template=compose

0 commit comments

Comments
 (0)