From 6d6d3631f3700504e4787f7666ee5840cfa7292c Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Mon, 2 Feb 2015 17:54:43 +0200
Subject: [PATCH] Fix

---
 OsmAnd-java/OsmAnd-java.iml | 107 ------------------------------------
 OsmAnd-java/build.gradle    |  21 ++++---
 OsmAnd/build.gradle         |  23 ++------
 build.gradle                |   2 -
 settings.gradle             |   1 +
 5 files changed, 20 insertions(+), 134 deletions(-)
 delete mode 100644 OsmAnd-java/OsmAnd-java.iml
 mode change 100755 => 100644 OsmAnd/build.gradle

diff --git a/OsmAnd-java/OsmAnd-java.iml b/OsmAnd-java/OsmAnd-java.iml
deleted file mode 100644
index 8ae6d95a2c..0000000000
--- a/OsmAnd-java/OsmAnd-java.iml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/libs/bsh-core-2.0b4.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/bzip2-20090327.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/commons-logging-1.1.1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/json-20090211.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/junidecode-0.1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/kxml2-2.3.0.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/tuprolog.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/icu4j-49_1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/libs/gnu-trove-osmand.jar!/" />
-    <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
-    <orderEntry type="module-library">
-      <library name="bsh-core-2.0b4.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/bsh-core-2.0b4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="bzip2-20090327.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/bzip2-20090327.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="commons-logging-1.1.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="json-20090211.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/json-20090211.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="junidecode-0.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/junidecode-0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="kxml2-2.3.0.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/kxml2-2.3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="tuprolog.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/tuprolog.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="icu4j-49_1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/icu4j-49_1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="gnu-trove-osmand.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/gnu-trove-osmand.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>
\ No newline at end of file
diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
index a94a05cccb..69a76ae3e8 100644
--- a/OsmAnd-java/build.gradle
+++ b/OsmAnd-java/build.gradle
@@ -1,15 +1,20 @@
 apply plugin: 'java'
 
+sourceSets {
+	main {
+		java {
+			srcDirs = [
+					"src"
+			]
+		}
+	}
+}
+
+// This is Android-specific
 jar {
-    sourceSets {
-        main {
-            java {
-                srcDirs = ["src"]
-            }
-        }
-    }
+	exclude "**/PlatformUtil.*"
 }
 
 dependencies {
-    compile fileTree(dir: "libs", include: ["*.jar"])
+	compile fileTree(dir: "libs", include: ["*.jar"])
 }
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
old mode 100755
new mode 100644
index 0f7e6cc252..77b0670aed
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -73,30 +73,18 @@ android {
 			jni.srcDirs = []
 			jniLibs.srcDirs = ["libs"]
 			aidl.srcDirs = ["src"]
-			java.srcDirs = [
-					"src",
-					fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java")
-			]
-			resources.srcDirs = [
-					"src"
-			]
+			java.srcDirs = ["src"]
+			resources.srcDirs = ["src"]
 			renderscript.srcDirs = ["src"]
-			res.srcDirs = [
-					'res'
-
-			]
-			assets.srcDirs = [
-					'assets'
-			]
+			res.srcDirs = ["res"]
+			assets.srcDirs = ["assets"]
 		}
 		free {
 			manifest.srcFile "AndroidManifest-free.xml"
 		}
 
 		legacy {
-			jniLibs.srcDirs = [
-					"libgnustl"
-			]
+			jniLibs.srcDirs = ["libgnustl"]
 		}
 	}
 
@@ -311,6 +299,7 @@ repositories {
 }
 
 dependencies {
+	compile project(":OsmAnd-java")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],
diff --git a/build.gradle b/build.gradle
index 248e71b895..ae46af1e9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()
diff --git a/settings.gradle b/settings.gradle
index 3b89c6c76b..debb02529f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':OsmAnd'
+include ':OsmAnd-java'