diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java index 3986c958749..240b6a13da0 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java @@ -20,8 +20,6 @@ public class ForTestCompileRuntime { private static volatile SoftReference reflectJarClassLoader = new SoftReference<>(null); private static volatile SoftReference runtimeJarClassLoader = new SoftReference<>(null); private static volatile SoftReference coroutinesJarClassLoader = new SoftReference<>(null); - private static volatile SoftReference unsignedTypesJarClassLoader = new SoftReference<>(null); - private static volatile SoftReference unsignedTypesAndReflectJarClassLoader = new SoftReference<>(null); private static volatile SoftReference coroutinesAndReflectJarClassLoader = new SoftReference<>(null); @NotNull @@ -34,11 +32,6 @@ public class ForTestCompileRuntime { return assertExists(new File("dist/kotlin-stdlib-coroutines.jar")); } - @NotNull - public static File unsignedTypesJarForTests() { - return assertExists(new File("dist/kotlin-stdlib-unsigned.jar")); - } - @NotNull public static File minimalRuntimeJarForTests() { return assertExists(new File("dist/kotlin-stdlib-minimal-for-test.jar")); diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 7d0c3385467..6f78a6ef612 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -47,8 +47,6 @@ sourceSets { srcDir 'java9' } } - unsigned { - } } configurations { @@ -68,8 +66,6 @@ dependencies { coroutinesTestCompile sourceSets.coroutines.output coroutinesTestCompile project(':kotlin-test:kotlin-test-junit') - - unsignedCompile sourceSets.main.output } jar { @@ -77,7 +73,6 @@ jar { from("${rootDir}/dist/builtins") from sourceSets.experimental.output from sourceSets.coroutines.output - from sourceSets.unsigned.output // TODO: enable as soon as this doesn't cause D8/DX to crash // from sourceSets.java9.output } @@ -89,13 +84,6 @@ task coroutinesJar(type: Jar) { project.configure(manifest) { attributes 'Kotlin-Version': '1.3' } } -task unsignedJar(type: Jar) { - version = null - classifier = 'unsigned' - manifestAttributes(manifest, project, 'Main') - project.configure(manifest) { attributes 'Kotlin-Version': '1.3' } -} - sourcesJar { from "${rootDir}/core/builtins/native" from sourceSets.coroutines.kotlin @@ -153,7 +141,6 @@ dist { task experimentalJarsDist(type: Copy) { from coroutinesJar - from unsignedJar into distDir } @@ -238,18 +225,6 @@ task coroutinesTest(type: Test, dependsOn: coroutinesTestClasses) { check.dependsOn(coroutinesTest) -compileUnsignedKotlin { - kotlinOptions { - languageVersion = "1.3" - apiVersion = "1.3" - freeCompilerArgs += [ - "-Xuse-experimental=kotlin.Experimental", - "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", - "-XXLanguage:+InlineClasses" - ] - } -} - compileTestKotlin { kotlinOptions { freeCompilerArgs += [