Skip to content

Commit 38db4af

Browse files
mshdabiolamshdabiola
committed
Merge branch 'release/1.3.2'
2 parents ef99b4f + d6071f5 commit 38db4af

File tree

70 files changed

+11157
-11183
lines changed

Some content is hidden

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

70 files changed

+11157
-11183
lines changed

‎.github/workflows/Build.yaml

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -177,64 +177,64 @@ jobs:
177177
overwrite: false
178178
path: '**/build/reports/kover/'
179179

180-
androidTest:
181-
runs-on: ubuntu-latest
182-
timeout-minutes: 55
183-
strategy:
184-
matrix:
185-
api-level: [ 26, 30 ]
186-
187-
steps:
188-
- name: Delete unnecessary tools 🔧
189-
uses: jlumbroso/free-disk-space@v1.3.1
190-
with:
191-
android: false # Don't remove Android tools
192-
tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
193-
dotnet: true # rm -rf /usr/share/dotnet
194-
haskell: true # rm -rf /opt/ghc...
195-
swap-storage: true # rm -f /mnt/swapfile (4GiB)
196-
docker-images: false # Takes 16s, enable if needed in the future
197-
large-packages: false # includes google-cloud-sdk and it's slow
198-
199-
- name: Enable KVM group perms
200-
run: |
201-
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
202-
sudo udevadm control --reload-rules
203-
sudo udevadm trigger --name-match=kvm
204-
ls /dev/kvm
205-
206-
- name: Checkout
207-
uses: actions/checkout@v4
208-
209-
- name: Copy CI gradle.properties
210-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
211-
212-
- name: Set up JDK 21
213-
uses: actions/setup-java@v4
214-
with:
215-
distribution: 'zulu'
216-
java-version: 21
217-
218-
- name: Setup Gradle
219-
uses: gradle/actions/setup-gradle@v4
220-
with:
221-
build-scan-publish: true
222-
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
223-
build-scan-terms-of-use-agree: "yes"
224-
225-
- name: Build projects and run instrumentation tests
226-
uses: reactivecircus/android-emulator-runner@v2
227-
with:
228-
api-level: ${{ matrix.api-level }}
229-
arch: x86_64
230-
disable-animations: true
231-
disk-size: 6000M
232-
heap-size: 600M
233-
script: ./gradlew connectedFossReliantDebugAndroidTest --daemon
234-
235-
- name: Upload test reports
236-
if: always()
237-
uses: actions/upload-artifact@v4
238-
with:
239-
name: test-reports-${{ matrix.api-level }}
240-
path: '**/build/reports/androidTests'
180+
# androidTest:
181+
# runs-on: ubuntu-latest
182+
# timeout-minutes: 55
183+
# strategy:
184+
# matrix:
185+
# api-level: [ 26, 30 ]
186+
#
187+
# steps:
188+
# - name: Delete unnecessary tools 🔧
189+
# uses: jlumbroso/free-disk-space@v1.3.1
190+
# with:
191+
# android: false # Don't remove Android tools
192+
# tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
193+
# dotnet: true # rm -rf /usr/share/dotnet
194+
# haskell: true # rm -rf /opt/ghc...
195+
# swap-storage: true # rm -f /mnt/swapfile (4GiB)
196+
# docker-images: false # Takes 16s, enable if needed in the future
197+
# large-packages: false # includes google-cloud-sdk and it's slow
198+
#
199+
# - name: Enable KVM group perms
200+
# run: |
201+
# echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
202+
# sudo udevadm control --reload-rules
203+
# sudo udevadm trigger --name-match=kvm
204+
# ls /dev/kvm
205+
#
206+
# - name: Checkout
207+
# uses: actions/checkout@v4
208+
#
209+
# - name: Copy CI gradle.properties
210+
# run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
211+
#
212+
# - name: Set up JDK 21
213+
# uses: actions/setup-java@v4
214+
# with:
215+
# distribution: 'zulu'
216+
# java-version: 21
217+
#
218+
# - name: Setup Gradle
219+
# uses: gradle/actions/setup-gradle@v4
220+
# with:
221+
# build-scan-publish: true
222+
# build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
223+
# build-scan-terms-of-use-agree: "yes"
224+
#
225+
# - name: Build projects and run instrumentation tests
226+
# uses: reactivecircus/android-emulator-runner@v2
227+
# with:
228+
# api-level: ${{ matrix.api-level }}
229+
# arch: x86_64
230+
# disable-animations: true
231+
# disk-size: 6000M
232+
# heap-size: 600M
233+
# script: ./gradlew connectedFossReliantDebugAndroidTest --daemon
234+
#
235+
# - name: Upload test reports
236+
# if: always()
237+
# uses: actions/upload-artifact@v4
238+
# with:
239+
# name: test-reports-${{ matrix.api-level }}
240+
# path: '**/build/reports/androidTests'

