Merge branch 'release/5.165.0'

duckduckgo · Aug 3, 2023 · 23340ec · 23340ec
2 parents 3469af5 + 448489c
commit 23340ec
Show file tree

Hide file tree

Showing 794 changed files with 8,778 additions and 6,148 deletions.
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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Create folder

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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -48,4 +48,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: pr-ddg-debug
-          path: pr-ddg-debug.apk
+          path: pr-ddg-debug.apk
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,10 +28,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Run Code Formatting Checks
@@ -49,10 +49,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: JVM tests
@@ -81,10 +81,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -123,10 +123,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,60 @@
+name: Docs
+
+on:
+  push:
+    branches: ["develop"]
+
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Execute Gradle build
+        run: ./gradlew dokkaHtmlMultiModule
+
+      - name: Copy files
+        run: |
+          mkdir -p docs
+          mv build/dokka/htmlMultiModule/* docs
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: 'docs'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: JVM tests
@@ -79,10 +79,10 @@ jobs:
       - name: Copy files
         run: copy-files-from-to
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Run Code Formatting Checks
@@ -41,10 +41,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: JVM tests
@@ -73,10 +73,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -115,10 +115,10 @@ jobs:
         with:
           force: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go

diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "app/src/main/cpp/third-party/bloom_cpp"]
-	path = app/src/main/cpp/third-party/bloom_cpp
+	path = httpsupgrade/httpsupgrade-impl/src/main/cpp/bloom_cpp
 	url = https://github.com/duckduckgo/bloom_cpp.git
 [submodule "submodules/privacy-grade"]
 	path = submodules/privacy-grade

diff --git a/.maestro/release_tests/7_-_app_tp_onboarding.yaml b/.maestro/release_tests/7_-_app_tp_onboarding.yaml
@@ -14,9 +14,6 @@ appId: com.duckduckgo.mobile.android
 - tapOn:
     text: "Settings"
     index: 0
-- scroll
-- scroll
-- scroll
 - assertVisible: "Block app trackers on your device"
 - tapOn: "App Tracking Protection"
 - assertVisible: "One easy step for better app privacy!"

diff --git a/ad-click/ad-click-api/build.gradle b/ad-click/ad-click-api/build.gradle
@@ -22,8 +22,12 @@ plugins {
 apply from: "$rootProject.projectDir/code-formatting.gradle"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {

diff --git a/ad-click/ad-click-impl/build.gradle b/ad-click/ad-click-impl/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation project(path: ':anvil-annotations')
     implementation project(path: ':ad-click-api')
     implementation project(path: ':di')
-    implementation project(path: ':common')
+    implementation project(path: ':common-utils')
     implementation project(path: ':statistics')
     implementation project(path: ':privacy-config-api')
     implementation project(path: ':feature-toggles-api')

diff --git a/ad-click/ad-click-store/build.gradle b/ad-click/ad-click-store/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
 
 dependencies {
-    implementation project(path: ':common')
+    implementation project(path: ':common-utils')
     implementation project(path: ':ad-click-api')
     implementation Kotlin.stdlib.jdk7
     implementation AndroidX.core.ktx

diff --git a/anrs/anrs-impl/build.gradle b/anrs/anrs-impl/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation project(':app-build-config-api')
     implementation project(':anrs-api')
     implementation project(':anrs-store')
-    implementation project(':common')
+    implementation project(':common-utils')
     implementation project(':di')
     implementation project(':browser-api')
     implementation project(':statistics')

diff --git a/anrs/anrs-store/build.gradle b/anrs/anrs-store/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
 
 dependencies {
-    implementation project(path: ':common')
+    implementation project(path: ':common-utils')
 
     implementation Kotlin.stdlib.jdk7
     implementation AndroidX.core.ktx

diff --git a/anvil/anvil-annotations/build.gradle b/anvil/anvil-annotations/build.gradle
@@ -22,8 +22,12 @@ plugins {
 apply from: "$rootProject.projectDir/code-formatting.gradle"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {

diff --git a/anvil/anvil-compiler/build.gradle b/anvil/anvil-compiler/build.gradle
@@ -23,8 +23,12 @@ plugins {
 apply from: "$rootProject.projectDir/code-formatting.gradle"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {