Коммит 340800a9 создал по автору Leonid Stashevsky's avatar Leonid Stashevsky Зафиксировано автором Leonid.Stashevsky
Просмотр файлов

Update gradle to 4.10, fix publishing names

владелец 6f0a7592
Скрыть пробелы
Построчно Рядом
build.gradle
Просмотр файла @ 340800a9
...@@ -57,7 +57,6 @@ allprojects { ...@@ -57,7 +57,6 @@ allprojects {
maven { url "https://dl.bintray.com/kotlin/kotlinx/" } maven { url "https://dl.bintray.com/kotlin/kotlinx/" }
maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
jcenter() jcenter()
} }
......
gradle.properties
Просмотр файла @ 340800a9
...@@ -35,7 +35,7 @@ nodejs_version=10.14.1 ...@@ -35,7 +35,7 @@ nodejs_version=10.14.1
npm_version=6.4.1 npm_version=6.4.1
# publishing # publishing
bintray_plugin_version=1.8.2-SNAPSHOT bintray_plugin_version=1.8.4-jetbrains-3
# third-party # third-party
gson_version=2.8.5 gson_version=2.8.5
......
gradle/publish.gradle
Просмотр файла @ 340800a9
...@@ -17,7 +17,6 @@ task stubDokka(type: Jar) { ...@@ -17,7 +17,6 @@ task stubDokka(type: Jar) {
def selectArtifactId(project, type, defaultName) { def selectArtifactId(project, type, defaultName) {
def name = project.name def name = project.name
def OBSOLETE = "$name-$type-obsolete"
def isCommon = project.ext.has("commonStructure") def isCommon = project.ext.has("commonStructure")
def commonIsRoot = project.ext.has("commonStructure") && project.ext.commonStructure def commonIsRoot = project.ext.has("commonStructure") && project.ext.commonStructure
def hasNative = project.ext.has("hasNative") && project.ext.hasNative def hasNative = project.ext.has("hasNative") && project.ext.hasNative
...@@ -28,7 +27,7 @@ def selectArtifactId(project, type, defaultName) { ...@@ -28,7 +27,7 @@ def selectArtifactId(project, type, defaultName) {
return commonIsRoot ? "$name" : "$name-common" return commonIsRoot ? "$name" : "$name-common"
break break
case 'kotlinMultiplatform': case 'kotlinMultiplatform':
if (!hasNative) return OBSOLETE if (!hasNative) return defaultName
return isCommon ? "$name-native" : "$name" return isCommon ? "$name-native" : "$name"
break break
case 'jvm': case 'jvm':
...@@ -109,17 +108,12 @@ publishing { ...@@ -109,17 +108,12 @@ publishing {
} }
if (target.platformType.name != 'native') { if (target.platformType.name != 'native') {
publication.gradleModuleMetadataFile = null publication.moduleDescriptorGenerator = null
tasks.matching { it.name == "generateMetadataFileFor${name.capitalize()}Publication" }.all {
onlyIf { false }
}
} else { } else {
publication.artifact emptyJar publication.artifact emptyJar
} }
} }
} }
publications.removeIf { it.artifactId.endsWith("-obsolete") }
} }
bintray { bintray {
......
gradle/wrapper/gradle-wrapper.properties
Просмотр файла @ 340800a9
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать