Stop distributing and publishing obsolete artifacts
Keep stdlib-jreN dist for tests only. #KT-23799
This commit is contained in:
@@ -5,7 +5,6 @@ apply plugin: 'pill-configurable'
|
|||||||
|
|
||||||
configureJvm6Project(project)
|
configureJvm6Project(project)
|
||||||
configureDist(project)
|
configureDist(project)
|
||||||
configurePublishing(project)
|
|
||||||
ext.javaHome = JDK_17
|
ext.javaHome = JDK_17
|
||||||
|
|
||||||
pill {
|
pill {
|
||||||
@@ -44,8 +43,14 @@ artifacts {
|
|||||||
archives javadocJar
|
archives javadocJar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task distForTest(type: Copy) {
|
||||||
|
rename "-${java.util.regex.Pattern.quote(version)}", ''
|
||||||
|
from jar
|
||||||
|
into distDir
|
||||||
|
}
|
||||||
|
|
||||||
dist {
|
dist {
|
||||||
from (jar, sourcesJar)
|
dependsOn(distForTest)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ apply plugin: 'pill-configurable'
|
|||||||
|
|
||||||
configureJvm6Project(project)
|
configureJvm6Project(project)
|
||||||
configureDist(project)
|
configureDist(project)
|
||||||
configurePublishing(project)
|
|
||||||
ext.javaHome = JDK_18
|
ext.javaHome = JDK_18
|
||||||
ext.jvmTarget = "1.8"
|
ext.jvmTarget = "1.8"
|
||||||
|
|
||||||
@@ -47,8 +46,14 @@ artifacts {
|
|||||||
archives javadocJar
|
archives javadocJar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task distForTest(type: Copy) {
|
||||||
|
rename "-${java.util.regex.Pattern.quote(version)}", ''
|
||||||
|
from jar
|
||||||
|
into distDir
|
||||||
|
}
|
||||||
|
|
||||||
dist {
|
dist {
|
||||||
from (jar, sourcesJar)
|
dependsOn(distForTest)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||||
|
|||||||
@@ -352,10 +352,6 @@ dist {
|
|||||||
[mergedJar, distSourcesJar].forEach {
|
[mergedJar, distSourcesJar].forEach {
|
||||||
rename("dist-", "")
|
rename("dist-", "")
|
||||||
from(it)
|
from(it)
|
||||||
// legacy
|
|
||||||
from(it) {
|
|
||||||
rename("kotlin-stdlib-js", 'kotlin-jslib')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -150,11 +150,6 @@ dist {
|
|||||||
from(it) {
|
from(it) {
|
||||||
rename('dist-', '')
|
rename('dist-', '')
|
||||||
}
|
}
|
||||||
// legacy
|
|
||||||
from(it) {
|
|
||||||
rename('dist-', '')
|
|
||||||
rename('kotlin-stdlib', 'kotlin-runtime')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
from (configurations.compile) {
|
from (configurations.compile) {
|
||||||
include 'annotations*.jar'
|
include 'annotations*.jar'
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ description 'Kotlin Runtime (deprecated, use kotlin-stdlib artifact instead)'
|
|||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
|
// TODO: Drop this project entirely
|
||||||
|
|
||||||
configureJvm6Project(project)
|
configureJvm6Project(project)
|
||||||
configureDist(project)
|
|
||||||
configurePublishing(project)
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
|
compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
|
||||||
|
|||||||
Reference in New Issue
Block a user