Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all jcenter dependencies #388

Merged
merged 3 commits into from
Jul 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion defCompileSdkVersion
buildToolsVersion defBuildToolsVersion

defaultConfig {
applicationId 'com.getkeepsafe.taptargetviewsample'
Expand All @@ -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'
}
19 changes: 7 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 4 additions & 5 deletions taptargetview/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down