From 6d4644db8bed024d0f4d4cfb7cc8d1dcef3789fe Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 6 May 2023 10:52:37 -0700 Subject: [PATCH] Release 3.14. --- app/build.gradle | 27 +- app/src/main/assets/de/about_changelog.html | 14 + app/src/main/assets/en/about_changelog.html | 13 + app/src/main/assets/es/about_changelog.html | 14 + app/src/main/assets/es/about_licenses.html | 6 +- app/src/main/assets/es/guide_requests.html | 72 +- app/src/main/assets/filterlists/easylist.txt | 16462 ++++++---- .../main/assets/filterlists/easyprivacy.txt | 26337 +++++++++------- .../assets/filterlists/fanboy-annoyance.txt | 15236 ++------- .../main/assets/filterlists/fanboy-social.txt | 5217 +-- app/src/main/assets/fr/about_changelog.html | 16 +- app/src/main/assets/fr/about_licenses.html | 6 +- app/src/main/assets/fr/guide_requests.html | 72 +- app/src/main/assets/it/about_changelog.html | 15 + .../main/assets/pt-rBR/about_changelog.html | 30 +- app/src/main/assets/ru/about_changelog.html | 13 + app/src/main/assets/ru/about_licenses.html | 4 +- app/src/main/assets/ru/guide_requests.html | 70 +- app/src/main/assets/tr/about_changelog.html | 13 + .../main/assets/zh-rCN/about_changelog.html | 14 + app/src/main/res/values-es/strings.xml | 32 + app/src/main/res/values-fr/strings.xml | 32 + app/src/main/res/values-ru/strings.xml | 32 + app/src/main/res/values/strings.xml | 16 +- build.gradle | 4 +- .../phoneScreenshots/03-OptionsMenu-de.png | Bin 0 -> 125346 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 123132 -> 0 bytes .../07-10-InchTabletDomains-de.png | Bin 0 -> 283284 bytes .../07-10-InchTabletDomains.png | Bin 186351 -> 0 bytes .../metadata/android/en-US/changelogs/69.txt | 7 + .../phoneScreenshots/03-Options Menu-en.png | Bin 0 -> 159231 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 148867 -> 0 bytes .../07-10-InchTabletDomains-en.png | Bin 0 -> 258049 bytes .../07-10-InchTabletDomains.png | Bin 180051 -> 0 bytes .../metadata/android/es-ES/changelogs/69.txt | 8 + .../phoneScreenshots/03-OptionsMenu-es.png | Bin 0 -> 145267 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 138550 -> 0 bytes .../07-10-InchTabletDomains-es.png | Bin 0 -> 283405 bytes .../07-10-InchTabletDomains.png | Bin 184488 -> 0 bytes .../metadata/android/fr-FR/changelogs/67.txt | 2 +- .../phoneScreenshots/03-OptionsMenu-fr.png | Bin 0 -> 156280 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 140886 -> 0 bytes .../07-10-InchTabletDomains-fr.png | Bin 0 -> 268817 bytes .../07-10-InchTabletDomains.png | Bin 183239 -> 0 bytes .../metadata/android/it-IT/changelogs/69.txt | 8 + .../phoneScreenshots/03-OptionsMenu-it.png | Bin 0 -> 160119 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 149007 -> 0 bytes .../07-10-InchTabletDomains-it.png | Bin 0 -> 264085 bytes .../07-10-InchTabletDomains.png | Bin 176199 -> 0 bytes .../03-OptionsMenu-pt-rBR.png | Bin 0 -> 128981 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 127310 -> 0 bytes .../07-10-InchTabletDomains-pt-rBR.png | Bin 0 -> 277565 bytes .../07-10-InchTabletDomains.png | Bin 184991 -> 0 bytes .../phoneScreenshots/03-OptionsMenu-ru.png | Bin 0 -> 129635 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 127455 -> 0 bytes .../07-10-InchTabletDomains-ru.png | Bin 0 -> 282524 bytes .../07-10-InchTabletDomains.png | Bin 189371 -> 0 bytes .../phoneScreenshots/03-OptionsMenu-tr.png | Bin 0 -> 154468 bytes .../phoneScreenshots/03-OptionsMenu.png | Bin 142280 -> 0 bytes .../07-10-InchTabletDomains-tr.png | Bin 0 -> 266093 bytes .../07-10-InchTabletDomains.png | Bin 175835 -> 0 bytes .../03-OptionsMenu-zh-rCN.png | Bin 160119 -> 158756 bytes .../07-10-InchTabletDomains-zh-rCN.png | Bin 0 -> 250677 bytes .../images/phoneScreenshots/07-Domains.png | Bin 178737 -> 0 bytes gradle.properties | 6 +- gradle/wrapper/gradle-wrapper.properties | 19 +- 66 files changed, 29816 insertions(+), 34001 deletions(-) create mode 100644 fastlane/metadata/android/de-DE/images/phoneScreenshots/03-OptionsMenu-de.png delete mode 100644 fastlane/metadata/android/de-DE/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/de-DE/images/phoneScreenshots/07-10-InchTabletDomains-de.png delete mode 100644 fastlane/metadata/android/de-DE/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/en-US/changelogs/69.txt create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/03-Options Menu-en.png delete mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/07-10-InchTabletDomains-en.png delete mode 100644 fastlane/metadata/android/en-US/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/es-ES/changelogs/69.txt create mode 100644 fastlane/metadata/android/es-ES/images/phoneScreenshots/03-OptionsMenu-es.png delete mode 100644 fastlane/metadata/android/es-ES/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/es-ES/images/phoneScreenshots/07-10-InchTabletDomains-es.png delete mode 100644 fastlane/metadata/android/es-ES/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/fr-FR/images/phoneScreenshots/03-OptionsMenu-fr.png delete mode 100644 fastlane/metadata/android/fr-FR/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/fr-FR/images/phoneScreenshots/07-10-InchTabletDomains-fr.png delete mode 100644 fastlane/metadata/android/fr-FR/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/it-IT/changelogs/69.txt create mode 100644 fastlane/metadata/android/it-IT/images/phoneScreenshots/03-OptionsMenu-it.png delete mode 100644 fastlane/metadata/android/it-IT/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/it-IT/images/phoneScreenshots/07-10-InchTabletDomains-it.png delete mode 100644 fastlane/metadata/android/it-IT/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/pt-BR/images/phoneScreenshots/03-OptionsMenu-pt-rBR.png delete mode 100644 fastlane/metadata/android/pt-BR/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/pt-BR/images/phoneScreenshots/07-10-InchTabletDomains-pt-rBR.png delete mode 100644 fastlane/metadata/android/pt-BR/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/ru-RU/images/phoneScreenshots/03-OptionsMenu-ru.png delete mode 100644 fastlane/metadata/android/ru-RU/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/ru-RU/images/phoneScreenshots/07-10-InchTabletDomains-ru.png delete mode 100644 fastlane/metadata/android/ru-RU/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/tr-TR/images/phoneScreenshots/03-OptionsMenu-tr.png delete mode 100644 fastlane/metadata/android/tr-TR/images/phoneScreenshots/03-OptionsMenu.png create mode 100644 fastlane/metadata/android/tr-TR/images/phoneScreenshots/07-10-InchTabletDomains-tr.png delete mode 100644 fastlane/metadata/android/tr-TR/images/phoneScreenshots/07-10-InchTabletDomains.png create mode 100644 fastlane/metadata/android/zh-CN/images/phoneScreenshots/07-10-InchTabletDomains-zh-rCN.png delete mode 100644 fastlane/metadata/android/zh-CN/images/phoneScreenshots/07-Domains.png diff --git a/app/build.gradle b/app/build.gradle index 98276cb4..6d9a6d9e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,20 @@ android { defaultConfig { minSdk 24 targetSdk 33 - versionCode 68 - versionName "3.13.4" - resConfigs 'en', 'de', 'es', 'fr', 'it', 'pt-rBR', 'ru', 'tr', 'zh-rCN' + versionCode 69 + versionName "3.14" + resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'pt-rBR', 'ru', 'tr', 'zh-rCN'] + } + + // Specify the compile Java version. This must match the Kotlin JVM target. For some reason the system was not setting this correctly. These can probably be removed in the future. + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + // Specify the Kotlin JVM target. This must match the compile Java version. For some reason the system was not setting this correctly. These can probably be removed in the future. + kotlinOptions { + jvmTarget = 17 } buildTypes { @@ -72,16 +83,16 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.drawerlayout:drawerlayout:1.1.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0' + implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.drawerlayout:drawerlayout:1.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' - implementation 'androidx.webkit:webkit:1.6.0' + implementation 'androidx.webkit:webkit:1.6.1' // Include the Kotlin standard library. This should be the same version number listed in project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10' // Include the Google material library. implementation 'com.google.android.material:material:1.8.0' diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 5ee5088d..2dca8164 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,6 +33,20 @@ +

3.14 (Version Code 69)

+

6. Mai 2023 - Mindest-API 24, Ziel-API 33

+ +

3.13.4 (Version Code 68)

27. März 2023 - Mindest-API 24, Ziel-API 33