From 021ebbe08d3a18d178e375be59610743651be609 Mon Sep 17 00:00:00 2001 From: Josh Leibstein Date: Thu, 15 Jun 2023 11:29:19 +0100 Subject: [PATCH] Revert "Revert "Update to Kotlin 1.8.10 (#3137)" (#3234)" This reverts commit a5127e05f98b2b72939b7d88f508c77b0acad41d. --- .github/workflows/ads-end-to-end.yml | 4 ++-- .github/workflows/build-debug-apk.yaml | 6 +++--- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/end-to-end.yml | 4 ++-- .github/workflows/external-css-tests.yml | 4 ++-- .github/workflows/external-ref-tests.yml | 8 ++++---- .github/workflows/nightly.yml | 16 ++++++++-------- .../workflows/privacy-dashboard-end-to-end.yml | 4 ++-- .github/workflows/privacy.yml | 4 ++-- ad-click/ad-click-api/build.gradle | 8 ++++++-- anvil/anvil-annotations/build.gradle | 8 ++++++-- anvil/anvil-compiler/build.gradle | 8 ++++++-- .../ContributesRemoteFeatureCodeGenerator.kt | 2 +- .../app-build-config-api/build.gradle | 8 ++++++-- .../src/main/res/values-fr/strings-vpn.xml | 6 +++--- .../src/main/res/values-hr/strings-vpn.xml | 6 +++--- .../src/main/res/values-lt/strings-vpn.xml | 6 +++--- .../src/main/res/values-lv/strings-vpn.xml | 10 +++++----- .../src/main/res/values-pt/strings-vpn.xml | 6 +++--- .../src/main/res/values-ru/strings-vpn.xml | 6 +++--- .../src/main/res/values-sl/strings-vpn.xml | 10 +++++----- .../mobile/android/vpn/store/VpnDatabaseTest.kt | 2 +- app/build.gradle | 7 +++++-- .../duckduckgo/app/global/db/AppDatabaseTest.kt | 2 +- .../res/drawable/network_logo_comscore_inc.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-lv/strings.xml | 4 ++-- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 4 ++-- build.gradle | 14 +++++++------- .../main/res/drawable/ic_baseline_list_24.xml | 2 +- .../impl/PendingFileDownloadCompressTest.kt | 2 +- feature-toggles/feature-toggles-api/build.gradle | 8 ++++++-- .../fingerprint-protection-api/build.gradle | 8 ++++++-- gradle.properties | 2 ++ gradle/android-library.gradle | 7 +++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- lint-rules/build.gradle | 8 ++++++-- privacy-config/privacy-config-api/build.gradle | 8 ++++++-- .../remote-messaging-api/build.gradle | 8 ++++++-- saved-sites/saved-sites-api/build.gradle | 8 ++++++-- .../site-permissions-api/build.gradle | 8 ++++++-- versions.properties | 4 ++-- vpn-network/vpn-network-api/build.gradle | 8 ++++++-- windows/windows-api/build.gradle | 8 ++++++-- 48 files changed, 173 insertions(+), 113 deletions(-) diff --git a/.github/workflows/ads-end-to-end.yml b/.github/workflows/ads-end-to-end.yml index 431deb92f033..238bc3a8d196 100644 --- 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 index 9eead01e0cc8..0218dfa3323a 100644 --- 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 \ No newline at end of file + path: pr-ddg-debug.apk diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e8920dfe1c4..4f9b753f56fa 100644 --- 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 index c5958d5ea6fd..aa61bc0362d6 100644 --- 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 index 1d6ca640c8d2..f967097f70ed 100644 --- 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 index 3a3868514dbc..f64f3697dc90 100644 --- 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 index 45fbbbeb642d..c0333f545576 100644 --- 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 index c7d54700c6d1..35402780124c 100644 --- 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 index 60109ea92e0d..78e41a5dd0e5 100644 --- 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 index 547a793f5dda..7f6e3e3af7b2 100644 --- 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 index 7691cabfea35..7b93cd374b8d 100644 --- 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 index 41435f30d9af..5dd39f1d9f65 100644 --- 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/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt b/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt index 4f1a85b805dd..f9fcdb1e44f3 100644 --- a/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt +++ b/anvil/anvil-compiler/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 { + private fun ClassReference.declaredFunctions(): List { 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 index 87b4f6194104..1fbb5bf191d3 100644 --- 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 index 2987b402efcd..058b9fc68993 100644 --- 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 @@ --> - + Protection contre le suivi des applications Actualiser @@ -211,11 +211,11 @@ Dans - Tentative de suivi + Tentative de suivi Tentatives de suivi - Application + Application Applications Cette fonctionnalité est disponible en version bêta. Vous rencontrez un problème lié à une application ? Veuillez le signaler. 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 index 3c606344bf76..1957d88f8b7b 100644 --- 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 @@ --> - + Zaštita od praćenja aplikacija Osvježi @@ -219,13 +219,13 @@ U - pokušaj praćenja + pokušaj praćenja pokušaja praćenja pokušaja praćenja pokušaja praćenja - aplikacija + aplikacija aplikacije aplikacija aplikacije 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 index 142c4d1b6b64..6739d6e3b56d 100644 --- 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 @@ --> - + Programų sekimo apsauga Atnaujinti @@ -219,13 +219,13 @@ Per - Bandymas sekti + Bandymas sekti Bandymai sekti Bandymų sekti Bandymų sekti - Programa + Programa Programos Programų Programų 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 index 800bbb7d61b5..0829fc33379d 100644 --- 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 @@ --> - + Lietotņu pretizsekošanas aizsardzība Atsvaidzināt @@ -215,13 +215,13 @@ Lietotņu skaits - izsekošanas mēģinājumu - izsekošanas mēģinājums + izsekošanas mēģinājumu + izsekošanas mēģinājums izsekošanas mēģinājumi - lietotnes - lietotne + lietotnes + lietotne lietotnes Šī funkcija ir beta versijā. Pamanīji problēmu ar kādu lietotni? Lūdzu, ziņo par to. diff --git a/app-tracking-protection/vpn-impl/src/main/res/values-pt/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-pt/strings-vpn.xml index c52c98330b55..7e1db67d9c5f 100644 --- a/app-tracking-protection/vpn-impl/src/main/res/values-pt/strings-vpn.xml +++ b/app-tracking-protection/vpn-impl/src/main/res/values-pt/strings-vpn.xml @@ -16,7 +16,7 @@ --> - + Proteção contra o rastreamento por aplicações Atualizar @@ -211,11 +211,11 @@ Em - Tentativa de rastreamento + Tentativa de rastreamento Tentativas de rastreamento - Aplicação + Aplicação Aplicações Esta funcionalidade está em versão beta. Detetaste algum problema com uma aplicação? Comunica o problema. diff --git a/app-tracking-protection/vpn-impl/src/main/res/values-ru/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-ru/strings-vpn.xml index 273476282d33..043d352baaa3 100644 --- a/app-tracking-protection/vpn-impl/src/main/res/values-ru/strings-vpn.xml +++ b/app-tracking-protection/vpn-impl/src/main/res/values-ru/strings-vpn.xml @@ -16,7 +16,7 @@ --> - + Блокировка отслеживания приложениями Обновить @@ -219,13 +219,13 @@ в - попытка отслеживания + попытка отслеживания попытки отслеживания попыток отслеживания попытки отслеживания - приложении + приложении приложениях приложениях приложения diff --git a/app-tracking-protection/vpn-impl/src/main/res/values-sl/strings-vpn.xml b/app-tracking-protection/vpn-impl/src/main/res/values-sl/strings-vpn.xml index 73d526e49fb7..d0a9372746f4 100644 --- a/app-tracking-protection/vpn-impl/src/main/res/values-sl/strings-vpn.xml +++ b/app-tracking-protection/vpn-impl/src/main/res/values-sl/strings-vpn.xml @@ -16,7 +16,7 @@ --> - + Zaščita pred sledenjem aplikacij Osveži @@ -219,14 +219,14 @@ Na spletni strani - Poskus sledenja - Poskusa sledenja + Poskus sledenja + Poskusa sledenja Poskusi sledenja Poskusi sledenja - Aplikacija - Aplikaciji + Aplikacija + Aplikaciji Aplikacije Aplikacij diff --git a/app-tracking-protection/vpn-store/src/test/java/com/duckduckgo/mobile/android/vpn/store/VpnDatabaseTest.kt b/app-tracking-protection/vpn-store/src/test/java/com/duckduckgo/mobile/android/vpn/store/VpnDatabaseTest.kt index 9a9310ae8d5a..4aac4971161b 100644 --- a/app-tracking-protection/vpn-store/src/test/java/com/duckduckgo/mobile/android/vpn/store/VpnDatabaseTest.kt +++ b/app-tracking-protection/vpn-store/src/test/java/com/duckduckgo/mobile/android/vpn/store/VpnDatabaseTest.kt @@ -34,7 +34,7 @@ class VpnDatabaseTest { @get:Rule val testHelper = - MigrationTestHelper(InstrumentationRegistry.getInstrumentation(), VpnDatabase::class.qualifiedName, FrameworkSQLiteOpenHelperFactory()) + MigrationTestHelper(InstrumentationRegistry.getInstrumentation(), VpnDatabase::class.qualifiedName!!, FrameworkSQLiteOpenHelperFactory()) @Test fun whenTestingAllMigrationsThenSucceeds() { diff --git a/app/build.gradle b/app/build.gradle index e6b67ec0c54e..97e0e7a6bba1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,8 +58,11 @@ android { viewBinding = true } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) } signingConfigs { release diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt index 6afaf7ba13d7..2f9e878adfe6 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt @@ -50,7 +50,7 @@ class AppDatabaseTest { var instantTaskExecutorRule = InstantTaskExecutorRule() @get:Rule - val testHelper = MigrationTestHelper(getInstrumentation(), AppDatabase::class.qualifiedName, FrameworkSQLiteOpenHelperFactory()) + val testHelper = MigrationTestHelper(getInstrumentation(), AppDatabase::class.qualifiedName!!, FrameworkSQLiteOpenHelperFactory()) private val context = mock() private val mockSettingsDataStore: SettingsDataStore = mock() diff --git a/app/src/main/res/drawable/network_logo_comscore_inc.xml b/app/src/main/res/drawable/network_logo_comscore_inc.xml index ce0247a56ca2..d46262aac6e5 100644 --- a/app/src/main/res/drawable/network_logo_comscore_inc.xml +++ b/app/src/main/res/drawable/network_logo_comscore_inc.xml @@ -9,6 +9,6 @@ android:fillType="evenOdd"/> + android:fillColor="?attr/daxColorSurface" android:fillType="evenOdd"/> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 62fb29db8ac2..28cbbdf0ef2f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -432,7 +432,7 @@ %1$d autres essayaient de vous traquer ici.

Je les ai bloqués !

☝️Vous pouvez voir dans la barre d\'adresse URL qui essaie de vous traquer lorsque vous visitez un nouveau site.️]]> -
Je l\'ai bloqué !

☝️Vous pouvez voir dans la barre d\'adresse URL qui essaie de vous traquer lorsque vous visitez un nouveau site.️️]]> +
Je l\'ai bloqué !

☝️Vous pouvez voir dans la barre d\'adresse URL qui essaie de vous traquer lorsque vous visitez un nouveau site.️️]]>
Je les ai bloqués !

☝️Vous pouvez voir dans la barre d\'adresse URL qui essaie de vous traquer lorsque vous visitez un nouveau site.️️]]>
Continuez à naviguer en toute tranquillité !]]> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1674392d92ae..85ca4c6b0cc7 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -434,7 +434,7 @@ %1$d drugih pokušalo te ovdje pratiti.

