Update gradle to 4 and gradle compile plugin

This commit is contained in:
Victor Shcherb 2017-07-10 01:26:18 +02:00
parent dd6b8ff25f
commit ae4757361c
5 changed files with 15 additions and 7 deletions

4
OsmAnd/.gitignore vendored
View file

@ -1,3 +1,7 @@
gradle
gradlew
gradlew.bat
valgrind/
bin/
dist/

View file

@ -385,10 +385,10 @@ dependencies {
// compile project(':eclipse-compile:design')
// compile project(':eclipse-compile:cardview')
// compile project(':eclipse-compile:gridlayout')
compile 'com.android.support:gridlayout-v7:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:gridlayout-v7:26.+'
compile 'com.android.support:cardview-v7:26.+'
compile 'com.android.support:appcompat-v7:26.+'
compile 'com.android.support:design:26.+'
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"

View file

@ -10,7 +10,7 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-23
target=android-26
dex.force.jumbo=true
android.library.reference.1=../eclipse-compile/appcompat
android.library.reference.2=../eclipse-compile/design

View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
buildToolsVersion "25.0.0"
dexOptions {
jumboMode true

View file

@ -1,9 +1,13 @@
buildscript {
repositories {
maven {
// Google Maven Repository
url 'https://maven.google.com'
}
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.+'
classpath 'com.google.gms:google-services:3.0.0'
}
}