diff --git a/publish.gradle b/publish.gradle index 4a031eb..6dca06e 100644 --- a/publish.gradle +++ b/publish.gradle @@ -2,26 +2,25 @@ apply plugin: 'com.jfrog.bintray' apply from: "maven.publish.gradle" -ext { - projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}" -} - bintray { user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') filesSpec { from "${buildDir}/publications/" eachFile { + String directorySubname = it.getFile().parentFile.name if (it.getName() == "module.json") { - File file = it.getFile() - String directorySubname = file.parentFile.name if (directorySubname == "kotlinMultiplatform") { it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module") } else { it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module") } } else { - it.exclude() + if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") { + it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom") + } else { + it.exclude() + } } } into "${project.group}".replace(".", "/")