Skip to content

Commit e19c723

Browse files
committed
Merge branch 'release/0.4.15' into main
2 parents 2f27ba7 + 723c7bd commit e19c723

File tree

1,502 files changed

+10088
-3992
lines changed

Some content is hidden

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

1,502 files changed

+10088
-3992
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99

1010
# Enrich gradle.properties for CI/CD
1111
env:
12-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC -Dkotlin.daemon.jvm.options="-Xmx3g"
13-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 -Dsonar.gradle.skipCompile=true
12+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
13+
CI_GRADLE_ARG_PROPERTIES: --stacktrace -Dsonar.gradle.skipCompile=true
1414

1515
jobs:
1616
debug:

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- run: |
1212
npm install --save-dev @babel/plugin-transform-flow-strip-types
1313
- name: Danger
14-
uses: danger/[email protected].1
14+
uses: danger/[email protected].2
1515
with:
1616
args: "--dangerfile ./tools/danger/dangerfile.js"
1717
env:

.github/workflows/maestro.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88

99
# Enrich gradle.properties for CI/CD
1010
env:
11-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC -Dkotlin.daemon.jvm.options="-Xmx3g"
12-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 --no-daemon -Dsonar.gradle.skipCompile=true
11+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
12+
CI_GRADLE_ARG_PROPERTIES: --stacktrace --no-daemon -Dsonar.gradle.skipCompile=true
1313

1414
jobs:
1515
build-apk:

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- cron: "0 4 * * *"
88

99
env:
10-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
11-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 --no-daemon -Dsonar.gradle.skipCompile=true
10+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
11+
CI_GRADLE_ARG_PROPERTIES: --stacktrace --no-daemon -Dsonar.gradle.skipCompile=true
1212

1313
jobs:
1414
nightly:

.github/workflows/nightlyReports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88

99
# Enrich gradle.properties for CI/CD
1010
env:
11-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx3g" -Dkotlin.incremental=false -XX:+UseG1GC
12-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 -Dsonar.gradle.skipCompile=true
11+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
12+
CI_GRADLE_ARG_PROPERTIES: --stacktrace -Dsonar.gradle.skipCompile=true
1313

1414
jobs:
1515
nightlyReports:

.github/workflows/quality.yml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
# Enrich gradle.properties for CI/CD
1111
env:
1212
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
13-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 --no-daemon -Dsonar.gradle.skipCompile=true
13+
CI_GRADLE_ARG_PROPERTIES: --stacktrace --no-daemon -Dsonar.gradle.skipCompile=true
1414

1515
jobs:
1616
checkScript:
@@ -33,6 +33,27 @@ jobs:
3333
- name: Search for invalid screenshot files
3434
run: ./tools/test/checkInvalidScreenshots.py
3535

36+
checkDependencies:
37+
name: Search for invalid dependencies
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v4
41+
- name: Use JDK 17
42+
uses: actions/setup-java@v4
43+
with:
44+
distribution: 'temurin' # See 'Supported distributions' for available options
45+
java-version: '17'
46+
- name: Configure gradle
47+
uses: gradle/actions/setup-gradle@v3
48+
with:
49+
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
50+
- name: Set up Python 3.12
51+
uses: actions/setup-python@v5
52+
with:
53+
python-version: 3.12
54+
- name: Search for invalid dependencies
55+
run: ./tools/dependencies/checkDependencies.py
56+
3657
# Code checks
3758
konsist:
3859
name: Konsist tests
@@ -88,6 +109,10 @@ jobs:
88109
uses: gradle/actions/setup-gradle@v3
89110
with:
90111
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
112+
- name: Build Gplay Debug
113+
run: ./gradlew :app:compileGplayDebugKotlin $CI_GRADLE_ARG_PROPERTIES
114+
- name: Build Fdroid Debug
115+
run: ./gradlew :app:compileFdroidDebugKotlin $CI_GRADLE_ARG_PROPERTIES
91116
- name: Run lint
92117
run: ./gradlew :app:lintGplayDebug :app:lintFdroidDebug $CI_GRADLE_ARG_PROPERTIES
93118
- name: Upload reports
@@ -187,6 +212,19 @@ jobs:
187212
- name: Run Knit
188213
run: ./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES
189214

