Merge branch 'release/5.225.0'

duckduckgo · Jan 28, 2025 · cee1b9c · cee1b9c
2 parents cffbbb0 + a8a96bd
commit cee1b9c
Show file tree

Hide file tree

Showing 377 changed files with 10,783 additions and 4,911 deletions.
diff --git a/.github/.java-version b/.github/.java-version
@@ -0,0 +1 @@
+17
diff --git a/.github/workflows/ads-end-to-end.yml b/.github/workflows/ads-end-to-end.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/build-ad-hoc.yml b/.github/workflows/build-ad-hoc.yml
@@ -6,6 +6,18 @@ on:
       ref:
         description: 'Ref to build APK from (branch, tag, commit)'
         required: true
+        default: 'develop'
+      build-variant:
+        description: 'Android build variant'
+        required: true
+        default: 'playRelease'
+        type: choice
+        options:
+          - fdroidRelease
+          - internalDebug
+          - internalRelease
+          - playDebug
+          - playRelease
 
 env:
   ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
@@ -23,12 +35,11 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.GT_DAXMOBILE }}
-          ref: ${{ github.event.inputs.ref }}
-
-      - name: Set up JDK 17
+          ref: ${{ github.event.inputs.app-version }}
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder
@@ -52,15 +63,15 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
 
-      - name: Assemble release APK
-        run: ./gradlew assemblePlayRelease -Pforce-default-variant
+      - name: Assemble APK
+        run: ./gradlew assemble${{github.event.inputs.build-variant}} -Pforce-default-variant
 
       - name: Move APK to new folder
-        run: find . -name "*.apk"  -exec mv '{}' apk/release.apk \;
+        run: find . -name "*.apk"  -exec mv '{}' apk/release${{github.event.inputs.build-variant}}.apk \;
 
       - name: Upload debug apk
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: release
-          path: apk/release.apk
+          path: apk/release${{github.event.inputs.build-variant}}.apk
diff --git a/.github/workflows/build-debug-apk.yaml b/.github/workflows/build-debug-apk.yaml
@@ -23,10 +23,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/build-fdroid-apk.yml b/.github/workflows/build-fdroid-apk.yml
@@ -27,10 +27,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: CI Checks
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -28,10 +29,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -50,10 +51,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -83,10 +84,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go
@@ -126,10 +127,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/custom-tabs-nightly.yml b/.github/workflows/custom-tabs-nightly.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -31,10 +31,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -52,9 +52,9 @@ jobs:
         uses: actions/configure-pages@v3
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'docs'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/e2e-nightly-autofill.yml b/.github/workflows/e2e-nightly-autofill.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/end-to-end-robintest.yml b/.github/workflows/end-to-end-robintest.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/external-css-tests.yml b/.github/workflows/external-css-tests.yml
@@ -40,10 +40,10 @@ jobs:
         working-directory: node_modules/@duckduckgo/content-scope-scripts
         run: npm run build
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Decode secret

diff --git a/.github/workflows/external-ref-tests.yml b/.github/workflows/external-ref-tests.yml
@@ -33,10 +33,10 @@ jobs:
       - name: Copy files
         run: copy-files-from-to
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -80,10 +80,10 @@ jobs:
       - name: Copy files
         run: copy-files-from-to
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Decode secret

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -42,10 +42,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Setup Gradle
@@ -75,10 +75,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go
@@ -118,10 +118,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/privacy-dashboard-end-to-end.yml b/.github/workflows/privacy-dashboard-end-to-end.yml
@@ -23,10 +23,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Create folder

diff --git a/.github/workflows/privacy.yml b/.github/workflows/privacy.yml
@@ -28,10 +28,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK version
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version-file: .github/.java-version
           distribution: 'adopt'
 
       - name: Set up Go