Merge pull request #2224 from illegalprime/fix-travis-android-25
Updated travis and Trust Manager to fix build
This commit is contained in:
		
						commit
						1269123816
					
				@ -1,11 +1,12 @@
 | 
				
			|||||||
language: android
 | 
					language: android
 | 
				
			||||||
 | 
					jdk:
 | 
				
			||||||
 | 
					  - oraclejdk8
 | 
				
			||||||
android:
 | 
					android:
 | 
				
			||||||
  components:
 | 
					  components:
 | 
				
			||||||
    - platform-tools
 | 
					    - platform-tools
 | 
				
			||||||
    - tools
 | 
					    - tools
 | 
				
			||||||
    - build-tools-23.0.3
 | 
					    - build-tools-25.0.2
 | 
				
			||||||
    - build-tools-19.1.0
 | 
					    - android-25
 | 
				
			||||||
    - android-24
 | 
					 | 
				
			||||||
    - extra-android-m2repository
 | 
					    - extra-android-m2repository
 | 
				
			||||||
    - extra-google-m2repository
 | 
					    - extra-google-m2repository
 | 
				
			||||||
    - extra-google-google_play_services
 | 
					    - extra-google-google_play_services
 | 
				
			||||||
 | 
				
			|||||||
@ -10,11 +10,11 @@ buildscript {
 | 
				
			|||||||
apply plugin: 'com.android.library'
 | 
					apply plugin: 'com.android.library'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
android {
 | 
					android {
 | 
				
			||||||
	compileSdkVersion 24
 | 
						compileSdkVersion 25
 | 
				
			||||||
	buildToolsVersion "23.0.3"
 | 
						buildToolsVersion "25.0.2"
 | 
				
			||||||
	defaultConfig {
 | 
						defaultConfig {
 | 
				
			||||||
		minSdkVersion 14
 | 
							minSdkVersion 14
 | 
				
			||||||
		targetSdkVersion 24
 | 
							targetSdkVersion 25
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sourceSets {
 | 
						sourceSets {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user