Merge pull request ReactiveX#311 from ReactiveX/jw/twenty-four

JakeWharton · web-flow · commit 1a145dba9cb5 · 2016-08-04T21:36:36.000-04:00
Twenty four.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ android:
   components:
     - tools
     - platform-tools
-    - android-23
-    - build-tools-23.0.3
+    - android-24
+    - build-tools-24.0.1
 
 # as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
 sudo: false
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ subprojects {
 
 ext {
     minSdkVersion = 9
-    compileSdkVersion = 23
-    buildToolsVersion = '23.0.3'
+    compileSdkVersion = 24
+    buildToolsVersion = '24.0.1'
     sourceCompatibility = JavaVersion.VERSION_1_7
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ subprojects {`
`16`	`16`
`17`	`17`	`ext {`
`18`	`18`	`minSdkVersion = 9`
`19`		`- compileSdkVersion = 23`
`20`		`- buildToolsVersion = '23.0.3'`
	`19`	`+ compileSdkVersion = 24`
	`20`	`+ buildToolsVersion = '24.0.1'`
`21`	`21`	`sourceCompatibility = JavaVersion.VERSION_1_7`
`22`	`22`	`}`