Skip to content

Commit

Permalink
Update dependencies (#435)
Browse files Browse the repository at this point in the history
* Gradle 4.8.1
* Update to SDK 28
* Update to robolectric 3.8
* Update to android-maven-gradle-plugin 2.1
* Gradle bintray plugin 1.8.4
* Build-info-extractor-gradle 4.7.5
* RxJava 2.1.16
* Remove now-unnecessary buildToolsVersion definitions
* Add jcenter() to repositories for trove4j
  • Loading branch information
ZacSweers authored and JakeWharton committed Jul 10, 2018
1 parent 191a758 commit 9f81070
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 18 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
language: android

jdk:
- oraclejdk8

android:
components:
- tools
- platform-tools
- android-26
- build-tools-26.0.2

jdk:
- oraclejdk8

# as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
sudo: false

before_install:
# Install SDK license so Android Gradle plugin can install deps.
- mkdir "$ANDROID_HOME/licenses" || true
- echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"

# script for build and release via Travis to Bintray
script: gradle/buildViaTravis.sh

Expand Down
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
subprojects {
buildscript {
repositories {
google()
mavenCentral()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2'
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
}
}

repositories {
google()
mavenCentral()
jcenter()
}
}

ext {
minSdkVersion = 9
compileSdkVersion = 26
buildToolsVersion = '26.0.2'
compileSdkVersion = 28
sourceCompatibility = JavaVersion.VERSION_1_7
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
5 changes: 2 additions & 3 deletions rxandroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ logger.info("RxAndroid using version=$project.version")

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand All @@ -37,10 +36,10 @@ android {
}

dependencies {
api 'io.reactivex.rxjava2:rxjava:2.1.9'
api 'io.reactivex.rxjava2:rxjava:2.1.16'

testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.3.2'
testImplementation 'org.robolectric:robolectric:3.8'
}

// Create source/javadoc artifacts for publishing
Expand Down
3 changes: 1 addition & 2 deletions sample-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 28
versionCode 1
versionName '1.0'
}
Expand Down

0 comments on commit 9f81070

Please sign in to comment.