From 5eb27b755342d7acdf493959fb0f1d0bdb9bbe2b Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 23 Jan 2019 12:19:34 +0200 Subject: [PATCH] Update Gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- vtm-android-gdx/build.gradle | 4 ++-- vtm-android/build.gradle | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index f1b1beb8..07d594a0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a4163a4..4e974715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle index df34010e..4f906c25 100644 --- a/vtm-android-gdx/build.gradle +++ b/vtm-android-gdx/build.gradle @@ -40,11 +40,11 @@ android.libraryVariants.all { variant -> return def jar = project.tasks.create "jar${name.capitalize()}", Jar - jar.dependsOn variant.javaCompiler + jar.dependsOn variant.javaCompileProvider jar.exclude '**/BuildConfig.class' jar.exclude '**/R.class' jar.exclude '**/R$*.class' - jar.from variant.javaCompiler.destinationDir + jar.from variant.javaCompileProvider.get().destinationDir artifacts.add('archives', jar) file('natives').eachDir() { dir -> diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index f3b681ce..ce6c7d10 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -41,11 +41,11 @@ android.libraryVariants.all { variant -> return def jar = project.tasks.create "jar${name.capitalize()}", Jar - jar.dependsOn variant.javaCompiler + jar.dependsOn variant.javaCompileProvider jar.exclude '**/BuildConfig.class' jar.exclude '**/R.class' jar.exclude '**/R$*.class' - jar.from variant.javaCompiler.destinationDir + jar.from variant.javaCompileProvider.get().destinationDir artifacts.add('archives', jar) file('natives').eachDir() { dir ->