Skip to content

Commit 0482e41

Browse files
digitalbuddhaJakeWharton
authored andcommitted
update to compileSdkVersion 25 + few other minor upgrades (ReactiveX#355)
* update min sdk to 25, build tools 25.0.1 * gradle wrapper to 2.14.1 * update maven gradle plugin to 1.4.1
1 parent 8432dcb commit 0482e41

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android:
77
components:
88
- tools
99
- platform-tools
10-
- android-24
11-
- build-tools-24.0.1
10+
- android-25
11+
- build-tools-25.0.1
1212

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

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ subprojects {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99
}
1010
}
1111

@@ -16,7 +16,7 @@ subprojects {
1616

1717
ext {
1818
minSdkVersion = 9
19-
compileSdkVersion = 24
20-
buildToolsVersion = '24.0.1'
19+
compileSdkVersion = 25
20+
buildToolsVersion = '25.0.1'
2121
sourceCompatibility = JavaVersion.VERSION_1_7
2222
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon May 02 08:26:04 CDT 2016
1+
#Fri Dec 16 23:23:35 EST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

rxandroid/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
dependencies {
3-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
3+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
44
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
55
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"
66
}

0 commit comments

Comments
 (0)