From 3bd29307a53037768a35ede653d5a84945997e73 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 25 Apr 2018 11:23:06 +0200 Subject: [PATCH 1/9] Upgrade gradle and fix some conflicts --- build.gradle | 6 ++++-- sample_client/build.gradle | 2 +- test_client/build.gradle | 2 +- test_client/tests/build.gradle | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c97858bf..735703c9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { jcenter() + google() } 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 { jcenter() + google() } dependencies { @@ -34,7 +36,7 @@ android { } // Move the tests to tests/java, tests/res, etc... - instrumentTest.setRoot('tests') + androidTest.setRoot('tests') // Move the build types to build-types/ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... diff --git a/sample_client/build.gradle b/sample_client/build.gradle index 2c7a6b08..1be2e8c5 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -24,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/ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... diff --git a/test_client/build.gradle b/test_client/build.gradle index 319d157b..e9a8c6aa 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -26,7 +26,7 @@ android { } // Move the tests to tests/java, tests/res, etc... - instrumentTest.setRoot('tests') + androidTest.setRoot('tests') // Move the build types to build-types/ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle index b9a2b5a1..4b423aab 100644 --- a/test_client/tests/build.gradle +++ b/test_client/tests/build.gradle @@ -21,7 +21,7 @@ android { } // Move the tests to tests/java, tests/res, etc... - instrumentTest.setRoot('tests') + androidTest.setRoot('tests') // Move the build types to build-types/ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... From 1ff922af6a785a2128fc154bad4e3d73b6ec5ccb Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 25 Apr 2018 16:38:51 +0200 Subject: [PATCH 2/9] Get rid of some warnings --- build.gradle | 3 +-- sample_client/build.gradle | 3 +-- test_client/build.gradle | 5 ++--- test_client/tests/build.gradle | 5 ++--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 735703c9..3043c612 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,11 @@ repositories { dependencies { compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4' - compile 'com.squareup.okhttp3:okhttp:3.10.0' + implementation 'com.squareup.okhttp3:okhttp:3.10.0' } android { compileSdkVersion 26 - buildToolsVersion '26.0.2' sourceSets { main { diff --git a/sample_client/build.gradle b/sample_client/build.gradle index 1be2e8c5..c1bd54a1 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -5,12 +5,11 @@ repositories { } dependencies { - compile project(':') + implementation project(':') } android { compileSdkVersion 26 - buildToolsVersion "26.0.2" sourceSets { main { diff --git a/test_client/build.gradle b/test_client/build.gradle index e9a8c6aa..c3f020a0 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -6,13 +6,12 @@ repositories { } dependencies { - compile 'commons-httpclient:commons-httpclient:3.1' - compile project(':') + implementation 'commons-httpclient:commons-httpclient:3.1' + implementation project(':') } android { compileSdkVersion 26 - buildToolsVersion "26.0.2" sourceSets { main { diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle index 4b423aab..33b017fb 100644 --- a/test_client/tests/build.gradle +++ b/test_client/tests/build.gradle @@ -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 { From b1ef9ec44b14bc092de482b25edc93f569126f96 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 25 Apr 2018 17:18:36 +0200 Subject: [PATCH 3/9] Solve google repository issue --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3043c612..fc027e5e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,9 @@ buildscript { repositories { jcenter() - google() + maven { + url "https://maven.google.com" + } } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' @@ -12,7 +14,9 @@ apply plugin: 'com.android.library' repositories { jcenter() - google() + maven { + url "https://maven.google.com" + } } dependencies { From 91f509a1196bc903d1bf97c23d8e40889740cf08 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 25 Apr 2018 17:30:53 +0200 Subject: [PATCH 4/9] Fix failed Travis test --- build.gradle | 8 ++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index fc027e5e..3043c612 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { jcenter() - maven { - url "https://maven.google.com" - } + google() } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' @@ -14,9 +12,7 @@ apply plugin: 'com.android.library' repositories { jcenter() - maven { - url "https://maven.google.com" - } + google() } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a04cf10f..75622d3e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 From 35ea9dfd202faed7cffb1652c3cbd30f29d46309 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 25 Apr 2018 17:48:17 +0200 Subject: [PATCH 5/9] Fix okHttp not found --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3043c612..31f4bdc5 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ repositories { dependencies { compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4' - implementation 'com.squareup.okhttp3:okhttp:3.10.0' + compile 'com.squareup.okhttp3:okhttp:3.10.0' } android { From 9a2fb4cd0a87d1dedc42a801b8f7b07e14ce7e58 Mon Sep 17 00:00:00 2001 From: davigonz Date: Thu, 26 Apr 2018 10:37:08 +0200 Subject: [PATCH 6/9] Fix Could not find com.android.tools.lint:lint-gradle:26.1.2. --- build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 31f4bdc5..15bdd8ec 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,11 @@ buildscript { apply plugin: 'com.android.library' -repositories { - jcenter() - google() +allprojects { + repositories { + google() + jcenter() + } } dependencies { From 2ccd681d2f4c1147f3d773875c7b4c09e7d3e101 Mon Sep 17 00:00:00 2001 From: davigonz Date: Mon, 30 Apr 2018 10:16:37 +0200 Subject: [PATCH 7/9] Fix merge dex error and delete redundant dependencies --- gradle/wrapper/gradle-wrapper.properties | 2 +- sample_client/build.gradle | 5 ----- sample_client/gradle/wrapper/gradle-wrapper.properties | 2 +- test_client/build.gradle | 6 ------ test_client/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 75622d3e..267dfc1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip \ No newline at end of file diff --git a/sample_client/build.gradle b/sample_client/build.gradle index c1bd54a1..c0f96865 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -42,9 +42,4 @@ android { packagingOptions { exclude 'META-INF/LICENSE.txt' } - android { - lintOptions { - abortOnError false - } - } } diff --git a/sample_client/gradle/wrapper/gradle-wrapper.properties b/sample_client/gradle/wrapper/gradle-wrapper.properties index 122a0dca..fc5d4423 100644 --- a/sample_client/gradle/wrapper/gradle-wrapper.properties +++ b/sample_client/gradle/wrapper/gradle-wrapper.properties @@ -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 \ No newline at end of file diff --git a/test_client/build.gradle b/test_client/build.gradle index c3f020a0..8d01b841 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -6,7 +6,6 @@ repositories { } dependencies { - implementation 'commons-httpclient:commons-httpclient:3.1' implementation project(':') } @@ -44,9 +43,4 @@ android { packagingOptions { exclude 'META-INF/LICENSE.txt' } - android { - lintOptions { - abortOnError false - } - } } diff --git a/test_client/gradle/wrapper/gradle-wrapper.properties b/test_client/gradle/wrapper/gradle-wrapper.properties index 122a0dca..fc5d4423 100644 --- a/test_client/gradle/wrapper/gradle-wrapper.properties +++ b/test_client/gradle/wrapper/gradle-wrapper.properties @@ -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 \ No newline at end of file From bf225b275f36a6d1618d79be9b4eacc7588d3c9d Mon Sep 17 00:00:00 2001 From: davigonz Date: Mon, 30 Apr 2018 12:50:39 +0200 Subject: [PATCH 8/9] Replace compile with api --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 15bdd8ec..3fe45e41 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ allprojects { } 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 { From 2888b2d55e40ce70048eaefbc0b432d383bde011 Mon Sep 17 00:00:00 2001 From: davigonz Date: Mon, 30 Apr 2018 12:55:03 +0200 Subject: [PATCH 9/9] Update minSdkVersion --- AndroidManifest.xml | 2 +- test_client/AndroidManifest.xml | 2 +- test_client/tests/AndroidManifest.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 36c89370..81b9494e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -34,7 +34,7 @@ diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml index 1d7ae35e..14de3eab 100644 --- a/test_client/AndroidManifest.xml +++ b/test_client/AndroidManifest.xml @@ -38,7 +38,7 @@ - +