Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd-java/build.gradle

@@ -3,16 +3,23 @@ apply plugin: 'java'
 sourceSets {
 	main {
 		java {
-			srcDirs = [
-					"src"
-			]
+			srcDirs = ["src"]
 		}
 	}
 }
 
-// This is Android-specific
-jar {
-	exclude "**/PlatformUtil.*"
+configurations {
+	android
+}
+
+task androidJar(type: Jar) {
+	appendix = "android"
+	from sourceSets.main.output
+	exclude("**/PlatformUtil.*")
+}
+
+artifacts {
+	android androidJar
 }
 
 dependencies {

OsmAnd/build.gradle

@@ -299,7 +299,7 @@ repositories {
 }
 
 dependencies {
-	compile project(":OsmAnd-java")
+	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],

settings.gradle

@@ -1,2 +1,2 @@
-include ':OsmAnd'
 include ':OsmAnd-java'
+include ':OsmAnd'