Fix OsmAnd-java publishing

This commit is contained in:
max-klaus 2020-11-29 13:22:02 +03:00
parent 5f4e4bde12
commit 7259c75e8f
2 changed files with 12 additions and 9 deletions

View file

@ -1,5 +1,6 @@
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'ivy-publish'
configurations { configurations {
android android
@ -85,11 +86,21 @@ artifacts {
} }
publishing { publishing {
repositories {
ivy {
url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
}
}
publications { publications {
maven(MavenPublication) { maven(MavenPublication) {
artifactId "osmand-base" artifactId "osmand-base"
from components.java from components.java
} }
ivyJava(IvyPublication) {
artifact androidJar {
classifier 'android'
}
}
} }
} }

View file

@ -339,11 +339,6 @@ task appStart(type: Exec) {
} }
artifacts { 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")) { archives(file("$buildDir/outputs/aar/OsmAnd-legacy-x86-debug.aar")) {
classifier 'legacyX86Debug' classifier 'legacyX86Debug'
name 'OsmAnd' name 'OsmAnd'
@ -396,8 +391,6 @@ artifacts {
} }
} }
// Uploading artifacts to local path
group = 'net.osmand'
uploadArchives { uploadArchives {
repositories.ivy { repositories.ivy {
// credentials { // credentials {
@ -406,7 +399,6 @@ uploadArchives {
// } // }
url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./" url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
version = "1.0-SNAPSHOT"
} }
} }