Ja sam ih blokirao!

☝️Možeš pogledati na adresnu traku da vidiš tko te pokušava pratiti kad posjetiš novo web-mjesto.]]> -
Ja sam ih blokirao!

☝️Možeš pogledati na adresnu traku da vidiš tko te pokušava pratiti kad posjetiš novo web-mjesto.]]> +
Ja sam ih blokirao!

☝️Možeš pogledati na adresnu traku da vidiš tko te pokušava pratiti kad posjetiš novo web-mjesto.]]>
Ja sam ih blokirao!

☝️Možeš pogledati na adresnu traku da vidiš tko te pokušava pratiti kad posjetiš novo web-mjesto.]]>
Ja sam ih blokirao!

☝️Možeš pogledati na adresnu traku da vidiš tko te pokušava pratiti kad posjetiš novo web-mjesto.]]>
Ja sam ih blokirao!

☝️Možeš pogledati na adresnu traku da vidiš tko te pokušava pratiti kad posjetiš novo web-mjesto.]]> diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5c747f6cc9d1..1d56e365b53e 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -434,7 +434,7 @@ %1$d kitų bandė tave stebėti.

Užblokavau juos!

☝️Patikrink URL juostą ir pamatyk, kas bando tave stebėti, kai lankaisi naujoje svetainėje.️]]> -
Užblokavau!

