Build updates

Chainfire · Chainfire · commit acdaf6b7ca13 · 2022-02-05T12:33:09.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,18 +1,15 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+#Sat Feb 05 12:08:52 CET 2022
+#android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 09 13:15:43 CET 2018
+#Sat Feb 05 12:08:34 CET 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/librootjava/build.gradle b/librootjava/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     defaultConfig {
         minSdkVersion 21 /* was 14 pre-Binder/AIDL */
         targetSdkVersion 26
diff --git a/librootjava/src/main/java/eu/chainfire/librootjava/Logger.java b/librootjava/src/main/java/eu/chainfire/librootjava/Logger.java
@@ -23,7 +23,7 @@
 @SuppressWarnings({"unused", "WeakerAccess"})
 public class Logger {
     private static String getDefaultLogTag(){
-        String tag = BuildConfig.APPLICATION_ID;
+        String tag = BuildConfig.LIBRARY_PACKAGE_NAME;
         int p;
         while ((p = tag.indexOf('.')) >= 0) {
             tag = tag.substring(p + 1);
diff --git a/librootjava_example/build.gradle b/librootjava_example/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "eu.chainfire.librootjava_example"
@@ -15,7 +15,6 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/librootjavadaemon/build.gradle b/librootjavadaemon/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 26
diff --git a/librootjavadaemon_example/build.gradle b/librootjavadaemon_example/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "eu.chainfire.librootjavadaemon_example"
@@ -15,7 +15,6 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`7`	`+ classpath 'com.android.tools.build:gradle:4.1.3'`
`8`	`8`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'`
`2`	`2`
`3`	`3`	`android {`
`4`	`4`	`compileSdkVersion 26`
`5`		`- buildToolsVersion '28.0.3'`
	`5`	`+ buildToolsVersion '30.0.3'`
`6`	`6`
`7`	`7`	`defaultConfig {`
`8`	`8`	`applicationId "eu.chainfire.librootjava_example"`
`@@ -15,7 +15,6 @@ android {`
`15`	`15`	`buildTypes {`
`16`	`16`	`release {`
`17`	`17`	`minifyEnabled true`
`18`		`- useProguard true`
`19`	`18`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`20`	`19`	`}`
`21`	`20`	`}`