From 7259c75e8f104112bafef2f543ce5f09e0f0f0ec Mon Sep 17 00:00:00 2001
From: max-klaus <alex.morozov.osm@gmail.com>
Date: Sun, 29 Nov 2020 13:22:02 +0300
Subject: [PATCH] Fix OsmAnd-java publishing

---
 OsmAnd-java/build.gradle | 13 ++++++++++++-
 OsmAnd/build.gradle.lib  |  8 --------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
index 2c5415a84f..d461ea8aff 100644
--- a/OsmAnd-java/build.gradle
+++ b/OsmAnd-java/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'java'
 apply plugin: 'maven-publish'
+apply plugin: 'ivy-publish'
 
 configurations {
 	android
@@ -85,12 +86,22 @@ artifacts {
 }
 
 publishing {
+	repositories {
+		ivy {
+			url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
+		}
+	}
     publications {
         maven(MavenPublication) {
 			artifactId "osmand-base"
             from components.java
         }
-    }
+		ivyJava(IvyPublication) {
+			artifact androidJar {
+				classifier 'android'
+			}
+		}
+	}
 }
 
 dependencies {
diff --git a/OsmAnd/build.gradle.lib b/OsmAnd/build.gradle.lib
index 419f7dd801..39e4a8e56b 100644
--- a/OsmAnd/build.gradle.lib
+++ b/OsmAnd/build.gradle.lib
@@ -339,11 +339,6 @@ task appStart(type: Exec) {
 }
 
 artifacts {
-	archives(file("../OsmAnd-java/build/libs/OsmAnd-java-android-1.0.jar")) {
-		classifier "OsmAnd-java-android"
-		name 'OsmAnd'
-		type "jar"
-	}
 	archives(file("$buildDir/outputs/aar/OsmAnd-legacy-x86-debug.aar")) {
 		classifier 'legacyX86Debug'
 		name 'OsmAnd'
@@ -396,8 +391,6 @@ artifacts {
 	}
 }
 
-// Uploading artifacts to local path
-group = 'net.osmand'
 uploadArchives {
 	repositories.ivy {
 		//    credentials {
@@ -406,7 +399,6 @@ uploadArchives {
 		//   }
 
 		url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
-		version = "1.0-SNAPSHOT"
 	}
 }