Attempt to remove dependency on kotlin's stdlib in jvm target
This commit is contained in:
parent
ee93e0b5b3
commit
c154fc7610
@ -15,7 +15,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "ru.landgrafhomyak.utility"
|
group = "ru.landgrafhomyak.utility"
|
||||||
version = "0.4"
|
version = "0.4.4"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
@ -28,13 +28,40 @@ xomrk {
|
|||||||
|
|
||||||
defineAllMultiplatformTargets()
|
defineAllMultiplatformTargets()
|
||||||
|
|
||||||
|
jvmToolchain(8)
|
||||||
jvm {
|
jvm {
|
||||||
|
withJava()
|
||||||
|
|
||||||
compilations.configureEach {
|
compilations.configureEach {
|
||||||
compileJavaTaskProvider?.configure {
|
compileJavaTaskProvider?.configure {
|
||||||
targetCompatibility = "1.8"
|
targetCompatibility = "1.8"
|
||||||
}
|
}
|
||||||
compileTaskProvider.configure {
|
compileTaskProvider.configure {
|
||||||
compilerOptions { jvmTarget = JvmTarget.JVM_1_8 }
|
compilerOptions {
|
||||||
|
jvmTarget = JvmTarget.JVM_1_8
|
||||||
|
freeCompilerArgs.addAll("-Xallow-kotlin-package")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
commonMain {
|
||||||
|
dependencies {
|
||||||
|
compileOnly(kotlin("stdlib"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
jvmMain {
|
||||||
|
dependencies {
|
||||||
|
compileOnly(kotlin("stdlib"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets.configureEach {
|
||||||
|
if (name == "jvmMain") return@configureEach
|
||||||
|
if (name == "commonMain") return@configureEach
|
||||||
|
dependencies {
|
||||||
|
implementation(kotlin("stdlib"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1 +1,2 @@
|
|||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
|
kotlin.stdlib.default.dependency=false
|
||||||
|
13
src/jvmMain/java/kotlin/ExceptionsKt.kt
Normal file
13
src/jvmMain/java/kotlin/ExceptionsKt.kt
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package kotlin
|
||||||
|
|
||||||
|
import java.util.Objects
|
||||||
|
|
||||||
|
@PublishedApi
|
||||||
|
internal object ExceptionsKt {
|
||||||
|
@Suppress("RemoveRedundantQualifierName")
|
||||||
|
@JvmStatic
|
||||||
|
@PublishedApi
|
||||||
|
internal fun addSuppressed(`this`: kotlin.Throwable, e2: kotlin.Throwable?) {
|
||||||
|
(java.lang.Throwable::addSuppressed)(`this` as java.lang.Throwable, e2)
|
||||||
|
}
|
||||||
|
}
|
11
src/jvmMain/java/kotlin/jvm/internal/Intrinsics.kt
Normal file
11
src/jvmMain/java/kotlin/jvm/internal/Intrinsics.kt
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
package kotlin.jvm.internal
|
||||||
|
|
||||||
|
@PublishedApi
|
||||||
|
internal object Intrinsics {
|
||||||
|
@PublishedApi
|
||||||
|
@JvmStatic
|
||||||
|
internal fun checkNotNullParameter(expr: java.lang.Object?, name: String?) {
|
||||||
|
if (expr == null)
|
||||||
|
throw java.lang.NullPointerException(name)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user