Skip to content

Commit e0136b9

Browse files
ryan-conwayryan-conway
authored
Merge pull request #523 from nimblehq/release/3.24.0
[Release] 3.24.0
2 parents 832b35e + 0a6b800 commit e0136b9

File tree

105 files changed

+561
-404
lines changed

Some content is hidden

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

105 files changed

+561
-404
lines changed

‎.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
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 30
1515
steps:
1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v2
17+
uses: actions/setup-java@v3
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
@@ -42,7 +42,7 @@ jobs:
4242
run: ./gradlew detekt
4343

4444
- name: Archive Detekt reports
45-
uses: actions/upload-artifact@v2
45+
uses: actions/upload-artifact@v3
4646
with:
4747
name: DetektReports
4848
path: build/reports/detekt/
@@ -51,7 +51,7 @@ jobs:
5151
run: ./gradlew koverHtmlReport
5252

5353
- name: Archive code coverage reports
54-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v3
5555
with:
5656
name: CodeCoverageReports
5757
path: app/build/reports/kover/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
timeout-minutes: 30
1212
steps:
1313
- name: Set up JDK 11
14-
uses: actions/setup-java@v2
14+
uses: actions/setup-java@v3
1515
with:
1616
distribution: 'temurin'
1717
java-version: '11'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
timeout-minutes: 30
1818
steps:
1919
- name: Set up JDK 11
20-
uses: actions/setup-java@v2
20+
uses: actions/setup-java@v3
2121
with:
2222
distribution: 'temurin'
2323
java-version: '11'
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew detekt
4646

4747
- name: Archive Detekt reports
48-
uses: actions/upload-artifact@v2
48+
uses: actions/upload-artifact@v3
4949
with:
5050
name: DetektReports
5151
path: build/reports/detekt/
@@ -54,7 +54,7 @@ jobs:
5454
run: ./gradlew koverHtmlReport
5555

5656
- name: Archive code coverage reports
57-
uses: actions/upload-artifact@v2
57+
uses: actions/upload-artifact@v3
5858
if: always()
5959
with:
6060
name: CodeCoverageReports

‎.github/workflows/review_pull_request.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
environment: template-compose
1313
steps:
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'temurin'
1818
java-version: '11'
@@ -47,6 +47,12 @@ jobs:
4747

4848
# template-compose
4949

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

‎.github/workflows/run_detekt_and_unit_tests.yml

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ jobs:
88
runs-on: ubuntu-latest
99
timeout-minutes: 30
1010
steps:
11-
- name: Set up JDK 11
12-
uses: actions/setup-java@v2
13-
with:
14-
distribution: 'temurin'
15-
java-version: '11'
16-
1711
- name: Checkout source code
1812
uses: actions/checkout@v2.3.2
1913

@@ -28,36 +22,20 @@ jobs:
2822
restore-keys: |
2923
${{ runner.os }}-gradle-
3024
31-
# template-xml
32-
33-
- name: Run Detekt on template-xml
34-
working-directory: ./template-xml
35-
run: ./gradlew detekt
36-
37-
- name: Archive Detekt reports on template-xml
38-
uses: actions/upload-artifact@v2
39-
with:
40-
name: DetektReportsTemplateXML
41-
path: template-xml/build/reports/detekt/
42-
43-
- name: Run unit tests with Kover on template-xml
44-
working-directory: ./template-xml
45-
run: ./gradlew koverHtmlReport
25+
# template-compose
4626

47-
- name: Archive code coverage reports on template-xml
48-
uses: actions/upload-artifact@v2
27+
- name: Set up JDK 17
28+
uses: actions/setup-java@v3
4929
with:
50-
name: CodeCoverageReportsTemplateXML
51-
path: template-xml/app/build/reports/kover/
52-
53-
# template-compose
30+
distribution: 'temurin'
31+
java-version: '17'
5432

5533
- name: Run Detekt on template-compose
5634
working-directory: ./template-compose
5735
run: ./gradlew detekt
5836

5937
- name: Archive Detekt reports on template-compose
60-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v3
6139
with:
6240
name: DetektReportsTemplateCompose
6341
path: template-compose/build/reports/detekt/
@@ -67,19 +45,47 @@ jobs:
6745
run: ./gradlew koverHtmlReport
6846

