Skip to content

Commit cf60b21

Browse files
joshliebejoshliebe
authored
Add https-upgrade module and update to Kotlin 1.8.10 (#3258)
1 parent 8de215a commit cf60b21

104 files changed

Lines changed: 1792 additions & 337 deletions

File tree

Some content is hidden

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
submodules: recursive
2222

23-
- name: Set up JDK 11
23+
- name: Set up JDK 17
2424
uses: actions/setup-java@v3
2525
with:
26-
java-version: '11'
26+
java-version: '17'
2727
distribution: 'adopt'
2828

2929
- name: Create folder

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
with:
2424
submodules: recursive
2525

26-
- name: Set up JDK 11
26+
- name: Set up JDK 17
2727
uses: actions/setup-java@v3
2828
with:
29-
java-version: '11'
29+
java-version: '17'
3030
distribution: 'adopt'
3131

3232
- name: Set up Go
@@ -48,4 +48,4 @@ jobs:
4848
uses: actions/upload-artifact@v3
4949
with:
5050
name: pr-ddg-debug
51-
path: pr-ddg-debug.apk
51+
path: pr-ddg-debug.apk

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
with:
2929
submodules: recursive
3030

31-
- name: Set up JDK 11
31+
- name: Set up JDK 17
3232
uses: actions/setup-java@v3
3333
with:
34-
java-version: '11'
34+
java-version: '17'
3535
distribution: 'adopt'
3636

3737
- name: Run Code Formatting Checks
@@ -49,10 +49,10 @@ jobs:
4949
with:
5050
submodules: recursive
5151

52-
- name: Set up JDK 11
52+
- name: Set up JDK 17
5353
uses: actions/setup-java@v3
5454
with:
55-
java-version: '11'
55+
java-version: '17'
5656
distribution: 'adopt'
5757

5858
- name: JVM tests
@@ -81,10 +81,10 @@ jobs:
8181
with:
8282
submodules: recursive
8383

84-
- name: Set up JDK 11
84+
- name: Set up JDK 17
8585
uses: actions/setup-java@v3
8686
with:
87-
java-version: '11'
87+
java-version: '17'
8888
distribution: 'adopt'
8989

9090
- name: Set up Go
@@ -123,10 +123,10 @@ jobs:
123123
with:
124124
force: true
125125

126-
- name: Set up JDK 11
126+
- name: Set up JDK 17
127127
uses: actions/setup-java@v3
128128
with:
129-
java-version: '11'
129+
java-version: '17'
130130
distribution: 'adopt'
131131

132132
- name: Set up Go

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
submodules: recursive
2222

23-
- name: Set up JDK 11
23+
- name: Set up JDK 17
2424
uses: actions/setup-java@v3
2525
with:
26-
java-version: '11'
26+
java-version: '17'
2727
distribution: 'adopt'
2828

2929
- name: Create folder

‎.github/workflows/external-css-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ jobs:
4040
working-directory: node_modules/@duckduckgo/content-scope-scripts
4141
run: npm run build
4242

43-
- name: Set up JDK 11
43+
- name: Set up JDK 17
4444
uses: actions/setup-java@v3
4545
with:
46-
java-version: '11'
46+
java-version: '17'
4747
distribution: 'adopt'
4848

4949
- name: Decode secret

‎.github/workflows/external-ref-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
- name: Copy files
3434
run: copy-files-from-to
3535

36-
- name: Set up JDK 11
36+
- name: Set up JDK 17
3737
uses: actions/setup-java@v3
3838
with:
39-
java-version: '11'
39+
java-version: '17'
4040
distribution: 'adopt'
4141

4242
- name: JVM tests
@@ -79,10 +79,10 @@ jobs:
7979
- name: Copy files
8080
run: copy-files-from-to
8181

82-
- name: Set up JDK 11
82+
- name: Set up JDK 17
8383
uses: actions/setup-java@v3
8484
with:
85-
java-version: '11'
85+
java-version: '17'
8686
distribution: 'adopt'
8787

8888
- name: Decode secret

‎.github/workflows/nightly.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
submodules: recursive
2222

23-
- name: Set up JDK 11
23+
- name: Set up JDK 17
2424
uses: actions/setup-java@v3
2525
with:
26-
java-version: '11'
26+
java-version: '17'
2727
distribution: 'adopt'
2828

2929
- name: Run Code Formatting Checks
@@ -41,10 +41,10 @@ jobs:
4141
with:
4242
submodules: recursive
4343

44-
- name: Set up JDK 11
44+
- name: Set up JDK 17
4545
uses: actions/setup-java@v3
4646
with:
47-
java-version: '11'
47+
java-version: '17'
4848
distribution: 'adopt'
4949

5050
- name: JVM tests
@@ -73,10 +73,10 @@ jobs:
7373
with:
7474
submodules: recursive
7575

76-
- name: Set up JDK 11
76+
- name: Set up JDK 17
7777
uses: actions/setup-java@v3
7878
with:
79-
java-version: '11'
79+
java-version: '17'
8080
distribution: 'adopt'
8181

8282
- name: Set up Go
@@ -115,10 +115,10 @@ jobs:
115115
with:
116116
force: true
117117

118-
- name: Set up JDK 11
118+
- name: Set up JDK 17
119119
uses: actions/setup-java@v3
120120
with:
121-
java-version: '11'
121+
java-version: '17'
122122
distribution: 'adopt'
123123

124124
- name: Set up Go

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
with:
2424
submodules: recursive
2525

26-
- name: Set up JDK 11
26+
- name: Set up JDK 17
2727
uses: actions/setup-java@v3
2828
with:
29-
java-version: '11'
29+
java-version: '17'
3030
distribution: 'adopt'
3131

3232
- name: Create folder

‎.github/workflows/privacy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
with:
2929
force: true
3030

31-
- name: Set up JDK 11
31+
- name: Set up JDK 17
3232
uses: actions/setup-java@v3
3333
with:
34-
java-version: '11'
34+
java-version: '17'
3535
distribution: 'adopt'
3636

3737
- name: Set up Go

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[submodule "app/src/main/cpp/third-party/bloom_cpp"]
2-
path = app/src/main/cpp/third-party/bloom_cpp
2+
path = httpsupgrade/httpsupgrade-impl/src/main/cpp/bloom_cpp
33
url = https://github.com/duckduckgo/bloom_cpp.git
44
[submodule "submodules/privacy-grade"]
55
path = submodules/privacy-grade

0 commit comments

Comments
 (0)