diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore index 44d8d7654f..a80b324b3d 100644 --- a/OsmAnd/.gitignore +++ b/OsmAnd/.gitignore @@ -1,3 +1,7 @@ +gradle +gradlew +gradlew.bat + valgrind/ bin/ dist/ diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index f6ba50073e..63fb2c965e 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -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" diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties index 888b636da6..8fd374a9b4 100644 --- a/OsmAnd/project.properties +++ b/OsmAnd/project.properties @@ -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 diff --git a/OsmAndCore-sample/build.gradle b/OsmAndCore-sample/build.gradle index 6bfbe775b0..1060834a76 100644 --- a/OsmAndCore-sample/build.gradle +++ b/OsmAndCore-sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion "25.0.0" dexOptions { jumboMode true diff --git a/build.gradle b/build.gradle index 73a0b2433f..5cad9d08ae 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } }