mirror of
				https://github.com/owncloud/android-library.git
				synced 2025-10-29 17:37:23 +00:00 
			
		
		
		
	Merge pull request #137 from owncloud/update_tools
Update gradle plugin & Jackrabbit-Webdav
This commit is contained in:
		
						commit
						dc14474c51
					
				| @ -18,7 +18,7 @@ branches: | ||||
| before_install: | ||||
| - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI | ||||
|   -c 20M | ||||
| - emulator -avd test -no-skin -no-audio -no-window & | ||||
| - emulator -avd test -no-window & | ||||
| - rm pom.xml | ||||
| - android update project -p . | ||||
| - chmod +x ./wait_for_emulator.sh | ||||
|  | ||||
| @ -3,7 +3,7 @@ buildscript { | ||||
|         jcenter() | ||||
|     } | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:2.1.3' | ||||
|         classpath 'com.android.tools.build:gradle:2.2.0' | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| @ -14,7 +14,7 @@ repositories { | ||||
| } | ||||
| 
 | ||||
| dependencies { | ||||
|     compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.2' | ||||
|     compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4' | ||||
| } | ||||
| 
 | ||||
| android { | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							| @ -1,12 +1,3 @@ | ||||
| buildscript { | ||||
|     repositories { | ||||
|         jcenter() | ||||
|     } | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:2.1.3' | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| apply plugin: 'com.android.application' | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user