From 05f21739b3eb679c11cbdedb45f47992f78fdfc1 Mon Sep 17 00:00:00 2001 From: Xavier Rubio Jansana Date: Fri, 15 Mar 2019 14:54:44 +0100 Subject: [PATCH] Updates Gradle dependencies so it is compatible with Gradle 5.x --- LibRootbeerFresh/build.gradle | 8 +++++--- app/build.gradle | 4 ++-- gradle.properties | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/LibRootbeerFresh/build.gradle b/LibRootbeerFresh/build.gradle index c1d75c2..a54438e 100644 --- a/LibRootbeerFresh/build.gradle +++ b/LibRootbeerFresh/build.gradle @@ -38,7 +38,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.3' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' @@ -140,8 +140,10 @@ artifacts { archives sourcesJar } -task findConventions << { - println project.getConvention() +task findConventions { + doLast { + println project.getConvention() + } } apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/app/build.gradle b/app/build.gradle index e40c324..1e6d8a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.3' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' @@ -24,7 +24,7 @@ android { minSdkVersion minSdkVer targetSdkVersion targetSdkVer versionCode 10 - versionName "0.10" + versionName "0.0.10" } //check if the keystore details are defined in gradle.properties (this is so the key is not in github) diff --git a/gradle.properties b/gradle.properties index deaee06..8e5d32f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx1536m # 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 + VERSION_NAME=0.0.10 VERSION_CODE=10 GROUP=com.kimchangyoun