Skip to content

Commit 6ab2fb2

Browse files
ninovanhooffninovanhooff
committed
Merge remote-tracking branch 'refs/remotes/origin/main' into fix/crashlytics-groups-error-messages
# Conflicts: # feature/home/src/main/kotlin/nl/q42/template/home/main/presentation/HomeViewModel.kt
2 parents 9a4ed7c + b53f705 commit 6ab2fb2

File tree

63 files changed

+860
-646
lines changed

Some content is hidden

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

63 files changed

+860
-646
lines changed

‎.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Why is this important?
22

3-
## Any review notes?
3+
## Notes

‎.github/workflows/_prepare-all.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Prepare All
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
prepare-all:
8+
runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
9+
steps:
10+
- uses: actions/checkout@v4
11+
12+
- name: Setup Java
13+
uses: actions/setup-java@v4
14+
with:
15+
distribution: "corretto"
16+
java-version: "21" # keep the same as your Android Studio version
17+
18+
- name: Setup Android SDK
19+
uses: android-actions/setup-android@v3

‎.github/workflows/_prepare-release.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Prepare Release
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
prepareRelease:
8+
runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
9+
steps:
10+
- uses: actions/checkout@v4
11+
12+
- name: Update Version Code # we increase the version code with each build
13+
uses: chkfung/android-version-actions@v1.2.3
14+
with:
15+
gradlePath: app/build.gradle
16+
versionCode: ${{ github.run_number }}

‎.github/workflows/debug.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Debug Builds
2+
3+
on: [ push ] # run on all pushes on any branch
4+
5+
jobs:
6+
prepare-all:
7+
uses: ./.github/workflows/_prepare-all.yml
8+
build:
9+
runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
10+
steps:
11+
- uses: actions/checkout@v4
12+
13+
- name: Build Debug APK
14+
run: ./gradlew assembleDevDebug --stacktrace
15+
16+
- name: Run unit tests
17+
run: ./gradlew test --stacktrace
18+
19+
- name: Upload Dev Debug APK to Artifacts
20+
uses: actions/upload-artifact@v4
21+
with:
22+
name: ${{ github.event.repository.name }}-${{ github.run_number }}-dev-debug-apk
23+
path: |
24+
${{ github.workspace }}/app/build/outputs/apk/dev/debug/app-dev-debug.apk
25+
26+
- name: Build Prod APK
27+
run: ./gradlew assembleProdDebug --stacktrace
28+
29+
- name: Upload Prod Debug APK to Artifacts
30+
uses: actions/upload-artifact@v4
31+
with:
32+
name: ${{ github.event.repository.name }}_${{ github.run_number }}-prod-debug-apk
33+
path: |
34+
${{ github.workspace }}/app/build/outputs/apk/prod/debug/app-prod-debug.apk

‎.github/workflows/pr.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎.github/workflows/publish.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Release Builds
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches: [ 'develop' ]
7+
8+
jobs:
9+
prepare-all:
10+
uses: ./.github/workflows/_prepare-all.yml
11+
prepare-release:
12+
uses: ./.github/workflows/_prepare-release.yml
13+
build:
14+
runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
# This will decode the keystore from base 64 text representation that we have stored in secrets
19+
# and generates and keystore file and gets stored in /android-app path
20+
- name: Decode Keystore
21+
env:
22+
ENCODED_STRING: ${{ secrets.KEYSTORE_BASE_64 }}
23+
shell: bash
24+
run: |
25+
echo $ENCODED_STRING > keystore-b64.txt
26+
base64 -d <keystore-b64.txt >upload-keystore.jks
27+
28+
- name: Build Prod Release APK
29+
env:
30+
RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
31+
RELEASE_KEYSTORE_ALIAS: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
32+
RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
33+
run: ./gradlew assembleProdRelease --stacktrace
34+
35+
- name: Upload Release APK to Artifacts
36+
uses: actions/upload-artifact@v4
37+
with:
38+
name: ${{ github.event.repository.name }}-${{ github.run_number }}-prod-release-apk
39+
path: |
40+
${{ github.workspace }}/app/build/outputs/apk/prod/release/app-prod-release.apk
41+
42+
- name: Upload Prod Release APK to Firebase App Distribution
43+
uses: nickwph/firebase-app-distribution-action@v1
44+
with:
45+
file: ${{ github.workspace }}/app/build/outputs/apk/prod/release/app-prod-release.apk
46+
app: ${{ secrets.FIREBASE_PROD_APP_ID }}
47+
credentials: ${{ secrets.FIREBASE_CREDENTIALS }}
48+
49+
- name: Build Prod Release Bundle
50+
env:
51+
RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
52+
RELEASE_KEYSTORE_ALIAS: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
53+
RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
54+
run: ./gradlew bundleProdRelease --stacktrace
55+
56+
- name: Upload Release Bundle to Artifacts
57+
uses: actions/upload-artifact@v4
58+
with:
59+
name: ${{ github.event.repository.name }}-${{ github.run_number }}-prod-release-bundle
60+
path: |
61+
${{ github.workspace }}/app/build/outputs/bundle/prodRelease/app-prod-release.aab

‎.github/workflows/release.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Release Builds
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches: [ '*' ] # run on all pull requests
7+
8+
jobs:
9+
prepare-all:
10+
uses: ./.github/workflows/_prepare-all.yml
11+
prepare-release:
12+
uses: ./.github/workflows/_prepare-release.yml
13+
build:
14+
runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
# This will decode the keystore from base 64 text representation that we have stored in secrets
19+
# and generates and keystore file and gets stored in /android-app path
20+
- name: Decode Keystore
21+
env:
22+
ENCODED_STRING: ${{ secrets.KEYSTORE_BASE_64 }}
23+
shell: bash
24+
run: |
25+
echo $ENCODED_STRING > keystore-b64.txt
26+
base64 -d <keystore-b64.txt >upload-keystore.jks
27+
28+
- name: Build Prod Release APK
29+
env:
30+
RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
31+
RELEASE_KEYSTORE_ALIAS: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
32+
RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
33+
run: ./gradlew assembleProdRelease --stacktrace
34+
35+
- name: Upload Release APK to Artifacts
36+
uses: actions/upload-artifact@v4
37+
with:
38+
name: ${{ github.event.repository.name }}-${{ github.run_number }}-prod-release-apk
39+
path: |
40+
${{ github.workspace }}/app/build/outputs/apk/prod/release/app-prod-release.apk

‎.idea/compiler.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)