mirror of
				https://github.com/owncloud/android-library.git
				synced 2025-10-28 17:07:49 +00:00 
			
		
		
		
	Android Studio 2.0 Update, gradle 2.10 update, build tools 23.0.3 and support lib update in travis
This commit is contained in:
		
							parent
							
								
									f53ebc09b2
								
							
						
					
					
						commit
						0a941691bd
					
				| @ -4,7 +4,7 @@ android: | |||||||
|   components: |   components: | ||||||
|   - platform-tools |   - platform-tools | ||||||
|   - tools |   - tools | ||||||
|   - build-tools-23.0.2 |   - build-tools-23.0.3 | ||||||
|   - android-23 |   - android-23 | ||||||
|   - sys-img-armeabi-v7a-android-23 |   - sys-img-armeabi-v7a-android-23 | ||||||
| branches: | branches: | ||||||
| @ -13,6 +13,8 @@ branches: | |||||||
| before_install: | before_install: | ||||||
| - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI | - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI | ||||||
|   -c 20M |   -c 20M | ||||||
|  | - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null | ||||||
|  | - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null | ||||||
| - emulator -avd test -no-skin -no-audio -no-window & | - emulator -avd test -no-skin -no-audio -no-window & | ||||||
| - rm pom.xml | - rm pom.xml | ||||||
| - android update project -p . | - android update project -p . | ||||||
|  | |||||||
| @ -3,7 +3,7 @@ buildscript { | |||||||
|         mavenCentral() |         mavenCentral() | ||||||
|     } |     } | ||||||
|     dependencies { |     dependencies { | ||||||
|         classpath 'com.android.tools.build:gradle:1.5.0' |         classpath 'com.android.tools.build:gradle:2.0.0' | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -19,7 +19,7 @@ dependencies { | |||||||
| 
 | 
 | ||||||
| android { | android { | ||||||
|     compileSdkVersion 23 |     compileSdkVersion 23 | ||||||
|     buildToolsVersion "23.0.2" |     buildToolsVersion "23.0.3" | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         main { |         main { | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @ -1,6 +1,6 @@ | |||||||
| #Mon Jan 19 11:03:11 CET 2015 | #Mon Dec 28 10:00:20 PST 2015 | ||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip | ||||||
|  | |||||||
| @ -10,7 +10,7 @@ dependencies { | |||||||
| 
 | 
 | ||||||
| android { | android { | ||||||
|     compileSdkVersion 23 |     compileSdkVersion 23 | ||||||
|     buildToolsVersion "23.0.2" |     buildToolsVersion "23.0.3" | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         main { |         main { | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								sample_client/gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								sample_client/gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -1,6 +1,6 @@ | |||||||
| #Wed Apr 10 15:27:10 PDT 2013 | #Mon Dec 28 10:00:20 PST 2015 | ||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
| distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip | ||||||
|  | |||||||
| @ -1,18 +1,28 @@ | |||||||
|  | buildscript { | ||||||
|  |     repositories { | ||||||
|  |         mavenCentral() | ||||||
|  |     } | ||||||
|  |     dependencies { | ||||||
|  |         classpath 'com.android.tools.build:gradle:2.0.0' | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | 
 | ||||||
| apply plugin: 'com.android.application' | apply plugin: 'com.android.application' | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
| repositories { | repositories { | ||||||
|     mavenCentral() |     mavenCentral() | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile 'commons-httpclient:commons-httpclient:3.1' |     compile 'commons-httpclient:commons-httpclient:3.1' | ||||||
|     compile 'com.android.support:support-v4:20.0.0' |     compile 'com.android.support:support-v4:23.1.1' | ||||||
|     compile project(':') |     compile project(':') | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| android { | android { | ||||||
|     compileSdkVersion 23 |     compileSdkVersion 23 | ||||||
|     buildToolsVersion "23.0.2" |     buildToolsVersion "23.0.3" | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         main { |         main { | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								test_client/gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								test_client/gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -1,6 +1,6 @@ | |||||||
| #Wed Apr 10 15:27:10 PDT 2013 | #Mon Dec 28 10:00:20 PST 2015 | ||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
| distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| apply plugin: 'android' | apply plugin: 'com.android.application' | ||||||
| 
 | 
 | ||||||
| dependencies { | dependencies { | ||||||
|     compile fileTree(dir: 'libs', include: '*.jar') |     compile fileTree(dir: 'libs', include: '*.jar') | ||||||
| @ -7,7 +7,7 @@ dependencies { | |||||||
| 
 | 
 | ||||||
| android { | android { | ||||||
|     compileSdkVersion 23 |     compileSdkVersion 23 | ||||||
|     buildToolsVersion "23.0.2" |     buildToolsVersion "23.0.3" | ||||||
| 
 | 
 | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         main { |         main { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user