‎.github/workflows/Release_to_playstore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v4
2525

2626
- name: Validate Gradle Wrapper
27-
uses: gradle/wrapper-validation-action@v1
27+
uses: gradle/wrapper-validation-action@v3
2828

2929
- name: Copy CI gradle.properties
3030
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

‎.github/workflows/deploy_foss_to_github.yml

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,42 @@ on:
55
tags:
66
- '[0-9]+.[0-9]+.[0-9]+'
77

8+
## 2
89
jobs:
10+
## 3
911
build:
1012
runs-on: ubuntu-latest
11-
timeout-minutes: 120
12-
1313
steps:
14-
- name: Enable KVM group perms
15-
run: |
16-
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
17-
sudo udevadm control --reload-rules
18-
sudo udevadm trigger --name-match=kvm
19-
ls /dev/kvm
20-
21-
- name: Checkout
22-
uses: actions/checkout@v4
23-
24-
- name: Validate Gradle Wrapper
25-
uses: gradle/wrapper-validation-action@v3
26-
27-
- name: Copy CI gradle.properties
28-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
29-
14+
# 1
15+
- uses: actions/checkout@v4
3016
- name: Set up JDK 21
3117
uses: actions/setup-java@v4
3218
with:
3319
distribution: 'zulu'
3420
java-version: 21
21+
# 2
3522

36-
- name: Install GMD image for baseline profile generation
37-
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
23+
- name: Setup Android SDK
24+
uses: android-actions/setup-android@v2
3825

3926
- name: Accept Android licenses
4027
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
4128

42-
- name: Build release variant including baseline profile generation
43-
run: ./gradlew generateFossReliantReleaseBaselineProfile
44-
-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
45-
-Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
46-
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
47-
-Pandroid.experimental.androidTest.numManagedDeviceShards=1
48-
-Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
29+
- name: Setup Gradle
30+
uses: gradle/actions/setup-gradle@v4
31+
with:
32+
build-scan-publish: true
33+
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
34+
build-scan-terms-of-use-agree: "yes"
35+
36+
- name: Remove Firebase References
37+
run: |
38+
sed -i -e '/androidx.dev/d' settings.gradle.kts
39+
sed -i -e '/with(target) {/,/^ }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
40+
sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
4941
5042
- name: Build release variant apk
51-
run: ./gradlew :app:assembleFossReliantRelease
43+
run: ./gradlew assembleFossReliantRelease
5244

5345
- name: Sign APK
5446
uses: r0adkll/sign-android-release@v1.0.4
@@ -61,6 +53,7 @@ jobs:
6153
env:
6254
BUILD_TOOLS_VERSION: "34.0.0"
6355

56+
# 4
6457
- name: Draft Release
6558
uses: ncipollo/release-action@v1.14.0
6659
with:
@@ -70,4 +63,3 @@ jobs:
7063
generateReleaseNotes: true
7164
bodyFile: distribution/whatsnew/whatsnew-en-US
7265
prerelease: false
73-

