Drop obsolete artifact kotlin-runtime

Remove suppresses used to compile some parts of stdlib
as a non-multiplatform project.
This commit is contained in:
Ilya Gorbunov
2019-02-14 20:31:59 +03:00
parent 8ed2facc8c
commit 6bcd112062
14 changed files with 3 additions and 1429 deletions
@@ -3,7 +3,6 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
package kotlin.reflect
/**
@@ -3,8 +3,6 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
package kotlin.reflect
/**
@@ -14,7 +14,7 @@
* limitations under the License.
*/
@file:Suppress("IMPLEMENTING_FUNCTION_INTERFACE", /* for building kotlin-runtime */ "ACTUAL_WITHOUT_EXPECT")
@file:Suppress("IMPLEMENTING_FUNCTION_INTERFACE")
package kotlin.reflect
/**
@@ -3,8 +3,6 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
package kotlin
public actual open class NoWhenBranchMatchedException : RuntimeException {
@@ -3,7 +3,7 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
package kotlin
@@ -3,8 +3,6 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
package kotlin
public actual class UninitializedPropertyAccessException : RuntimeException {
@@ -3,7 +3,6 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
package kotlin.jvm
import kotlin.annotation.AnnotationTarget.*
@@ -3,8 +3,6 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
package kotlin.jvm
import kotlin.reflect.KClass
@@ -3,7 +3,7 @@
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
package kotlin.text
-59
View File
@@ -1,59 +0,0 @@
description 'Kotlin Runtime (deprecated, use kotlin-stdlib artifact instead)'
apply plugin: 'kotlin'
// TODO: Drop this project entirely
configureJvm6Project(project)
configurations {
builtins
}
dependencies {
compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
builtins project(':core:builtins')
}
sourceSets {
main {
if(!System.properties.'idea.active') {
java {
srcDir "${rootDir}/core/builtins/src"
srcDir "${rootDir}/libraries/stdlib/jvm/runtime"
}
}
}
}
jar {
dependsOn(configurations.builtins)
manifestAttributes(manifest, project, 'Main')
from {
zipTree(configurations.builtins.asPath)
}
}
sourcesJar {
classifier = 'sources'
from sourceSets.main.kotlin
from "${rootDir}/core/builtins/native"
}
artifacts {
archives sourcesJar
archives javadocJar
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xnormalize-constructor-calls=enable",
"-Xmulti-platform",
"-cp", "${rootDir}/dist/builtins",
"-module-name", project.name
]
}
}
@@ -19,8 +19,6 @@ dependencies {
testArtifacts project(':kotlin-stdlib-jdk7')
testArtifacts project(':kotlin-stdlib-jdk8')
testArtifacts project(':kotlin-reflect')
// legacy
testArtifacts project(':kotlin-runtime')
}
sourceSets {
@@ -17,10 +17,6 @@ class RuntimePublicAPITest {
@[Rule JvmField]
val testName = TestName()
@Test fun kotlinRuntime() {
snapshotAPIAndCompare("../../stdlib/runtime/build/libs", "kotlin-runtime", listOf("kotlin.jvm.internal"))
}
@Test fun kotlinStdlibRuntimeMerged() {
snapshotAPIAndCompare("../../stdlib/jvm/build/libs", "kotlin-stdlib", listOf("kotlin.jvm.internal"))
}
-3
View File
@@ -236,7 +236,6 @@ if (isJpsBuild) {
":tools:binary-compatibility-validator",
":tools:kotlin-stdlib-js-merger",
":tools:kotlin-stdlib-gen",
":kotlin-runtime",
":include:kotlin-stdlib-common-sources"
@@ -251,8 +250,6 @@ if (isJpsBuild) {
project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File
project(':tools:kotlin-stdlib-js-merger').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-js-merger" as File
project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File
project(':kotlin-runtime').projectDir = "$rootDir/libraries/stdlib/runtime" as File
}
rootProject.name = "kotlin"