☝️Patikrink URL juostą ir pamatyk, kas bando tave stebėti, kai lankaisi naujoje svetainėje.️]]> +
Užblokavau!

☝️Patikrink URL juostą ir pamatyk, kas bando tave stebėti, kai lankaisi naujoje svetainėje.️]]>
Užblokavau!

☝️Patikrink URL juostą ir pamatyk, kas bando tave stebėti, kai lankaisi naujoje svetainėje.️]]>
Užblokavau!

☝️Patikrink URL juostą ir pamatyk, kas bando tave stebėti, kai lankaisi naujoje svetainėje.️]]>
Užblokavau!

☝️Patikrink URL juostą ir pamatyk, kas bando tave stebėti, kai lankaisi naujoje svetainėje.️]]> diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 63d3b51157a0..30bea2961862 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -433,8 +433,8 @@ %1$d citas vietnes mēģināja tevi šeit izsekot.

Es tās nobloķēju!

☝️ Vari pārbaudīt adreses joslu, lai redzētu, kas tevi mēģina izsekot, kad tu apmeklē jaunu vietni.️]]> -
Es tās nobloķēju!

☝️ Vari pārbaudīt URL joslu, lai redzētu, kas tevi mēģina izsekot, kad tu apmeklē jaunu vietni.️]]> -
Es tās nobloķēju!

