Update to latest gradle

fr3ts0n · Dec 15, 2023 · 152bca4 · 152bca4
1 parent beb0de2
commit 152bca4
Show file tree

Hide file tree

Showing 21 changed files with 215 additions and 179 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/CsvLogger/build.gradle b/CsvLogger/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
     defaultConfig {
         applicationId 'com.fr3ts0n.androbd.plugin.csv'
         minSdkVersion 16
@@ -10,7 +10,7 @@ android {
         versionName 'V1.1.1'
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "app_version", variant.versionName
     }
 
@@ -22,11 +22,12 @@ android {
 
     productFlavors {
     }
-
-
-    lintOptions {
+    namespace 'com.fr3ts0n.androbd.plugin.csv'
+    lint {
         abortOnError false
     }
+
+
 }
 
 dependencies {

diff --git a/CsvLogger/src/main/AndroidManifest.xml b/CsvLogger/src/main/AndroidManifest.xml
@@ -1,15 +1,11 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.fr3ts0n.androbd.plugin.csv" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:label="@string/app_name"
                  android:icon="@mipmap/ic_launcher"
                  android:roundIcon="@mipmap/ic_launcher_round"
                  android:allowBackup="true"
-                 android:fullBackupContent="@xml/backup_descriptor"
                  android:theme="@style/AppTheme.Dark" >
 
-        <activity android:name=".SettingsActivity" />
-
         <service
             android:name=".CsvDataLogger"
             android:exported="true">
@@ -33,5 +29,13 @@
             android:exported="false"
             android:grantUriPermissions="true">
         </provider>
+
+        <activity android:name="SettingsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
diff --git a/CsvLogger/src/main/java/com/fr3ts0n/androbd/plugin/csv/CsvDataLogger.java b/CsvLogger/src/main/java/com/fr3ts0n/androbd/plugin/csv/CsvDataLogger.java
@@ -199,7 +199,7 @@ private void showFinishedNotification(String name)
         Notification.Builder notificationBuilder = new Notification.Builder(this)
                 .setContentTitle(getText(R.string.lbl_notification_title))
                 .setContentText(getString(R.string.lbl_notification_finished))
-                .setSmallIcon(R.drawable.ic_coin)
+                .setSmallIcon(com.fr3ts0n.androbd.plugin.R.drawable.ic_coin)
                 .setPriority(Notification.PRIORITY_DEFAULT);
 
         PendingIntent pendingClickIntent = PendingIntent.getActivity(getApplicationContext(),

diff --git a/GpsProvider/build.gradle b/GpsProvider/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
     defaultConfig {
         applicationId 'com.fr3ts0n.androbd.plugin.gpsprovider'
         minSdkVersion 15
@@ -11,7 +11,7 @@ android {
         versionName 'V1.1.1'
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "app_version", variant.versionName
     }
 
@@ -22,12 +22,12 @@ android {
     }
 
 
-    lintOptions {
-        abortOnError false
-    }
-
     productFlavors {
     }
+    namespace 'com.fr3ts0n.androbd.plugin.gpsprovider'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/GpsProvider/src/main/AndroidManifest.xml b/GpsProvider/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="com.fr3ts0n.androbd.plugin.gpsprovider">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -13,7 +12,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:fullBackupContent="@xml/backup_descriptor"
         android:theme="@style/AppTheme.Dark">
 
         <receiver android:name="PluginReceiver"
@@ -29,8 +27,7 @@
                  android:exported="true"
                  android:enabled="true"/>
 
-        <activity android:name="SettingsActivity"
-            android:label="@string/app_name">
+        <activity android:name="SettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <action android:name="android.intent.action.VIEW"/>

diff --git a/GpsProvider/src/main/java/com/fr3ts0n/androbd/plugin/gpsprovider/SettingsActivity.java b/GpsProvider/src/main/java/com/fr3ts0n/androbd/plugin/gpsprovider/SettingsActivity.java
@@ -12,7 +12,7 @@ public class SettingsActivity extends PreferenceActivity
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.settings);
+        addPreferencesFromResource(com.fr3ts0n.androbd.plugin.R.xml.settings);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
         {
             requestPermissions(new String[]{ Manifest.permission.ACCESS_COARSE_LOCATION,

diff --git a/MqttPublisher/build.gradle b/MqttPublisher/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
     defaultConfig {
         applicationId 'com.fr3ts0n.androbd.plugin.mqtt'
         minSdkVersion 15
@@ -11,7 +11,7 @@ android {
         versionName 'V1.1.1'
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "app_version", variant.versionName
     }
 
@@ -22,12 +22,12 @@ android {
     }
 
 
-    lintOptions {
-        abortOnError false
-    }
-
     productFlavors {
     }
+    namespace 'com.fr3ts0n.androbd.plugin.mqtt'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/MqttPublisher/src/main/AndroidManifest.xml b/MqttPublisher/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="com.fr3ts0n.androbd.plugin.mqtt" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -9,7 +8,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:fullBackupContent="@xml/backup_descriptor"
         android:theme="@style/AppTheme.Dark">
 
         <receiver android:name="PluginReceiver"
@@ -26,8 +24,7 @@
             android:enabled="true"/>
 
         <activity
-            android:name="SettingsActivity"
-            android:label="@string/app_name">
+            android:name="SettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <action android:name="android.intent.action.VIEW"/>

diff --git a/PluginHost/build.gradle b/PluginHost/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.pluginhost"
         minSdkVersion 15
@@ -15,7 +15,7 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "app_version", variant.versionName
     }
 
@@ -27,6 +27,7 @@ android {
 
     productFlavors {
     }
+    namespace 'com.example.pluginhost'
 }
 
 dependencies {

diff --git a/PluginHost/src/main/AndroidManifest.xml b/PluginHost/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="com.example.pluginhost">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/SensorProvider/build.gradle b/SensorProvider/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
     defaultConfig {
         applicationId 'com.fr3ts0n.androbd.plugin.sensorprovider'
         minSdkVersion 15
@@ -10,7 +10,7 @@ android {
         versionName 'V1.1.1'
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.resValue "string", "app_version", variant.versionName
     }
 
@@ -21,12 +21,12 @@ android {
     }
 
 
-    lintOptions {
-        abortOnError false
-    }
-
     productFlavors {
     }
+    namespace 'com.fr3ts0n.androbd.plugin.sensorprovider'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/SensorProvider/src/main/AndroidManifest.xml b/SensorProvider/src/main/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.fr3ts0n.androbd.plugin.sensorprovider">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:fullBackupContent="@xml/backup_descriptor"
         android:theme="@style/AppTheme.Dark">
 
         <receiver android:name="PluginReceiver"
@@ -22,8 +20,7 @@
                  android:exported="true"
                  android:enabled="true"/>
 
-        <activity android:name="SettingsActivity"
-            android:label="@string/app_name">
+        <activity android:name="SettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <action android:name="android.intent.action.VIEW"/>

diff --git a/SensorProvider/src/main/java/com/fr3ts0n/androbd/plugin/sensorprovider/SettingsActivity.java b/SensorProvider/src/main/java/com/fr3ts0n/androbd/plugin/sensorprovider/SettingsActivity.java
@@ -10,6 +10,6 @@ public class SettingsActivity extends PreferenceActivity
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.settings);
+        addPreferencesFromResource(com.fr3ts0n.androbd.plugin.R.xml.settings);
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.2.0'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+android.nonFinalResIds=false
+android.nonTransitiveRClass=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Sep 16 18:42:24 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		android.nonFinalResIds=false
		android.nonTransitiveRClass=true