Merge pull request #2224 from illegalprime/fix-travis-android-25

Daniel Gultsch created 9 years ago

Updated travis and Trust Manager to fix build

Change summary

.travis.yml                              | 7 ++++---
libs/MemorizingTrustManager/build.gradle | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)

Detailed changes

.travis.yml

@@ -1,11 +1,12 @@
 language: android
+jdk:
+  - oraclejdk8
 android:
   components:
     - platform-tools
     - tools
-    - build-tools-23.0.3
-    - build-tools-19.1.0
-    - android-24
+    - build-tools-25.0.2
+    - android-25
     - extra-android-m2repository
     - extra-google-m2repository
     - extra-google-google_play_services

libs/MemorizingTrustManager/build.gradle

@@ -10,11 +10,11 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-	compileSdkVersion 24
-	buildToolsVersion "23.0.3"
+	compileSdkVersion 25
+	buildToolsVersion "25.0.2"
 	defaultConfig {
 		minSdkVersion 14
-		targetSdkVersion 24
+		targetSdkVersion 25
 	}
 
 	sourceSets {