Merge branch 'agp_upgrade'

BimmerGestalt · Feb 22, 2024 · 4be76db · 4be76db
2 parents a27768f + 6e1263a
commit 4be76db
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,11 @@ jobs:
         with:
           fetch-depth: 0
           submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
 
       - name: Prepare cached external dependencies
         uses: actions/cache@v3

diff --git a/androbd_gestalt/AndrOBD-libplugin b/androbd_gestalt/AndrOBD-libplugin
diff --git a/androbd_gestalt/build.gradle b/androbd_gestalt/build.gradle
@@ -5,11 +5,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "io.bimmergestalt.idriveconnectaddons.androbd_gestalt"
+        compileSdk 33
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
@@ -46,6 +45,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'io.bimmergestalt.idriveconnectaddons.androbd_gestalt'
 }
 
 repositories {

diff --git a/androbd_gestalt/src/main/AndroidManifest.xml b/androbd_gestalt/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.bimmergestalt.idriveconnectaddons.androbd_gestalt">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="io.bimmergestalt.permission.CDS_normal" />
     <uses-permission android:name="io.bimmergestalt.permission.CDS_personal" />

diff --git a/bimmerscrobbler/build.gradle b/bimmerscrobbler/build.gradle
@@ -5,11 +5,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "io.bimmergestalt.idriveconnectaddons.bimmerscrobbler"
+        compileSdk 33
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
@@ -46,6 +45,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'io.bimmergestalt.idriveconnectaddons.bimmerscrobbler'
 }
 
 repositories {

diff --git a/bimmerscrobbler/src/main/AndroidManifest.xml b/bimmerscrobbler/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.bimmergestalt.idriveconnectaddons.bimmerscrobbler">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="io.bimmergestalt.permission.CDS_normal" />
     <application

diff --git a/...robbler/src/main/java/io/bimmergestalt/idriveconnectaddons/bimmerscrobbler/MainService.kt b/...robbler/src/main/java/io/bimmergestalt/idriveconnectaddons/bimmerscrobbler/MainService.kt
@@ -46,11 +46,11 @@ class MainService: Service() {
 }
 
 class MultimediaObserver(val announcer: ScrobbleAnnouncer): Observer<Map<String, Any>> {
-	override fun onChanged(t: Map<String, Any>?) {
-		val sourceId = t?.get("source") as? Int ?: 0
-		val artist = t?.get("artist") as? String ?: ""
-		val album = t?.get("album") as? String ?: ""
-		val title = t?.get("title") as? String ?: ""
+	override fun onChanged(t: Map<String, Any>) {
+		val sourceId = t["source"] as? Int ?: 0
+		val artist = t["artist"] as? String ?: ""
+		val album = t["album"] as? String ?: ""
+		val title = t["title"] as? String ?: ""
 		MainModel.source.value = if (sourceId > 0) sourceId.toString() else ""
 		MainModel.artist.value = artist
 		MainModel.album.value = album

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.32"
+    ext.kotlin_version = '1.9.0'
     ext.androidx_lifecycle_extensions_version = '2.2.0'
     ext.android_plugin_version = '2.3.0-alpha2'
 
@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/cds_details/build.gradle b/cds_details/build.gradle
@@ -5,11 +5,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "io.bimmergestalt.idriveconnectaddons.cdsdetails"
+        compileSdk 33
         minSdkVersion 23
         targetSdkVersion 30
         versionCode 1
@@ -46,6 +45,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'io.bimmergestalt.idriveconnectaddons.cdsdetails'
 }
 
 repositories {

diff --git a/cds_details/src/main/AndroidManifest.xml b/cds_details/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.bimmergestalt.idriveconnectaddons.cdsdetails">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="io.bimmergestalt.permission.CDS_normal" />
     <uses-permission android:name="io.bimmergestalt.permission.CDS_personal" />

diff --git a/cds_gauges/build.gradle b/cds_gauges/build.gradle
@@ -5,10 +5,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
 
     defaultConfig {
         applicationId "io.bimmergestalt.idriveconnectaddons.cdsgauge"
+        compileSdk 33
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
@@ -46,6 +46,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'io.bimmergestalt.idriveconnectaddons.cdsgauge'
 }
 
 repositories {

diff --git a/cds_gauges/src/main/AndroidManifest.xml b/cds_gauges/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.bimmergestalt.idriveconnectaddons.cdsgauge">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="io.bimmergestalt.permission.CDS_normal" />
     <!--

diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -5,13 +5,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'io.bimmergestalt.idriveconnectaddons.lib'
 }
 
 repositories {

diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.bimmergestalt.idriveconnectaddons.lib">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/screen_mirror/build.gradle b/screen_mirror/build.gradle
@@ -9,11 +9,10 @@ repositories {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "io.bimmergestalt.idriveconnectaddons.screenmirror"
+        compileSdk 33
         minSdkVersion 23
         targetSdkVersion 30
         versionCode 1
@@ -50,6 +49,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'io.bimmergestalt.idriveconnectaddons.screenmirror'
 }
 
 def RHMISources = [

diff --git a/screen_mirror/src/main/AndroidManifest.xml b/screen_mirror/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.bimmergestalt.idriveconnectaddons.screenmirror">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Connect to local etch port -->
     <uses-permission android:name="android.permission.INTERNET" />
+2 −2		.github/workflows/android.yml
+11 −0		.project
+7 −6		build.gradle
+9 −2		src/main/AndroidManifest.xml
+12 −0		src/main/java/com/fr3ts0n/androbd/plugin/PluginInfo.java
+137 −6		src/main/java/com/fr3ts0n/androbd/plugin/mgr/PluginHandler.java
+18 −0		src/main/java/com/fr3ts0n/androbd/plugin/mgr/PluginManager.java
+0 −2		src/main/res/layout/content_main.xml
+8 −0		src/main/res/values-es/strings.xml
+8 −0		src/main/res/values-hu/strings.xml
+8 −0		src/main/res/values-it/strings.xml
+7 −0		src/main/res/values-iw/strings.xml
+8 −0		src/main/res/values-ko/strings.xml
+2 −0		src/main/res/values-nl/strings.xml
+1 −1		src/main/res/values-pl/strings.xml
+7 −0		src/main/res/values-pt/strings.xml
+7 −0		src/main/res/values-sq/strings.xml
+8 −0		src/main/res/values-sv/strings.xml
+8 −0		src/main/res/values-zh-rCN/strings.xml
+0 −4		src/main/res/xml/backup_descriptor.xml