diff --git a/android/build.gradle b/android/build.gradle index b78a0b86c..a443fad34 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/android/gradle.properties b/android/gradle.properties index 1d3591c8a..fab0e33e6 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -15,4 +15,9 @@ # 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 + +# Due to a known issue with Android Gradle Plugin versions 3.0.* and 3.1.*, +# the configuration on demand should be disabled. +# https://developer.android.com/studio/known-issues +org.gradle.configureondemand=false \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index f9adae100..79d846136 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/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.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip diff --git a/android/widgets/build.gradle b/android/widgets/build.gradle index 7768da644..d2cdc16c2 100644 --- a/android/widgets/build.gradle +++ b/android/widgets/build.gradle @@ -11,7 +11,7 @@ def computeCompileSdkVersion () { return compileSdk } else { - return 25 + return 27 } } @@ -20,7 +20,16 @@ def computeBuildToolsVersion() { return buildToolsVersion } else { - return "25.0.2" + return "27.0.3" + } +} + +def computeSupportVersion() { + if(project.hasProperty("supportVersion")) { + return supportVersion + } + else { + return "27.1.1" } } @@ -29,7 +38,7 @@ def computeTargetSdkVersion() { return targetSdk } else { - return 25 + return 27 } } @@ -53,7 +62,7 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:support-v4:+' + compile 'com.android.support:support-v4:' + computeSupportVersion() } task cleanBuildDir (type: Delete) {