Rename packages

OsmAnd-java/.classpath

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test/java"/>
-	<classpathentry kind="src" path="test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="libs/bsh-core-2.0b4.jar"/>
-	<classpathentry kind="lib" path="libs/bzip2-20090327.jar"/>
-	<classpathentry kind="lib" path="libs/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="libs/json-20090211.jar"/>
-	<classpathentry kind="lib" path="libs/junidecode-0.1.jar"/>
-	<classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/>
-	<classpathentry kind="lib" path="libs/tuprolog.jar"/>
-	<classpathentry kind="lib" path="libs/icu4j-49_1_patched.jar"/>
-	<classpathentry kind="lib" path="libs/gnu-trove-osmand.jar"/>
-	<classpathentry kind="lib" path="test/libs/gson-2.6.2.jar"/>
-	<classpathentry kind="lib" path="test/libs/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="test/libs/junit-4.12.jar"/>
-	<classpathentry kind="lib" path="libs/jts-core-1.14.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

OsmAnd-java/.gitignore

@@ -1,11 +1,10 @@
 bin
-c-src
-OsmAnd-core.jar
-protobuf-src/com
-OsmAnd-core-android.jar
+build
 src/net/osmand/core/jni/*
 result.*
-
+.settings
+.project
+.classpath
 # Android Studio
 /.idea
 *.iml

OsmAnd-java/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>OsmAnd-java</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<variableList>
-		<variable>
-			<name>OSMAND_TRUNK</name>
-			<value>$%7BPARENT-1-PROJECT_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>

OsmAnd-java/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

OsmAnd-java/build.gradle

@@ -1,21 +1,3 @@
-apply plugin: 'java'
-apply plugin: 'application'
-mainClassName = "net.osmand.util.GeoPointParserUtil"
-compileJava.options.encoding = 'UTF-8'
-
-tasks.withType(JavaCompile) {
-	sourceCompatibility = "1.7"
-	targetCompatibility = "1.7"
-}
-
-sourceSets {
-	main {
-		java {
-			srcDirs = ["src"]
-		}
-	}
-}
-
 configurations {
 	android
 }
@@ -31,6 +13,10 @@ artifacts {
 }
 
 dependencies {
-	compile fileTree(dir: "libs", include: ["*.jar"])
+	testImplementation 'junit:junit:4.12'
+	testImplementation 'com.google.code.gson:gson:2.8.2'
+	testImplementation 'org.hamcrest:hamcrest-core:1.3'
+
+	implementation fileTree(dir: "libs", include: ["*.jar"])
 }
 

OsmAnd-java/run_tests.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ ! -d bin ];
- then
-    echo "Building OsmAnd-java...";
-    ant build
-fi
-echo "Starting tests..."
-ant junits
-echo "Results can be found in result.txt file."