Revert "Revert "Update to gradle plugin v2.0""

This reverts commit 0d64d52f48.

OsmAnd/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
 
 android {
 	compileSdkVersion 23
-	buildToolsVersion "23.0.1"
+	buildToolsVersion "23.0.2"
 
 	signingConfigs {
 		development {
@@ -91,58 +91,58 @@ android {
 	productFlavors {
 		// ABI
 		armv7 {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "armeabi-v7a"
 			}
 		}
 		armv5 {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "armeabi"
 			}
 		}
 		x86 {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "x86"
 			}
 		}
 		mips {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "mips"
 			}
 		}
 		fat {
-			flavorDimension "abi"
+			dimension "abi"
 		}
 
 		// Version
 		freedev {
-			flavorDimension "version"
+			dimension "version"
 			applicationId "net.osmand.dev"
 		}
 		free {
-			flavorDimension "version"
+			dimension "version"
 			applicationId "net.osmand"
 		}
 		full {
-			flavorDimension "version"
+			dimension "version"
 			applicationId "net.osmand.plus"
 		}
 
 		// CoreVersion
 		legacy {
-			flavorDimension "coreversion"
+			dimension "coreversion"
 		}
 
 		qtcore {
-			flavorDimension "coreversion"
+			dimension "coreversion"
 		}
 
 		qtcoredebug {
-			flavorDimension "coreversion"
+			dimension "coreversion"
 		}
 	}
 

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 

gradle.properties

@@ -1,18 +1,16 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Settings specified in this file will override any Gradle settings
-# configured through the IDE.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+#Fri Apr 08 18:47:31 EEST 2016
+android.useDeprecatedNdk=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 01 10:23:06 EEST 2014
+#Fri Apr 08 17:52:02 EEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip