Revert "Revert "Update to Kotlin 1.8.10 (#3137)" (#3234)"

This reverts commit a5127e0.
duckduckgo · Jun 15, 2023 · 021ebbe · 021ebbe
1 parent 8b02e80
commit 021ebbe
Show file tree

Hide file tree

Showing 48 changed files with 173 additions and 113 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/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/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/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 {

diff --git a/...iler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt b/...iler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt
@@ -866,7 +866,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
         return argumentAt("toggleStore", 5)?.value()
     }
 
-    private fun ClassReference.declaredFunctions(): List<FunctionReference> {
+    private fun ClassReference.declaredFunctions(): List<MemberFunctionReference> {
         return functions
             .filter { it.name != "equals" }
             .filter { it.name != "hashCode" }

diff --git a/app-build-config/app-build-config-api/build.gradle b/app-build-config/app-build-config-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/app-tracking-protection/vpn-impl/src/main/res/values-fr/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-fr/strings-vpn.xml
@@ -16,7 +16,7 @@
   -->
 <!-- smartling.entity_escaping = false -->
 <!-- smartling.instruction_attributes = instruction -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="atp_name">Protection contre le suivi des applications</string>
     <string name="refresh">Actualiser</string>
 
@@ -211,11 +211,11 @@
     <string name="atp_ActivityPastWeekAcross">Dans</string>
 
     <plurals name="atp_ActivityPastWeekTrackerCount">
-        <item quantity="one">Tentative de suivi</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Tentative de suivi</item>
         <item quantity="other">Tentatives de suivi</item>
     </plurals>
     <plurals name="atp_ActivityPastWeekAppCount">
-        <item quantity="one">Application</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Application</item>
         <item quantity="other">Applications</item>
     </plurals>
     <string name="atp_ActivityEnabledLabel">Cette fonctionnalité est disponible en version bêta. Vous rencontrez un problème lié à une application ? <annotation type="app_settings_link">Veuillez le signaler.</annotation></string>

diff --git a/app-tracking-protection/vpn-impl/src/main/res/values-hr/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-hr/strings-vpn.xml
@@ -16,7 +16,7 @@
   -->
 <!-- smartling.entity_escaping = false -->
 <!-- smartling.instruction_attributes = instruction -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="atp_name">Zaštita od praćenja aplikacija</string>
     <string name="refresh">Osvježi</string>
 
@@ -219,13 +219,13 @@
     <string name="atp_ActivityPastWeekAcross">U</string>
 
     <plurals name="atp_ActivityPastWeekTrackerCount">
-        <item quantity="one">pokušaj praćenja</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">pokušaj praćenja</item>
         <item quantity="few">pokušaja praćenja</item>
         <item quantity="many">pokušaja praćenja</item>
         <item quantity="other">pokušaja praćenja</item>
     </plurals>
     <plurals name="atp_ActivityPastWeekAppCount">
-        <item quantity="one">aplikacija</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">aplikacija</item>
         <item quantity="few">aplikacije</item>
         <item quantity="many">aplikacija</item>
         <item quantity="other">aplikacije</item>

diff --git a/app-tracking-protection/vpn-impl/src/main/res/values-lt/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-lt/strings-vpn.xml
@@ -16,7 +16,7 @@
   -->
 <!-- smartling.entity_escaping = false -->
 <!-- smartling.instruction_attributes = instruction -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="atp_name">Programų sekimo apsauga</string>
     <string name="refresh">Atnaujinti</string>
 
@@ -219,13 +219,13 @@
     <string name="atp_ActivityPastWeekAcross">Per</string>
 
     <plurals name="atp_ActivityPastWeekTrackerCount">
-        <item quantity="one">Bandymas sekti</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Bandymas sekti</item>
         <item quantity="few">Bandymai sekti</item>
         <item quantity="many">Bandymų sekti</item>
         <item quantity="other">Bandymų sekti</item>
     </plurals>
     <plurals name="atp_ActivityPastWeekAppCount">
-        <item quantity="one">Programa</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Programa</item>
         <item quantity="few">Programos</item>
         <item quantity="many">Programų</item>
         <item quantity="other">Programų</item>

diff --git a/app-tracking-protection/vpn-impl/src/main/res/values-lv/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-lv/strings-vpn.xml
@@ -16,7 +16,7 @@
   -->
 <!-- smartling.entity_escaping = false -->
 <!-- smartling.instruction_attributes = instruction -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="atp_name">Lietotņu pretizsekošanas aizsardzība</string>
     <string name="refresh">Atsvaidzināt</string>
 
@@ -215,13 +215,13 @@
     <string name="atp_ActivityPastWeekAcross">Lietotņu skaits</string>
 
     <plurals name="atp_ActivityPastWeekTrackerCount">
-        <item quantity="zero">izsekošanas mēģinājumu</item>
-        <item quantity="one">izsekošanas mēģinājums</item>
+        <item quantity="zero" tools:ignore="ImpliedQuantity">izsekošanas mēģinājumu</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">izsekošanas mēģinājums</item>
         <item quantity="other">izsekošanas mēģinājumi</item>
     </plurals>
     <plurals name="atp_ActivityPastWeekAppCount">
-        <item quantity="zero">lietotnes</item>
-        <item quantity="one">lietotne</item>
+        <item quantity="zero" tools:ignore="ImpliedQuantity">lietotnes</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">lietotne</item>
         <item quantity="other">lietotnes</item>
     </plurals>
     <string name="atp_ActivityEnabledLabel">Šī funkcija ir beta versijā. Pamanīji problēmu ar kādu lietotni? <annotation type="app_settings_link">Lūdzu, ziņo par to.</annotation></string>