flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-22 13:52:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #117 from owncloud/Studio2Update

Browse Source 
Support Android Studio 2.0 (build tools 23.0.3 + gradle 2.10 + gradle plugin 2.0)
This commit is contained in:
David A. Velasco
2016-04-26 16:45:13 +02:00
parent f53ebc09b2 037b1baadf
commit 0d95b0ce24
11 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -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:
build.gradle
+2 -2
View File
@@ -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 {
gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -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
sample_client/build.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.3"
sourceSets { sourceSets {
main { main {
sample_client/gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
sample_client/gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -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
test_client/build.gradle
+11 -2
View File
@@ -1,18 +1,27 @@
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 project(':') compile project(':')
} }
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.3"
sourceSets { sourceSets {
main { main {
test_client/gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
test_client/gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -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
test_client/tests/build.gradle
+2 -2
View File
@@ -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 {