☝️ Vari pārbaudīt URL joslu, lai redzētu, kas tevi mēģina izsekot, kad tu apmeklē jaunu vietni.️]]> +
Es tās nobloķēju!

☝️ Vari pārbaudīt URL joslu, lai redzētu, kas tevi mēģina izsekot, kad tu apmeklē jaunu vietni.️]]> +
Es tās nobloķēju!

☝️ Vari pārbaudīt URL joslu, lai redzētu, kas tevi mēģina izsekot, kad tu apmeklē jaunu vietni.️]]>
Es tās nobloķēju!

☝️ Vari pārbaudīt URL joslu, lai redzētu, kas tevi mēģina izsekot, kad tu apmeklē jaunu vietni.️]]>
Aiziet! Turpini pārlūkot!]]> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e0aeb975cf32..61c7ca912e98 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -432,7 +432,7 @@ %1$doutros estavam a tentar rastreá-lo aqui.

Eu bloqueei-os!

☝️Pode verificar a barra de endereços para ver quem está a tentar rastreá-lo quando visita um novo site.]]> -
Eu bloqueei-os!

☝️Pode verificar a barra de endereços para ver quem está a tentar rastreá-lo quando visita um novo site.]]> +
Eu bloqueei-os!

☝️Pode verificar a barra de endereços para ver quem está a tentar rastreá-lo quando visita um novo site.]]>
Eu bloqueei-os!

