From 1599906b557f7d6ef36950d63db87792437af8de Mon Sep 17 00:00:00 2001 From: Nicolas Ygrand Date: Wed, 18 May 2022 16:16:00 +0200 Subject: [PATCH 1/3] Bump to minimally supported Gradle by current Android Studio version --- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 6 +++--- logmatic/build.gradle | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c20bca1..ecd45f4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3b71451..932f54c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Nov 25 16:17:56 CET 2016 +#Wed May 18 16:11:02 CEST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/logmatic/build.gradle b/logmatic/build.gradle index 51998ef..abbc425 100644 --- a/logmatic/build.gradle +++ b/logmatic/build.gradle @@ -8,7 +8,6 @@ ext { android { compileSdkVersion 25 - buildToolsVersion "25.0.1" defaultConfig { minSdkVersion 16 From ebce64725026ee32d31929da619467557c043265 Mon Sep 17 00:00:00 2001 From: Nicolas Ygrand Date: Wed, 18 May 2022 16:27:56 +0200 Subject: [PATCH 2/3] Replace legacy libraries with AndroidX --- gradle.properties | 4 +++- logmatic/build.gradle | 8 ++++---- logmatic/src/main/java/io/logmatic/android/Logger.java | 6 +++--- .../src/main/java/io/logmatic/android/LoggerBuilder.java | 6 +++--- .../src/main/java/io/logmatic/android/LoggerRegistry.java | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1d3591c..8b00005 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # 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 \ No newline at end of file +# org.gradle.parallel=true +android.useAndroidX=true +android.enableJetifier=false diff --git a/logmatic/build.gradle b/logmatic/build.gradle index abbc425..0dd77ac 100644 --- a/logmatic/build.gradle +++ b/logmatic/build.gradle @@ -30,18 +30,18 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.google.code.gson:gson:2.7' - compile 'com.android.support:support-v13:25.0.1' + compile 'androidx.legacy:legacy-support-v13:1.0.0' testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.hamcrest:hamcrest-library:1.3' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + androidTestCompile 'androidx.test:runner:0.5' + androidTestCompile 'androidx.test:rules:0.5' androidTestCompile 'junit:junit:4.12' androidTestCompile 'org.mockito:mockito-core:1.10.19' androidTestCompile 'org.hamcrest:hamcrest-library:1.3' } -apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' \ No newline at end of file +apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' diff --git a/logmatic/src/main/java/io/logmatic/android/Logger.java b/logmatic/src/main/java/io/logmatic/android/Logger.java index 1345705..a57093a 100644 --- a/logmatic/src/main/java/io/logmatic/android/Logger.java +++ b/logmatic/src/main/java/io/logmatic/android/Logger.java @@ -1,9 +1,9 @@ package io.logmatic.android; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.ArrayMap; import android.util.Log; import com.google.gson.FieldNamingPolicy; diff --git a/logmatic/src/main/java/io/logmatic/android/LoggerBuilder.java b/logmatic/src/main/java/io/logmatic/android/LoggerBuilder.java index 234279e..9c81a1e 100644 --- a/logmatic/src/main/java/io/logmatic/android/LoggerBuilder.java +++ b/logmatic/src/main/java/io/logmatic/android/LoggerBuilder.java @@ -1,8 +1,8 @@ package io.logmatic.android; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.ArrayMap; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; diff --git a/logmatic/src/main/java/io/logmatic/android/LoggerRegistry.java b/logmatic/src/main/java/io/logmatic/android/LoggerRegistry.java index 088a7dc..4a32081 100644 --- a/logmatic/src/main/java/io/logmatic/android/LoggerRegistry.java +++ b/logmatic/src/main/java/io/logmatic/android/LoggerRegistry.java @@ -1,7 +1,7 @@ package io.logmatic.android; -import android.support.annotation.NonNull; -import android.support.v4.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.collection.ArrayMap; import android.util.Log; import java.util.Map; From 1377e7ec54573c69a69477283f8f4e0985344174 Mon Sep 17 00:00:00 2001 From: Nicolas Ygrand Date: Wed, 18 May 2022 16:30:19 +0200 Subject: [PATCH 3/3] Fix very legacy synthax --- logmatic/build.gradle | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/logmatic/build.gradle b/logmatic/build.gradle index 0dd77ac..6fd6e19 100644 --- a/logmatic/build.gradle +++ b/logmatic/build.gradle @@ -28,19 +28,19 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.google.code.gson:gson:2.7' - compile 'androidx.legacy:legacy-support-v13:1.0.0' - - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:1.10.19' - testCompile 'org.hamcrest:hamcrest-library:1.3' - - androidTestCompile 'androidx.test:runner:0.5' - androidTestCompile 'androidx.test:rules:0.5' - androidTestCompile 'junit:junit:4.12' - androidTestCompile 'org.mockito:mockito-core:1.10.19' - androidTestCompile 'org.hamcrest:hamcrest-library:1.3' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.google.code.gson:gson:2.7' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:1.10.19' + testImplementation 'org.hamcrest:hamcrest-library:1.3' + + androidTestImplementation 'androidx.test:runner:0.5' + androidTestImplementation 'androidx.test:rules:0.5' + androidTestImplementation 'junit:junit:4.12' + androidTestImplementation 'org.mockito:mockito-core:1.10.19' + androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' }