Remove all jcenter dependencies (#388)

* remove jcenter dependency and updated build dependencies * updated releasing guide * changelog entry
KeepSafe · Jul 9, 2021 · 6fba8cd · 6fba8cd
1 parent df697f2
commit 6fba8cd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Prepend the changelog with this template on every release.
 -->
 
 ## [Unreleased]
+- Removed JCenter dependencies and updated other build dependencies (#388)
 
 ## [1.13.2] - Released March 10, 2021
 - Moved artifact publishing from JCenter to Maven Central (#385)
diff --git a/RELEASING.md b/RELEASING.md
@@ -26,8 +26,8 @@ We currently deploy to Maven Central (via Sonatype's OSS Nexus instance).
    ```
 1. Configure your Sonatype credentials in ~/.gradle/gradle.properties:
    ```gradle
-   SONATYPE_NEXUS_USERNAME=<nexus username>
-   SONATYPE_NEXUS_PASSWORD=<nexus password>
+   mavenCentralUsername=<nexus username>
+   mavenCentralPassword=<nexus password>
    SONATYPE_STAGING_PROFILE=com.getkeepsafe
    ```
 1. Configure git with your codesigning key; make sure it's the same as the one

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion defCompileSdkVersion
-    buildToolsVersion defBuildToolsVersion
 
     defaultConfig {
         applicationId 'com.getkeepsafe.taptargetviewsample'
@@ -21,7 +20,7 @@ android {
 
 dependencies {
     implementation project(':taptargetview')
-    implementation "androidx.appcompat:appcompat:$defAndroidXVersion"
+    implementation "androidx.appcompat:appcompat:$defAppCompatVersion"
     implementation "com.google.android.material:material:$defMaterialVersion"
     implementation 'com.facebook.stetho:stetho:1.5.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -2,31 +2,26 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0'
     }
 }
 
 ext {
-    defBuildToolsVersion = '28.0.2'
-    defAndroidXVersion = '1.0.0'
-    defMaterialVersion = '1.0.0'
-    defCompileSdkVersion = 28
+    defAndroidXCoreVersion = '1.6.0'
+    defAndroidAnnotationVersion = '1.2.0'
+    defAppCompatVersion = '1.3.0'
+    defMaterialVersion = '1.4.0'
+    defCompileSdkVersion = 30
     defMinSdkVersion = 14
 }
 
 allprojects {
     repositories {
         google()
         mavenCentral()
-        // TODO: Remove this repository when Android build tools no longer transitively pulls
-        //  `trove4j` or if it's properly published in Maven Central when JCenter goes away.
-        //  See: https://github.com/KeepSafe/ReLinker/pull/81#issuecomment-787525670
-        gradlePluginPortal()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/taptargetview/build.gradle b/taptargetview/build.gradle
@@ -1,20 +1,19 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
     compileSdkVersion defCompileSdkVersion
-    buildToolsVersion defBuildToolsVersion
 
     defaultConfig {
         minSdkVersion defMinSdkVersion
+        targetSdkVersion defCompileSdkVersion
     }
 }
 
 dependencies {
-    api "androidx.annotation:annotation:$defAndroidXVersion"
-    api "androidx.appcompat:appcompat:$defAndroidXVersion"
-    implementation "androidx.core:core:$defAndroidXVersion"
+    api "androidx.annotation:annotation:$defAndroidAnnotationVersion"
+    api "androidx.appcompat:appcompat:$defAppCompatVersion"
+    implementation "androidx.core:core:$defAndroidXCoreVersion"
 }
 
 // build a jar with source files