From a7eeded409d62aa16b060228274b2646f01f0571 Mon Sep 17 00:00:00 2001 From: PKReejesh Date: Mon, 16 Sep 2024 14:42:26 +0530 Subject: [PATCH 1/3] Gradle upgrades --- build.gradle | 7 ++++++- gradle/wrapper/gradle-wrapper.properties | 3 +-- library/build.gradle | 5 +++-- sample/build.gradle | 7 ++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 3a8a17e..a269709 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext { + agp_version = '8.3.0' + } repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath "com.android.tools.build:gradle:$agp_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -14,5 +18,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae048bb..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Jan 04 21:42:37 SGT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index ed83687..f4738cd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.library' android { + namespace = "com.amulyakhare.textdrawable" // this should be your namespace from AndroidManifest.xml compileSdkVersion 21 buildToolsVersion "21.1.1" @@ -19,7 +20,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } sourceSets { @@ -34,6 +35,6 @@ sourceSets { } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.java, sourceSets.main.resources } diff --git a/sample/build.gradle b/sample/build.gradle index 85e0728..9b49995 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace = "com.amulyakhare.td" // this should be your namespace from AndroidManifest.xml compileSdkVersion 21 buildToolsVersion "21.1.1" @@ -20,7 +21,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(':library') - compile 'com.android.support:appcompat-v7:21.0.3' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':library') + implementation 'com.android.support:appcompat-v7:21.0.3' } \ No newline at end of file From 146456765265a378811b88707863fdc37474856a Mon Sep 17 00:00:00 2001 From: PKReejesh Date: Mon, 16 Sep 2024 16:14:09 +0530 Subject: [PATCH 2/3] Gradle updates --- sample/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sample/build.gradle b/sample/build.gradle index 9b49995..f8b0209 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -24,4 +24,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':library') implementation 'com.android.support:appcompat-v7:21.0.3' +} + +task wrapper(type: Wrapper){ + gradleVersion = '8.4' } \ No newline at end of file From 0a5310c737fc8abfb4ecef27ae7669db67132fc3 Mon Sep 17 00:00:00 2001 From: PKReejesh Date: Mon, 16 Sep 2024 16:34:43 +0530 Subject: [PATCH 3/3] Upgrades to support current gradle and sdk --- library/build.gradle | 6 +++--- sample/build.gradle | 6 +++--- sample/src/main/AndroidManifest.xml | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index f4738cd..ee4dba5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' android { namespace = "com.amulyakhare.textdrawable" // this should be your namespace from AndroidManifest.xml - compileSdkVersion 21 + compileSdkVersion 33 buildToolsVersion "21.1.1" defaultConfig { - minSdkVersion 10 - targetSdkVersion 21 + minSdkVersion 23 + targetSdkVersion 33 versionCode 2 versionName "1.1" } diff --git a/sample/build.gradle b/sample/build.gradle index f8b0209..b266175 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.application' android { namespace = "com.amulyakhare.td" // this should be your namespace from AndroidManifest.xml - compileSdkVersion 21 + compileSdkVersion 33 buildToolsVersion "21.1.1" defaultConfig { applicationId "com.amulyakhare.td" - minSdkVersion 10 - targetSdkVersion 21 + minSdkVersion 23 + targetSdkVersion 33 versionCode 2 versionName "1.0" } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 3f1ab69..88b1bbf 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ android:theme="@style/AppTheme" >