☝️Pode verificar a barra de endereços para ver quem está a tentar rastreá-lo quando visita um novo site.]]>
Prossiga - continue a navegar!]]> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e72f099a4eb7..7ce4d5c71fad 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -434,7 +434,7 @@ еще %1$d сервиса пытались вести за вами слежку.

Но мы их заблокировали!

☝️ Заходя на новый сайт, вы всегда можете проверить, шпионит ли он за вами: просто загляните в адресную строку.]]> -
Но мы его заблокировали!

☝️ Заходя на новый сайт, вы всегда можете проверить, шпионит ли он за вами: просто загляните в адресную строку.]]> +
Но мы его заблокировали!

☝️ Заходя на новый сайт, вы всегда можете проверить, шпионит ли он за вами: просто загляните в адресную строку.]]>
Но мы их заблокировали!

☝️ Заходя на новый сайт, вы всегда можете проверить, шпионит ли он за вами: просто загляните в адресную строку.]]>
Но мы их заблокировали!

☝️ Заходя на новый сайт, вы всегда можете проверить, шпионит ли он за вами: просто загляните в адресную строку.]]>
Но мы их заблокировали!

☝️ Заходя на новый сайт, вы всегда можете проверить, шпионит ли он за вами: просто загляните в адресную строку.]]> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index dbe585510c8f..2f8895f70633 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -434,8 +434,8 @@ %1$d drugi so vas skušali zaslediti tukaj.

Blokiral sem jih!

☝️Preverite lahko naslovno vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.️]]> -
Blokiral sem ga!

☝️Preverite lahko URL vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.]]> -
Blokiral sem ga!

☝️Preverite lahko URL vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.]]> +
Blokiral sem ga!

☝️Preverite lahko URL vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.]]> +
Blokiral sem ga!

☝️Preverite lahko URL vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.]]>
Blokiral sem ga!

☝️Preverite lahko URL vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.]]>
Blokiral sem ga!

☝️Preverite lahko URL vrstico, da vidite, kdo vas poskuša zaslediti, ko obiščete novo spletišče.]]> diff --git a/build.gradle b/build.gradle index 1a1c2897c3da..60e6720b7094 100644 --- a/build.gradle +++ b/build.gradle @@ -3,16 +3,16 @@ buildscript { ext { - kotlin_version = '1.7.10' - spotless = "6.1.2" - anvil_version = "2.4.1" - gradle_plugin = "7.2.2" // When updating, also update lint_version - lint_version = "30.2.2" // This value must always be gradle_plugin + 23 + kotlin_version = '1.8.10' + spotless = '6.1.2' + anvil_version = '2.4.4' + gradle_plugin = '7.4.2' // When updating, also update lint_version + lint_version = '30.4.2' // This value must always be gradle_plugin + 23 min_sdk = 23 target_sdk = 33 compile_sdk = 33 - fladle_version = "0.17.4" - kotlinter_version = "3.12.0" + fladle_version = '0.17.4' + kotlinter_version = '3.12.0' } repositories { diff --git a/common-ui/src/main/res/drawable/ic_baseline_list_24.xml b/common-ui/src/main/res/drawable/ic_baseline_list_24.xml index dc7f9f9527ed..3ca9ad864095 100644 --- a/common-ui/src/main/res/drawable/ic_baseline_list_24.xml +++ b/common-ui/src/main/res/drawable/ic_baseline_list_24.xml @@ -19,7 +19,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorOnBackground"> + android:tint="?attr/colorOnBackground" android:autoMirrored="true">