‎.github/workflows/deploy_foss_to_github_old.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Deploy Foss to github
2+
3+
#on:
4+
# push:
5+
# tags:
6+
# - '[0-9]+.[0-9]+.[0-9]+'
7+
on: workflow_dispatch
8+
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 120
14+
15+
steps:
16+
- name: Enable KVM group perms
17+
run: |
18+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
19+
sudo udevadm control --reload-rules
20+
sudo udevadm trigger --name-match=kvm
21+
ls /dev/kvm
22+
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
26+
- name: Validate Gradle Wrapper
27+
uses: gradle/wrapper-validation-action@v3
28+
29+
- name: Copy CI gradle.properties
30+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
31+
32+
- name: Set up JDK 21
33+
uses: actions/setup-java@v4
34+
with:
35+
distribution: 'zulu'
36+
java-version: 21
37+
38+
- name: Install GMD image for baseline profile generation
39+
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
40+
41+
- name: Accept Android licenses
42+
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
43+
44+
- name: Build release variant including baseline profile generation
45+
run: ./gradlew generateFossReliantReleaseBaselineProfile
46+
-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
47+
-Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
48+
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
49+
-Pandroid.experimental.androidTest.numManagedDeviceShards=1
50+
-Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
51+
52+
- name: Build release variant apk
53+
run: ./gradlew :app:assembleFossReliantRelease
54+
55+
- name: Sign APK
56+
uses: r0adkll/sign-android-release@v1.0.4
57+
with:
58+
releaseDirectory: app/build/outputs/apk/fossReliant/release
59+
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
60+
alias: ${{ secrets.ALIAS }}
61+
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
62+
keyPassword: ${{ secrets.KEY_PASSWORD }}
63+
env:
64+
BUILD_TOOLS_VERSION: "34.0.0"
65+
66+
- name: Draft Release
67+
uses: ncipollo/release-action@v1.14.0
68+
with:
69+
allowUpdates: true
70+
artifacts: "app/build/outputs/apk/**/**/**/*.apk,app/build/outputs/mapping/**/**/*.txt"
71+
token: ${{ secrets.TOKEN }}
72+
generateReleaseNotes: true
73+
bodyFile: distribution/whatsnew/whatsnew-en-US
74+
prerelease: false
75+

‎.github/workflows/deploy_play_to_github.yml

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,36 @@ on:
55
tags:
66
- '[0-9]+.[0-9]+.[0-9]+'
77

8+
## 2
89
jobs:
10+
## 3
911
build:
1012
runs-on: ubuntu-latest
11-
timeout-minutes: 120
12-
1313
steps:
14-
- name: Enable KVM group perms
15-
run: |
16-
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
17-
sudo udevadm control --reload-rules
18-
sudo udevadm trigger --name-match=kvm
19-
ls /dev/kvm
20-
21-
- name: Checkout
22-
uses: actions/checkout@v4
23-
24-
- name: Validate Gradle Wrapper
25-
uses: gradle/wrapper-validation-action@v3
26-
27-
- name: Copy CI gradle.properties
28-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
29-
14+
# 1
15+
- uses: actions/checkout@v4
3016
- name: Set up JDK 21
3117
uses: actions/setup-java@v4
3218
with:
3319
distribution: 'zulu'
3420
java-version: 21
21+
# 2
3522

36-
- name: Install GMD image for baseline profile generation
37-
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
23+
- name: Setup Android SDK
24+
uses: android-actions/setup-android@v2
3825

3926
- name: Accept Android licenses
4027
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
4128

42-
- name: Build release variant including baseline profile generation
43-
run: ./gradlew generateGooglePlayReleaseBaselineProfile
44-
-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
45-
-Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
46-
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
47-
-Pandroid.experimental.androidTest.numManagedDeviceShards=1
48-
-Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
29+
- name: Setup Gradle
30+
uses: gradle/actions/setup-gradle@v4
31+
with:
32+
build-scan-publish: true
33+
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
34+
build-scan-terms-of-use-agree: "yes"
4935

5036
- name: Build release variant apk
51-
run: ./gradlew :app:assembleGooglePlayRelease
37+
run: ./gradlew assembleGooglePlayRelease
5238

5339
- name: Sign APK
5440
uses: r0adkll/sign-android-release@v1.0.4
@@ -61,6 +47,7 @@ jobs:
6147
env:
6248
BUILD_TOOLS_VERSION: "34.0.0"
6349

50+
# 4
6451
- name: Draft Release
6552
uses: ncipollo/release-action@v1.14.0
6653
with:
@@ -70,4 +57,3 @@ jobs:
7057
generateReleaseNotes: true
7158
bodyFile: distribution/whatsnew/whatsnew-en-US
7259
prerelease: false
73-

0 commit comments

Comments
 (0)