From bda8f92a8c47ee9275a34477348ccd6badeec025 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 13 Dec 2025 15:24:36 -0700 Subject: [PATCH] Update target API to 36. https://redmine.stoutner.com/issues/1284 --- app/build.gradle | 24 ++++----- app/src/main/assets/de/changelog.html | 4 +- app/src/main/assets/en/changelog.html | 4 +- app/src/main/assets/es/changelog.html | 4 +- app/src/main/assets/fr/changelog.html | 11 +++-- app/src/main/assets/fr/permissions.html | 10 ++-- app/src/main/assets/it/changelog.html | 4 +- app/src/main/assets/ru/changelog.html | 4 +- .../privacycell/dataclasses/Protocol.kt | 26 +++++----- .../privacycell/fragments/SettingsFragment.kt | 26 +++++----- .../privacycell/helpers/ProtocolHelper.kt | 28 ++++++----- .../receivers/OnBootCompletedReceiver.kt | 26 +++++----- .../services/RealtimeMonitoringService.kt | 49 +++++++++++-------- .../workers/RegisterRealtimeListenerWorker.kt | 26 +++++----- .../workers/RestartServiceWorker.kt | 26 +++++----- app/src/main/res/values-fr/strings.xml | 2 + build.gradle | 4 +- .../metadata/android/fr-FR/changelogs/13.txt | 4 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- 19 files changed, 151 insertions(+), 133 deletions(-) create mode 100644 fastlane/metadata/android/fr-FR/changelogs/13.txt diff --git a/app/build.gradle b/app/build.gradle index 25f3e64..9723d48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,12 +23,12 @@ plugins { } android { - compileSdk 35 + compileSdk = 36 defaultConfig { applicationId "com.stoutner.privacycell" minSdk 30 - targetSdk 35 + targetSdk 36 versionCode 13 versionName "1.11" resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'ru'] @@ -41,8 +41,8 @@ android { } // 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 + kotlin { + jvmToolchain(17) } buildTypes { @@ -63,17 +63,17 @@ android { dependencies { // Include the following AndroidX libraries. - implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.core:core-ktx:1.16.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.core:core-ktx:1.17.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.webkit:webkit:1.13.0' - implementation 'androidx.work:work-runtime-ktx:2.10.1' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0' + implementation 'androidx.webkit:webkit:1.14.0' + implementation 'androidx.work:work-runtime-ktx:2.11.0' // 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:2.1.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0' // Include the Google material library. - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.13.0' } diff --git a/app/src/main/assets/de/changelog.html b/app/src/main/assets/de/changelog.html index 9519db3..c6fb918 100644 --- a/app/src/main/assets/de/changelog.html +++ b/app/src/main/assets/de/changelog.html @@ -32,8 +32,8 @@ -

1.11 (Version Code 13)

-

29. April 2025 - Mindest-API 30, Ziel-API 35

+

1.11 (Version Code 13)

+

29. April 2025 - Mindest-API 30, Ziel-API 35