From cde266454460d9428bee49fc63a0e9fef826b29e Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Thu, 4 Jan 2018 18:42:46 +0530 Subject: [PATCH 1/2] Update gradle version to 3.0.1 --- source-code/build.gradle | 2 +- source-code/gradle.properties | 3 ++- source-code/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source-code/build.gradle b/source-code/build.gradle index f3f75cbd..82cfd0e2 100644 --- a/source-code/build.gradle +++ b/source-code/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/source-code/gradle.properties b/source-code/gradle.properties index 5b45bc44..d2322eb0 100644 --- a/source-code/gradle.properties +++ b/source-code/gradle.properties @@ -15,4 +15,5 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableAapt2 = false \ No newline at end of file diff --git a/source-code/gradle/wrapper/gradle-wrapper.properties b/source-code/gradle/wrapper/gradle-wrapper.properties index f4b6e795..5471201b 100644 --- a/source-code/gradle/wrapper/gradle-wrapper.properties +++ b/source-code/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 09 10:56:58 IST 2016 +#Thu Jan 04 11:36:03 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From b03a795d243e4388da86756fa19283880e0bff06 Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Thu, 4 Jan 2018 19:04:56 +0530 Subject: [PATCH 2/2] Update gradle version to 3.0.1 --- source-code/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source-code/build.gradle b/source-code/build.gradle index 82cfd0e2..2e635a77 100644 --- a/source-code/build.gradle +++ b/source-code/build.gradle @@ -2,8 +2,8 @@ buildscript { repositories { + google() jcenter() - mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' @@ -15,6 +15,7 @@ buildscript { allprojects { repositories { + google() maven { url "http://dl.bintray.com/populov/maven" } jcenter() mavenCentral()