Stop building separate jar with unsigned types
Now this is not needed as unsigned types were merged into stdlib
This commit is contained in:
-7
@@ -20,8 +20,6 @@ public class ForTestCompileRuntime {
|
||||
private static volatile SoftReference<ClassLoader> reflectJarClassLoader = new SoftReference<>(null);
|
||||
private static volatile SoftReference<ClassLoader> runtimeJarClassLoader = new SoftReference<>(null);
|
||||
private static volatile SoftReference<ClassLoader> coroutinesJarClassLoader = new SoftReference<>(null);
|
||||
private static volatile SoftReference<ClassLoader> unsignedTypesJarClassLoader = new SoftReference<>(null);
|
||||
private static volatile SoftReference<ClassLoader> unsignedTypesAndReflectJarClassLoader = new SoftReference<>(null);
|
||||
private static volatile SoftReference<ClassLoader> 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"));
|
||||
|
||||
@@ -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 += [
|
||||
|
||||
Reference in New Issue
Block a user