6947
- name: Archive code coverage reports on template-compose
70-
uses: actions/upload-artifact@v2
48+
uses: actions/upload-artifact@v3
7149
with:
7250
name: CodeCoverageReportsTemplateCompose
7351
path: template-compose/app/build/reports/kover/
7452

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+
7581
# sample-xml
7682

7783
- name: Run Detekt on sample-xml
7884
working-directory: ./sample-xml
7985
run: ./gradlew detekt
8086

8187
- name: Archive Detekt reports on sample-xml
82-
uses: actions/upload-artifact@v2
88+
uses: actions/upload-artifact@v3
8389
with:
8490
name: DetektReportsTemplateXML
8591
path: sample-xml/build/reports/detekt/
@@ -89,7 +95,7 @@ jobs:
8995
run: ./gradlew koverHtmlReport
9096

9197
- name: Archive code coverage reports on sample-xml
92-
uses: actions/upload-artifact@v2
98+
uses: actions/upload-artifact@v3
9399
with:
94100
name: CodeCoverageReportsTemplateXML
95101
path: sample-xml/app/build/reports/kover/
@@ -101,7 +107,7 @@ jobs:
101107
run: ./gradlew detekt
102108

103109
- name: Archive Detekt reports on sample-compose
104-
uses: actions/upload-artifact@v2
110+
uses: actions/upload-artifact@v3
105111
with:
106112
name: DetektReportsTemplateCompose
107113
path: sample-compose/build/reports/detekt/
@@ -111,7 +117,7 @@ jobs:
111117
run: ./gradlew koverHtmlReport
112118

113119
- name: Archive code coverage reports on sample-compose
114-
uses: actions/upload-artifact@v2
120+
uses: actions/upload-artifact@v3
115121
with:
116122
name: CodeCoverageReportsTemplateCompose
117123
path: sample-compose/app/build/reports/kover/

‎.github/workflows/verify_newproject_script.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
timeout-minutes: 30
1313
steps:
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'temurin'
1818
java-version: '11'
@@ -44,6 +44,12 @@ jobs:
4444
working-directory: scripts
4545
run: kscript new_project.kts package-name=co.myxmlproject.example app-name="My XML Project" template=xml
4646

47+
- name: Set up JDK 17
48+
uses: actions/setup-java@v3
49+
with:
50+
distribution: 'temurin'
51+
java-version: '17'
52+
4753
- name: Verify generating new project from template-compose
4854
working-directory: scripts
4955
run: kscript new_project.kts package-name=co.mycomposeproject.example app-name="My Compose Project" template=compose

‎sample-compose/buildSrc/src/main/java/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Versions {
66
const val ANDROID_TARGET_SDK_VERSION = 33
77

88
const val ANDROID_VERSION_CODE = 1
9-
const val ANDROID_VERSION_NAME = "3.23.0"
9+
const val ANDROID_VERSION_NAME = "3.24.0"
1010

1111
// Dependencies (Alphabet sorted)
1212
const val ACCOMPANIST_PERMISSIONS_VERSION = "0.30.1"

‎sample-xml/buildSrc/src/main/java/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Versions {
66
const val ANDROID_TARGET_SDK_VERSION = 33
77

88
const val ANDROID_VERSION_CODE = 1
9-
const val ANDROID_VERSION_NAME = "3.23.0"
9+
const val ANDROID_VERSION_NAME = "3.24.0"
1010

1111
// Dependencies (Alphabet sorted)
1212
const val ANDROID_COMMON_KTX_VERSION = "0.1.1"

‎scripts/new_project.kts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,16 @@ object NewProject {
388388
newValue = appName
389389
)
390390
}
391+
File(projectPath)
392+
.walk()
393+
.filter { it.name == "settings.gradle.kts" }
394+
.forEach { filePath ->
395+
rename(
396+
sourcePath = filePath.toString(),
397+
oldValue = templateAppName,
398+
newValue = appName
399+
)
400+
}
391401
}
392402

393403
private fun rename(sourcePath: String, oldValue: String, newValue: String) {

‎template-compose/.gitignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,8 @@ captures/
3636
*.iml
3737
.idea/*
3838

39-
# Keystore files
40-
secret/
41-
4239
# External native build folder generated in Android Studio 2.2 and later
4340
.externalNativeBuild
4441

45-
# Google services
46-
google-services.json
47-
4842
# Keystore
4943
config/release.keystore

0 commit comments

Comments
 (0)