From cabc84a43df2a418f7a9e82fd04fa2bebc7f6826 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Tue, 17 Oct 2023 14:44:49 -0700 Subject: [PATCH] Bump target API to 34. https://redmine.stoutner.com/issues/1104 --- app/build.gradle | 29 +++++++++++++------ app/src/main/AndroidManifest.xml | 12 ++++++-- app/src/main/assets/de/permissions.html | 6 +++- app/src/main/assets/en/permissions.html | 6 +++- app/src/main/assets/es/permissions.html | 6 +++- app/src/main/assets/fr/permissions.html | 6 +++- app/src/main/assets/it/permissions.html | 6 +++- app/src/main/assets/ru/permissions.html | 6 +++- .../privacycell/fragments/SettingsFragment.kt | 6 ++-- .../privacycell/helpers/ProtocolHelper.kt | 5 ++-- .../receivers/OnBootCompletedReceiver.kt | 4 +-- .../workers/RegisterRealtimeListenerWorker.kt | 4 +-- .../workers/RestartServiceWorker.kt | 4 +-- build.gradle | 6 ++-- gradle.properties | 15 +++++++++- gradle/wrapper/gradle-wrapper.properties | 19 +++++++++++- 16 files changed, 107 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 39d64f4..ccdfa9a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,15 +23,26 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.stoutner.privacycell" minSdk 30 - targetSdk 33 + targetSdk 34 versionCode 11 versionName "1.9" - resConfigs "en", "de", "es", "fr", "it", "ru" + resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'ru'] + } + + // 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 { @@ -53,16 +64,16 @@ android { dependencies { // Include the following AndroidX libraries. implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0' - implementation 'androidx.preference:preference-ktx:1.2.0' + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' + implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.webkit:webkit:1.6.0' + implementation 'androidx.webkit:webkit:1.8.0' implementation 'androidx.work:work-runtime-ktx:2.8.1' // Include the Kotlin standard library. This should be the same version number listed in the project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22' // Include the Google material library. - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.10.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 528c4c3..a0b6238 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + @@ -93,7 +94,14 @@ android:screenOrientation="fullUser" /> - + + + + . + Copyright 2021,2023 Soren Stoutner . Translation 2021 Bernhard G. Keller. Copyright assigned to Soren Stoutner . @@ -39,6 +39,10 @@

android.permission.FOREGROUND_SERVICE

Erlaubt Privacy Cell, ein Benachrichtigungs-Icon für die Echtzeit-Überwachung in der Status-Zeile anzuzeigen.

+

android.permission.FOREGROUND_SERVICE_SPECIAL_USE

+

Specifies the type of foreground service. + Special Use is for services that don't fit into any of the standard categories.

+

Ausführung bei Systemstart

android.permission.RECEIVE_BOOT_COMPLETED

Erlaubt Privacy Cell die Echtzeit-Überwachung zu aktivieren, wenn das Smartphone gebootet wird.

diff --git a/app/src/main/assets/en/permissions.html b/app/src/main/assets/en/permissions.html index be792c7..5317604 100644 --- a/app/src/main/assets/en/permissions.html +++ b/app/src/main/assets/en/permissions.html @@ -1,5 +1,5 @@