Compare commits

..

No commits in common. "master" and "v0.5" have entirely different histories.
master ... v0.5

4 changed files with 8 additions and 11 deletions

View File

@ -61,7 +61,6 @@ xomrk {
}
}
val jvmMain by getting {
dependsOn(commonMain)
dependencies {
compileOnly(kotlinStdlibDependency)
}

View File

@ -3,4 +3,3 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false
kotlin.native.enableKlibsCrossCompilation=true
# compileOnly dependencies from commonMain still throw warning
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
kotlin.js.stdlib.dom.api.included=false

View File

@ -3,7 +3,6 @@ package ru.landgrafhomyak.utility.highlevel_try_finally
@PublishedApi
internal actual object ExceptionsKt {
@PublishedApi
@JvmStatic
internal actual fun addSuppressed(e1: Throwable?, e2: Throwable?) {
if (e1 == null) throw NullPointerException("e1")
if (e2 == null) throw NullPointerException("e2")

View File

@ -1,6 +1,7 @@
package ru.landgrafhomyak.utility.highlevel_try_finally.tests
import org.testng.annotations.Test
import org.testng.asserts.Assertion
import ru.landgrafhomyak.utility.highlevel_try_finally.safeAutoClose1
@Test
@ -8,14 +9,13 @@ class KotlinStdlibDependencyTest {
@Test
fun testNoKotlinStdlib() {
try {
if (KotlinVersion.CURRENT.major != -1)
throw AssertionError("Kotlin stdlib still in runtime classpath")
KotlinVersion.CURRENT
Assertion().assertTrue(false, "Kotlin stdlib still in runtime classpath")
} catch (_: LinkageError) {
}
}
private class CustomTestException : RuntimeException()
private object CustomUnit
private fun throw7throwFn() {
safeAutoClose1(finally = { throw CustomTestException() }, action = { throw CustomTestException() })
@ -31,8 +31,8 @@ class KotlinStdlibDependencyTest {
try {
throw7throwFn()
} catch (_: CustomTestException) {
} catch (le: LinkageError) {
throw AssertionError("safeAutoClose still has dependency on kotlin stdlib", le)
} catch (_: LinkageError) {
Assertion().assertTrue(false, "safeAutoClose still has dependency on kotlin stdlib")
}
}
@ -41,8 +41,8 @@ class KotlinStdlibDependencyTest {
try {
throw7throwIn()
} catch (_: CustomTestException) {
} catch (le: LinkageError) {
throw AssertionError("safeAutoClose still has dependency on kotlin stdlib", le)
} catch (_: LinkageError) {
Assertion().assertTrue(false, "safeAutoClose still has dependency on kotlin stdlib")
}
}
}