From 130332d98db8df6547893cc22243bd4452c4b3c9 Mon Sep 17 00:00:00 2001 From: SyedFazal Date: Fri, 4 Oct 2024 11:49:43 +0400 Subject: [PATCH 1/8] Migration From Jcenter to Maven --- app/build.gradle | 15 ++++++++------- app/src/main/AndroidManifest.xml | 4 ++-- .../com/binaryfork/spannysample/MainActivity.java | 1 + build.gradle | 14 ++++++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- spanny/build.gradle | 12 +++++++----- spanny/src/main/AndroidManifest.xml | 3 +-- 7 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6d06e57..59a7788 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' - android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + namespace 'com.binaryfork.spanny' + + compileSdkVersion 34 + //buildToolsVersion "22.0.1" defaultConfig { applicationId "com.binaryfork.spanny" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 34 versionCode 1 versionName "1.0" } @@ -20,7 +21,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - //compile project(':spanny') - compile 'com.binaryfork:spanny:1.0.3' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':spanny') + //implementation 'com.binaryfork:spanny:1.0.4' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 280c847..eb726a6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/main/java/com/binaryfork/spannysample/MainActivity.java b/app/src/main/java/com/binaryfork/spannysample/MainActivity.java index 5bba868..55e6dfc 100644 --- a/app/src/main/java/com/binaryfork/spannysample/MainActivity.java +++ b/app/src/main/java/com/binaryfork/spannysample/MainActivity.java @@ -21,6 +21,7 @@ import android.text.style.UnderlineSpan; import android.widget.TextView; +import com.binaryfork.spanny.R; import com.binaryfork.spanny.Spanny; diff --git a/build.gradle b/build.gradle index d65675e..b4aee6f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,16 @@ buildscript { repositories { - jcenter() + //jcenter() + maven { url "https://repo.grails.org/grails/core/" } + google() } + + dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:8.2.0' classpath 'com.github.dcendents:android-maven-plugin:1.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,6 +20,8 @@ buildscript { allprojects { repositories { - jcenter() + //jcenter() + maven { url "https://repo.grails.org/grails/core/" } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..9396a09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip diff --git a/spanny/build.gradle b/spanny/build.gradle index 8e675dc..ede1384 100644 --- a/spanny/build.gradle +++ b/spanny/build.gradle @@ -1,13 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + namespace 'com.binaryfork.spannySample' + + compileSdkVersion 34 + //buildToolsVersion "22.0.1" resourcePrefix "spanny__" defaultConfig { minSdkVersion 8 - targetSdkVersion 22 + targetSdkVersion 34 versionCode 1 versionName "1.0.3" } @@ -20,7 +22,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } -apply from: 'bintray.gradle' \ No newline at end of file +apply plugin: "com.jfrog.bintray" \ No newline at end of file diff --git a/spanny/src/main/AndroidManifest.xml b/spanny/src/main/AndroidManifest.xml index f6760a9..8bdb7e1 100644 --- a/spanny/src/main/AndroidManifest.xml +++ b/spanny/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + From 8148e4d5ecde36b6946008441242b6b07b9a61c3 Mon Sep 17 00:00:00 2001 From: SyedFazal Date: Fri, 4 Oct 2024 17:51:02 +0400 Subject: [PATCH 2/8] Migration From Jcenter to Maven --- .idea/compiler.xml | 18 +----------------- .idea/gradle.xml | 5 +++-- .idea/misc.xml | 15 +-------------- .idea/modules.xml | 10 ++++++++-- Spanny.iml | 11 ++--------- 5 files changed, 15 insertions(+), 44 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d165b77..c061c67 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,11 +1,11 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index cca2cda..a0f72af 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 0078f2c..9374f3d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,14 @@ - - + + + + + + + + \ No newline at end of file diff --git a/Spanny.iml b/Spanny.iml index 5ef7902..77101b7 100644 --- a/Spanny.iml +++ b/Spanny.iml @@ -1,17 +1,10 @@ - - - - - - - + + From e84c58969f3b935dac1ea49207be2e8d4a46c844 Mon Sep 17 00:00:00 2001 From: SyedFazal Date: Mon, 7 Oct 2024 09:48:39 +0400 Subject: [PATCH 3/8] Migration From Jcenter to Maven - update publication --- .idea/misc.xml | 1 - app/build.gradle | 2 +- .../binaryfork/spannysample/MainActivity.java | 2 +- build.gradle | 2 ++ spanny/build.gradle | 17 ++++++++++++++++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index a0f72af..b4bef83 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ -