Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update gradle plugin to 3.1.3 and Enable D8

Browse source
This commit is contained in:
crimean 2018-06-08 10:37:25 +03:00
parent e4e65b8890
commit f09d3d2b78
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build.gradle
View file

@ -1,23 +1,20 @@
buildscript { buildscript {
ext.kotlin_version = '1.2.41' ext.kotlin_version = '1.2.41'
repositories { repositories {
maven { google()
// Google Maven Repository
url 'https://maven.google.com'
}
mavenCentral() mavenCentral()
jcenter() jcenter()
} }
dependencies { dependencies {
//classpath 'com.android.tools.build:gradle:2.+' //classpath 'com.android.tools.build:gradle:2.+'
classpath 'com.android.tools.build:gradle:3.1.+' classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.google.gms:google-services:3.0.0' classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1' classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
apply plugin: 'com.github.ksoichiro.eclipse.aar' apply plugin: 'com.github.ksoichiro.eclipse.aar'
allprojects { allprojects {
repositories { repositories {
@ -28,9 +25,7 @@ allprojects {
artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
} }
} }
maven { google()
url "https://maven.google.com"
}
mavenCentral() mavenCentral()
jcenter() jcenter()
maven { maven {

4
gradle.properties
View file

@ -14,5 +14,7 @@
# org.gradle.parallel=true # org.gradle.parallel=true
#Fri Apr 08 18:47:31 EEST 2016 #Fri Apr 08 18:47:31 EEST 2016
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
# for enableD8=true min sdk must be > 22 # for enableD8=true min sdk must be > 22
android.enableD8=false # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
# android.enableD8=false