From fce83f7f61c9548864f191e1ef7649bbd91e93bd Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 24 Aug 2021 01:12:18 +0530 Subject: [PATCH 1/2] Updated Gradle to 7+ Added AndroidX auto Migration --- app/build.gradle | 12 ++++++------ build.gradle | 13 ++++++++++--- gradle/wrapper/gradle-wrapper.properties | 6 +++--- library/build.gradle | 8 ++++---- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7a9ff61..e1ac6cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.0" + compileSdkVersion 30 + buildToolsVersion "29.0.3" defaultConfig { applicationId "com.flask.colorpicker.sample" minSdkVersion 14 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 10 versionName "1.0.10" @@ -33,7 +33,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(":library") - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'com.google.android.material:material:1.4.0' } diff --git a/build.gradle b/build.gradle index f66525b..6fa21f0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,13 @@ buildscript { repositories { - jcenter() google() + mavenCentral() + } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:7.0.1' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +17,12 @@ buildscript { allprojects { repositories { - jcenter() google() + mavenCentral() + } } + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d17b0fe..a330fc0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 07 22:59:21 KST 2019 +#Tue Aug 24 01:09:57 IST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index e290c2b..19974f8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion "29.0.0" + compileSdkVersion 30 + buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 14 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 17 versionName "0.0.15" } @@ -20,5 +20,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.3.1' } From 08883f47515da12327d69f41db6fdef1cba9c58b Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 24 Aug 2021 01:21:34 +0530 Subject: [PATCH 2/2] Updated Gradle to 7+ Added AndroidX auto Migration --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4d67306..0df7064 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ .DS_Store /build /captures -gradle.properties .externalNativeBuild