upgrade to gradle 4.1

This commit is contained in:
Mike Schwörer 2017-11-25 14:25:33 +01:00
parent fb2de07f9a
commit 33ec805a5f
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
3 changed files with 18 additions and 4 deletions

View File

@ -1,5 +1,5 @@
android { android {
buildToolsVersion "23.0.1" buildToolsVersion "26.0.2"
compileSdkVersion 20 compileSdkVersion 20
sourceSets { sourceSets {
main { main {

View File

@ -6,9 +6,10 @@ buildscript {
mavenCentral() mavenCentral()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.0' classpath 'com.android.tools.build:gradle:3.0.1'
} }
@ -75,6 +76,19 @@ project(":core") {
} }
} }
subprojects {
if(it.name != "android") { // android plugin is not compatible with java plugin
apply plugin: "java"
apply plugin: "idea"
idea {
module {
scopes.PROVIDED.minus += [configurations.compile]
scopes.COMPILE.plus += [configurations.compile]
}
}
}
}
tasks.eclipse.doLast { tasks.eclipse.doLast {
delete ".project" delete ".project"
} }

View File

@ -1,6 +1,6 @@
#Fri Jun 09 23:06:52 EDT 2017 #Sat Nov 25 13:49:47 CET 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip