Delete deprecated jars & update build tools

OsmAnd/.gitignore

@@ -6,6 +6,11 @@ gradlew.bat
 aarDependencies 
 libs/android*.jar
 libs/com.*.jar
+libs/org.*.jar
+libs/commons-logging-commons-logging-api-1.1.jar
+libs/fr.univ-valenciennes-bzip2-1.0.jar
+libs/it.unibo.alice.tuprolog-tuprolog-3.2.1.jar
+
 valgrind/
 bin/
 dist/

OsmAnd/build.gradle

@@ -193,6 +193,7 @@ android {
 			signingConfig signingConfigs.publishing
 		}
 	}
+
 }
 
 def replaceNoTranslate(line) {
@@ -205,12 +206,6 @@ def replaceNoTranslate(line) {
 	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
 	}
-//	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION")) {
-//		return line.replaceAll(">[^<]*<", ">" + System.getenv("APK_VERSION") + "<")
-//	}
-//	if (line.contains("\"app_version_suffix\"") && System.getenv("APK_VERSION_SUFFIX")) {
-//		return line.replaceAll("</", System.getenv("APK_VERSION_SUFFIX") + "</")
-//	}
 	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")
 	}
@@ -421,7 +416,7 @@ dependencies {
 // compile 'com.ibm.icu:icu4j:50.1' 
 // compile 'net.sf.trove4j:trove4j:3.0.3'
     
-
+	
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"

OsmAnd/project.properties

@@ -26,3 +26,11 @@ android.library.reference.11=aarDependencies/com.android.support-support-v4-27.1
 android.library.reference.12=aarDependencies/com.android.support-support-vector-drawable-27.1.0
 android.library.reference.13=aarDependencies/com.android.support-animated-vector-drawable-27.1.0
 android.library.reference.14=aarDependencies/com.android.support-multidex-1.0.1
+android.library.reference.15=aarDependencies/android.arch.lifecycle-runtime-1.1.0
+android.library.reference.16=aarDependencies/com.android.support-support-core-ui-27.1.0
+android.library.reference.17=aarDependencies/com.android.support-support-core-utils-27.1.0
+android.library.reference.18=aarDependencies/com.android.support-support-fragment-27.1.0
+android.library.reference.19=aarDependencies/android.arch.lifecycle-viewmodel-1.1.0
+android.library.reference.20=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0
+android.library.reference.21=aarDependencies/com.android.support-transition-27.1.0
+android.library.reference.22=aarDependencies/com.android.support-support-media-compat-27.1.0

OsmAnd/src/net/osmand/PlatformUtil.java

@@ -31,6 +31,23 @@ public class PlatformUtil {
 			this.fullName = name;
 			this.name = fullName.substring(fullName.lastIndexOf('.') + 1);
 		}
+		
+		@Override
+		public void trace(Object message) {
+			if(isTraceEnabled()){
+				android.util.Log.d(TAG, name + " " + message); //$NON-NLS-1$
+			}
+		}
+		
+		@Override
+		public void trace(Object message, Throwable t) {
+			if(isTraceEnabled()){
+				android.util.Log.d(TAG, name + " " + message, t); //$NON-NLS-1$
+			}
+		}
+
+		
+		
 		@Override
 		public void debug(Object message) {
 			if(isDebugEnabled()){
@@ -87,12 +104,19 @@ public class PlatformUtil {
 				android.util.Log.i(TAG, name + " " + message, t); //$NON-NLS-1$
 			}
 		}
+		
+		@Override
+		public boolean isTraceEnabled() {
+			return android.util.Log.isLoggable(TAG, android.util.Log.VERBOSE);
+		}
+
+
 
 		@Override
 		public boolean isDebugEnabled() {
 			// For debur purposes always true
-//			return android.util.Log.isLoggable(NATIVE_TAG, android.util.Log.DEBUG);
+			return android.util.Log.isLoggable(TAG, android.util.Log.DEBUG);
-			return true;
+//			return true;
 		}
 
 		@Override

build.gradle

@@ -7,10 +7,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.+'
+        //classpath 'com.android.tools.build:gradle:2.+'
+        classpath 'com.android.tools.build:gradle:3.1.+'
         classpath 'com.google.gms:google-services:3.0.0'
-	classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1'
+	    classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1'
-
     }
 }
 apply plugin: 'com.github.ksoichiro.eclipse.aar'