flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #188 from owncloud/upgrade_gradle

Browse Source 
Upgrade gradle to 3.1.2
This commit is contained in:
David González Verdugo 2018-05-18 09:27:06 +02:00 committed by GitHub
commit ad0adaaf5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -34,7 +34,7 @@
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-sdk
android:minSdkVersion="8"
android:minSdkVersion="14"
android:targetSdkVersion="26" />
</manifest>

15
build.gradle
View File

@ -1,26 +1,29 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.1.2'
}
}
apply plugin: 'com.android.library'
repositories {
allprojects {
repositories {
google()
jcenter()
}
}
dependencies {
compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
compile 'com.squareup.okhttp3:okhttp:3.10.0'
api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
api 'com.squareup.okhttp3:okhttp:3.10.0'
}
android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
sourceSets {
main {
@ -34,7 +37,7 @@ android {
}
// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')
androidTest.setRoot('tests')
// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

10
sample_client/build.gradle
View File

@ -5,12 +5,11 @@ repositories {
}
dependencies {
compile project(':')
implementation project(':')
}
android {
compileSdkVersion 26
buildToolsVersion "26.0.2"
sourceSets {
main {
@ -24,7 +23,7 @@ android {
}
// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')
androidTest.setRoot('tests')
// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
@ -43,9 +42,4 @@ android {
packagingOptions {
exclude 'META-INF/LICENSE.txt'
}
android {
lintOptions {
abortOnError false
}
}
}

2
sample_client/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

2
test_client/AndroidManifest.xml
View File

@ -38,7 +38,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-sdk
android:minSdkVersion="8"
android:minSdkVersion="14"
android:targetSdkVersion="26" />
<application

11
test_client/build.gradle
View File

@ -6,13 +6,11 @@ repositories {
}
dependencies {
compile 'commons-httpclient:commons-httpclient:3.1'
compile project(':')
implementation project(':')
}
android {
compileSdkVersion 26
buildToolsVersion "26.0.2"
sourceSets {
main {
@ -26,7 +24,7 @@ android {
}
// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')
androidTest.setRoot('tests')
// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
@ -45,9 +43,4 @@ android {
packagingOptions {
exclude 'META-INF/LICENSE.txt'
}
android {
lintOptions {
abortOnError false
}
}
}

2
test_client/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

2
test_client/tests/AndroidManifest.xml
View File

@ -28,7 +28,7 @@
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk android:minSdkVersion="8" />
<uses-sdk android:minSdkVersion="14" />
<application>
<uses-library android:name="android.test.runner" />
</application>

7
test_client/tests/build.gradle
View File

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile project(':')
implementation fileTree(dir: 'libs', include: '*.jar')
implementation project(':')
}
android {
compileSdkVersion 26
buildToolsVersion "26.0.2"
sourceSets {
main {
@ -21,7 +20,7 @@ android {
}
// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')
androidTest.setRoot('tests')
// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...