flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 16:36:13 +00:00
Code Issues Releases Wiki Activity

Upgrade gradle and fix some conflicts

Browse Source
This commit is contained in:
davigonz 2018-04-25 11:23:06 +02:00
parent 41fed5d9f0
commit 3bd29307a5
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -1,9 +1,10 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.1.2'
} }
} }
@ -11,6 +12,7 @@ apply plugin: 'com.android.library'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
@ -34,7 +36,7 @@ android {
} }
// Move the tests to tests/java, tests/res, etc... // Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests') androidTest.setRoot('tests')
// Move the build types to build-types/<type> // Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...

2
sample_client/build.gradle
View File

@ -24,7 +24,7 @@ android {
} }
// Move the tests to tests/java, tests/res, etc... // Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests') androidTest.setRoot('tests')
// Move the build types to build-types/<type> // Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...

2
test_client/build.gradle
View File

@ -26,7 +26,7 @@ android {
} }
// Move the tests to tests/java, tests/res, etc... // Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests') androidTest.setRoot('tests')
// Move the build types to build-types/<type> // Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...

2
test_client/tests/build.gradle
View File

@ -21,7 +21,7 @@ android {
} }
// Move the tests to tests/java, tests/res, etc... // Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests') androidTest.setRoot('tests')
// Move the build types to build-types/<type> // Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...