Skip to content

Commit 9f81070

Browse files
ZacSweersJakeWharton
authored andcommitted
Update dependencies (#435)
* 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
1 parent 191a758 commit 9f81070

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

.travis.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
language: android
22

3-
jdk:
4-
- oraclejdk8
5-
63
android:
74
components:
85
- tools
96
- platform-tools
10-
- android-26
11-
- build-tools-26.0.2
7+
8+
jdk:
9+
- oraclejdk8
1210

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

14+
before_install:
15+
# Install SDK license so Android Gradle plugin can install deps.
16+
- mkdir "$ANDROID_HOME/licenses" || true
17+
- echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
18+
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
19+
1620
# script for build and release via Travis to Bintray
1721
script: gradle/buildViaTravis.sh
1822

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
subprojects {
22
buildscript {
33
repositories {
4+
google()
45
mavenCentral()
56
jcenter()
6-
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.1'
10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
12-
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2'
9+
classpath 'com.android.tools.build:gradle:3.1.3'
10+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
11+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
12+
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
1313
}
1414
}
1515

1616
repositories {
17+
google()
1718
mavenCentral()
19+
jcenter()
1820
}
1921
}
2022

2123
ext {
2224
minSdkVersion = 9
23-
compileSdkVersion = 26
24-
buildToolsVersion = '26.0.2'
25+
compileSdkVersion = 28
2526
sourceCompatibility = JavaVersion.VERSION_1_7
2627
}

gradle/wrapper/gradle-wrapper.jar

-291 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

rxandroid/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ logger.info("RxAndroid using version=$project.version")
1919

2020
android {
2121
compileSdkVersion rootProject.ext.compileSdkVersion
22-
buildToolsVersion rootProject.ext.buildToolsVersion
2322

2423
defaultConfig {
2524
minSdkVersion rootProject.ext.minSdkVersion
@@ -37,10 +36,10 @@ android {
3736
}
3837

3938
dependencies {
40-
api 'io.reactivex.rxjava2:rxjava:2.1.9'
39+
api 'io.reactivex.rxjava2:rxjava:2.1.16'
4140

4241
testImplementation 'junit:junit:4.12'
43-
testImplementation 'org.robolectric:robolectric:3.3.2'
42+
testImplementation 'org.robolectric:robolectric:3.8'
4443
}
4544

4645
// Create source/javadoc artifacts for publishing

sample-app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
5-
buildToolsVersion rootProject.ext.buildToolsVersion
65

76
defaultConfig {
87
minSdkVersion 15
9-
targetSdkVersion 23
8+
targetSdkVersion 28
109
versionCode 1
1110
versionName '1.0'
1211
}

0 commit comments

Comments
 (0)