Skip to content

Commit 02ca56c

Browse files
daxtheduckdaxtheduck
committed
Merge branch 'release/5.211.0' into main
2 parents b12e238 + 8a7fce4 commit 02ca56c

File tree

189 files changed

+19036
-25556
lines changed

Some content is hidden

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

189 files changed

+19036
-25556
lines changed

‎.github/workflows/action-issue-opened.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
issues: write
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
- name: Render template
2626
id: render_template

‎.github/workflows/ads-end-to-end.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '17'
2727
distribution: 'adopt'
@@ -44,10 +44,11 @@ jobs:
4444
fileName: android
4545
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
4646

47-
- name: Assemble release APK
48-
uses: gradle/gradle-build-action@v2
49-
with:
50-
arguments: assembleInternalRelease -Pforce-default-variant
47+
- name: Setup Gradle
48+
uses: gradle/actions/setup-gradle@v3
49+
50+
- name: Assemble the project
51+
run: ./gradlew assembleInternalRelease -Pforce-default-variant
5152

5253
- name: Move APK to new folder
5354
if: always()

‎.github/workflows/build-debug-apk.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,34 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
with:
2424
submodules: recursive
2525

2626
- name: Set up JDK 17
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
java-version: '17'
3030
distribution: 'adopt'
3131

3232
- name: Set up Go
33-
uses: actions/setup-go@v2
33+
uses: actions/setup-go@v5
3434
with:
3535
go-version: '1.18.3'
3636

37-
- name: Build
38-
uses: gradle/gradle-build-action@v2
39-
with:
40-
arguments: assembleInternalDebug -Pforce-default-variant
37+
- name: Setup Gradle
38+
uses: gradle/actions/setup-gradle@v3
39+
40+
- name: Assemble the project
41+
run: ./gradlew assembleInternalDebug -Pforce-default-variant
4142

4243
- name: Obtain debug apk
4344
if: always()
4445
run: cp $(find . -regex '.*outputs/apk/.*internal-debug.apk') pr-ddg-debug.apk
4546

4647
- name: Upload debug apk
4748
if: always()
48-
uses: actions/upload-artifact@v3
49+
uses: actions/upload-artifact@v4
4950
with:
5051
name: pr-ddg-debug
5152
path: pr-ddg-debug.apk

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,49 +24,51 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
submodules: recursive
3030

3131
- name: Set up JDK 17
32-
uses: actions/setup-java@v3
32+
uses: actions/setup-java@v4
3333
with:
3434
java-version: '17'
3535
distribution: 'adopt'
3636

37+
- name: Setup Gradle
38+
uses: gradle/actions/setup-gradle@v3
39+
3740
- name: Run Code Formatting Checks
38-
uses: gradle/gradle-build-action@v2
39-
with:
40-
arguments: code_format_checks
41+
run: ./gradlew code_format_checks
4142

4243
unit_tests:
4344
name: Unit tests
4445
runs-on: android-large-runner
4546

4647
steps:
4748
- name: Checkout repository
48-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
4950
with:
5051
submodules: recursive
5152

5253
- name: Set up JDK 17
53-
uses: actions/setup-java@v3
54+
uses: actions/setup-java@v4
5455
with:
5556
java-version: '17'
5657
distribution: 'adopt'
5758

59+
- name: Setup Gradle
60+
uses: gradle/actions/setup-gradle@v3
61+
5862
- name: JVM tests
59-
uses: gradle/gradle-build-action@v2
60-
with:
61-
arguments: jvm_tests
63+
run: ./gradlew jvm_tests
6264

6365
- name: Bundle the JVM checks report
6466
if: always()
6567
run: find . -type d -name 'reports' | zip -@ -r unit-tests-report.zip
6668

6769
- name: Upload the JVM checks report
6870
if: always()
69-
uses: actions/upload-artifact@v3
71+
uses: actions/upload-artifact@v4
7072
with:
7173
name: unit-tests-report
7274
path: unit-tests-report.zip
@@ -77,33 +79,34 @@ jobs:
7779

7880
steps:
7981
- name: Checkout repository
80-
uses: actions/checkout@v3
82+
uses: actions/checkout@v4
8183
with:
8284
submodules: recursive
8385

8486
- name: Set up JDK 17
85-
uses: actions/setup-java@v3
87+
uses: actions/setup-java@v4
8688
with:
8789
java-version: '17'
8890
distribution: 'adopt'
8991

9092
- name: Set up Go
91-
uses: actions/setup-go@v2
93+
uses: actions/setup-go@v5
9294
with:
9395
go-version: '1.18.3'
9496