215+
# Note: to auto fix issues you can use the following command:
216+
# shellcheck -f diff <files> | git apply
217+
shellcheck:
218+
name: Check shell scripts
219+
runs-on: ubuntu-latest
220+
steps:
221+
- uses: actions/checkout@v4
222+
- name: Run shellcheck
223+
uses: ludeeus/[email protected]
224+
with:
225+
scandir: ./tools
226+
severity: warning
227+
190228
upload_reports:
191229
name: Project Check Suite
192230
runs-on: ubuntu-latest
@@ -207,7 +245,7 @@ jobs:
207245
yarn add danger-plugin-lint-report --dev
208246
- name: Danger lint
209247
if: always()
210-
uses: danger/[email protected].1
248+
uses: danger/[email protected].2
211249
with:
212250
args: "--dangerfile ./tools/danger/dangerfile-lint.js"
213251
env:

.github/workflows/recordScreenshots.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
# Enrich gradle.properties for CI/CD
99
env:
10-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC -Dsonar.gradle.skipCompile=true
10+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC -Dsonar.gradle.skipCompile=true
1111

1212
jobs:
1313
record:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
# Enrich gradle.properties for CI/CD
99
env:
1010
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
11-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 --no-daemon -Dsonar.gradle.skipCompile=true
11+
CI_GRADLE_ARG_PROPERTIES: --stacktrace --no-daemon -Dsonar.gradle.skipCompile=true
1212

1313
jobs:
1414
gplay:

.github/workflows/scripts/recordScreenshots.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ if [[ -z ${REPO} ]]; then
6262
fi
6363

6464
echo "Deleting previous screenshots"
65-
./gradlew removeOldSnapshots --stacktrace -PpreDexEnable=false --max-workers 4 --warn
65+
./gradlew removeOldSnapshots --stacktrace --warn
6666

6767
echo "Record screenshots"
68-
./gradlew recordPaparazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn
68+
./gradlew recordPaparazziDebug --stacktrace --warn
6969

7070
echo "Committing changes"
7171
git config http.sslVerify false

.github/workflows/sonar.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ on:
99

1010
# Enrich gradle.properties for CI/CD
1111
env:
12-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxMetaspaceSize=512m -Dkotlin.incremental=false -XX:+UseG1GC
13-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 8 --warn -Dsonar.gradle.skipCompile=true
12+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseG1GC
13+
CI_GRADLE_ARG_PROPERTIES: --stacktrace --warn -Dsonar.gradle.skipCompile=true
14+
GROUP: ${{ format('sonar-{0}', github.ref) }}
1415

1516
jobs:
1617
sonar:
1718
name: Sonar Quality Checks
1819
runs-on: ubuntu-latest
1920
# Allow all jobs on main and develop. Just one per PR.
2021
concurrency:
21-
group: ${{ github.ref == 'refs/heads/main' && format('sonar-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('sonar-develop-{0}', github.sha) || format('sonar-{0}', github.ref) }}
22-
cancel-in-progress: true
22+
group: ${{ format('sonar-{0}', github.ref) }}
23+
cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
2324
steps:
2425
- uses: actions/checkout@v4
2526
with:
@@ -35,8 +36,16 @@ jobs:
3536
uses: gradle/actions/setup-gradle@v3
3637
with:
3738
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
38-
- name: Build projects
39-
run: ./gradlew assembleDebug createFullJarDebugTestFixtures :app:createFullJarGplayDebugTestFixtures $CI_GRADLE_ARG_PROPERTIES
39+
- name: Build Gplay Debug
40+
run: ./gradlew :app:assembleGplayDebug $CI_GRADLE_ARG_PROPERTIES
41+
- name: Build Fdroid Debug
42+
run: ./gradlew :app:assembleFdroidDebug $CI_GRADLE_ARG_PROPERTIES
43+
- name: Build Sample
44+
run: ./gradlew :samples:minimal:assembleDebug $CI_GRADLE_ARG_PROPERTIES
45+
- name: Build library fixtures
46+
run: ./gradlew assembleDebug createFullJarDebugTestFixtures $CI_GRADLE_ARG_PROPERTIES
47+
- name: Build app fixtures
48+
run: ./gradlew :app:createFullJarGplayDebugTestFixtures $CI_GRADLE_ARG_PROPERTIES
4049
- name: 🔊 Publish results to Sonar
4150
env:
4251
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

0 commit comments

Comments
 (0)