diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
index d83364b02b..564df1bb7d 100644
--- a/OsmAnd-java/build.gradle
+++ b/OsmAnd-java/build.gradle
@@ -82,8 +82,8 @@ dependencies {
 	testImplementation 'junit:junit:4.12'
 	testImplementation 'com.google.code.gson:gson:2.8.2'
 	testImplementation 'org.hamcrest:hamcrest-core:1.3'
-	implementation 'commons-logging:commons-logging:1.2'
-	implementation 'org.json:json:20171018'
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
+	implementation group: 'org.json', name: 'json', version: '20171018'
 	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
 	implementation 'org.beanshell:bsh-core:2.0b4'
 	implementation 'org.apache.commons:commons-compress:1.17'
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 7fc9fe8726..8695bd75c6 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -66,12 +66,6 @@ android {
 		warningsAsErrors false
 	}
 
-	packagingOptions {
-		exclude '/META-INF/CONTRIBUTORS.md'
-		exclude '/META-INF/LICENSE.md'
-		exclude '/META-INF/NOTICE.md'
-	}
-
 	// This is from OsmAndCore_android.aar - for some reason it's not inherited
 	aaptOptions {
 		// Don't compress any embedded resources
@@ -379,7 +373,7 @@ dependencies {
 		implementation 'com.google.firebase:firebase-messaging:12.0.1'
 		implementation 'com.google.firebase:firebase-iid:12.0.1'
 		implementation 'com.google.firebase:firebase-config:12.0.1'
-		implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
+		implementation 'com.facebook.android:facebook-android-sdk:4.31.0'	
 	}
 	implementation 'com.android.support:multidex:1.0.1'
 	implementation 'com.android.support:gridlayout-v7:27.1.1'
@@ -387,8 +381,9 @@ dependencies {
 	implementation 'com.android.support:appcompat-v7:27.1.1'
 	implementation 'com.android.support:design:27.1.1'
 	implementation 'com.android.support:customtabs:27.1.1'
-	implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
-	implementation 'commons-logging:commons-logging:1.2'
+	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
+
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
 	implementation 'commons-codec:commons-codec:1.11'
 	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
 	implementation 'org.beanshell:bsh-core:2.0b4'
@@ -396,24 +391,28 @@ dependencies {
 	implementation 'com.moparisthebest:junidecode:0.1.1'
 	implementation 'org.immutables:gson:2.5.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'
+
 	implementation 'com.squareup.picasso:picasso:2.71828'
 	// JS core
-	implementation 'org.mozilla:rhino:1.7.9'
-	// size restrictions
-	// implementation 'com.ibm.icu:icu4j:50.1'
-	// implementation 'net.sf.trove4j:trove4j:3.0.3'
-	qtcoreImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
-	qtcoredebugImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
+	implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9'
+
+// size restrictions
+// implementation 'com.ibm.icu:icu4j:50.1' 
+// implementation 'net.sf.trove4j:trove4j:3.0.3'
+
+	qtcoreImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
+	qtcoredebugImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
+
 	legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
 	qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 	qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-	implementation('com.getkeepsafe.taptargetview:taptargetview:1.12.0') {
+	implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
 		exclude group: 'com.android.support'
 	}
 	implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
-	implementation('com.github.HITGIF:TextFieldBoxes:1.3.5') {
+	implementation ("com.github.HITGIF:TextFieldBoxes:1.3.5"){
 		exclude group: 'com.android.support'
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 5230a4c9b3..3bb8ab935d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # 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
+# 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