97+
- name: Setup Gradle
98+
uses: gradle/actions/setup-gradle@v3
99+
95100
- name: Lint
96-
uses: gradle/gradle-build-action@v2
97-
with:
98-
arguments: lint
101+
run: ./gradlew lint
99102

100103
- name: Bundle the lint report
101104
if: always()
102105
run: find . -name lint-results\* | zip -@ -r lint-report.zip
103106

104107
- name: Upload the JVM lint report
105108
if: always()
106-
uses: actions/upload-artifact@v3
109+
uses: actions/upload-artifact@v4
107110
with:
108111
name: lint-report
109112
path: lint-report.zip
@@ -114,7 +117,7 @@ jobs:
114117

115118
steps:
116119
- name: Checkout repository
117-
uses: actions/checkout@v3
120+
uses: actions/checkout@v4
118121
with:
119122
submodules: recursive
120123

@@ -124,13 +127,13 @@ jobs:
124127
force: true
125128

126129
- name: Set up JDK 17
127-
uses: actions/setup-java@v3
130+
uses: actions/setup-java@v4
128131
with:
129132
java-version: '17'
130133
distribution: 'adopt'
131134

132135
- name: Set up Go
133-
uses: actions/setup-go@v2
136+
uses: actions/setup-go@v5
134137
with:
135138
go-version: '1.18.3'
136139

@@ -139,15 +142,14 @@ jobs:
139142
FLANK: ${{ secrets.FLANK }}
140143
run: echo $FLANK > flank.json
141144

145+
- name: Setup Gradle
146+
uses: gradle/actions/setup-gradle@v3
147+
142148
- name: Build
143-
uses: gradle/gradle-build-action@v2
144-
with:
145-
arguments: androidTestsBuild
149+
run: ./gradlew androidTestsBuild
146150

147151
- name: Run Android Tests
148-
uses: gradle/gradle-build-action@v2
149-
with:
150-
arguments: runFlankAndroidTests
152+
run: ./gradlew runFlankAndroidTests
151153

152154
- name: Bundle the Android CI tests report
153155
if: always()
@@ -164,7 +166,7 @@ jobs:
164166
165167
- name: Upload the Android CI tests report
166168
if: always()
167-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
168170
with:
169171
name: android-tests-report
170172
path: android-tests-report.zip

‎.github/workflows/custom-tabs-nightly.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '17'
2727
distribution: 'adopt'
@@ -44,10 +44,11 @@ jobs:
4444
fileName: android
4545
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
4646

47+
- name: Setup Gradle
48+
uses: gradle/actions/setup-gradle@v3
49+
4750
- name: Assemble internal release APK
48-
uses: gradle/gradle-build-action@v2
49-
with:
50-
arguments: assembleInternalRelease -Pforce-default-variant -x lint
51+
run: ./gradlew assembleInternalRelease -Pforce-default-variant -x lint
5152

5253
- name: Move APK to new folder
5354
if: always()

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
submodules: recursive
3333

3434
- name: Set up JDK 17
35-
uses: actions/setup-java@v3
35+
uses: actions/setup-java@v4
3636
with:
3737
java-version: '17'
3838
distribution: 'adopt'
3939

4040
- name: Setup Gradle
41-
uses: gradle/gradle-build-action@v2
41+
uses: gradle/actions/setup-gradle@v3
4242

4343
- name: Execute Gradle build
4444
run: ./gradlew dokkaHtmlMultiModule

‎.github/workflows/e2e-nightly-autofill.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '17'
2727
distribution: 'adopt'
@@ -44,10 +44,11 @@ jobs:
4444
fileName: android
4545
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
4646

47+
- name: Setup Gradle
48+
uses: gradle/actions/setup-gradle@v3
49+
4750
- name: Assemble APK which does not require auth to use Autofill
48-
uses: gradle/gradle-build-action@v2
49-
with:
50-
arguments: assemblePlayRelease -Pautofill-disable-auth-requirement -Pforce-default-variant -x lint
51+
run: ./gradlew assemblePlayRelease -Pautofill-disable-auth-requirement -Pforce-default-variant -x lint
5152

5253
- name: Move APK to new folder
5354
if: always()

‎.github/workflows/end-to-end.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '17'
2727
distribution: 'adopt'
@@ -44,10 +44,11 @@ jobs:
4444
fileName: android
4545
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
4646

47+
- name: Setup Gradle
48+
uses: gradle/actions/setup-gradle@v3
49+
4750
- name: Assemble release APK
48-
uses: gradle/gradle-build-action@v2
49-
with:
50-
arguments: assemblePlayRelease -Pforce-default-variant
51+
run: ./gradlew assemblePlayRelease -Pforce-default-variant
5152

5253
- name: Move APK to new folder
5354
if: always()

0 commit comments

Comments
 (0)