Compare commits
No commits in common. "master" and "v0.3" have entirely different histories.
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,9 +0,0 @@
|
|||||||
/.idea/
|
|
||||||
gradle/
|
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
*.class
|
|
||||||
*.jar
|
|
||||||
/out/
|
|
||||||
/gradlew*
|
|
||||||
.kotlin/
|
|
101
build.gradle.kts
101
build.gradle.kts
@ -1,101 +0,0 @@
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
|
||||||
import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.*
|
|
||||||
import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.plugin.xomrk
|
|
||||||
|
|
||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven("https://maven.landgrafhomyak.ru/")
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build:v0.3k2.1.10")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
group = "ru.landgrafhomyak.utility"
|
|
||||||
version = "0.5"
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
xomrk {
|
|
||||||
kotlin {
|
|
||||||
setCompatibilityWithKotlin(KotlinVersion.KOTLIN_2_0)
|
|
||||||
optInContracts()
|
|
||||||
noWarnExpectActual()
|
|
||||||
warningsAsErrors()
|
|
||||||
|
|
||||||
defineAllMultiplatformTargets()
|
|
||||||
|
|
||||||
jvmToolchain(8)
|
|
||||||
jvm {
|
|
||||||
withJava()
|
|
||||||
|
|
||||||
compilations.configureEach {
|
|
||||||
compileJavaTaskProvider?.configure {
|
|
||||||
targetCompatibility = "1.8"
|
|
||||||
}
|
|
||||||
compileTaskProvider.configure {
|
|
||||||
compilerOptions {
|
|
||||||
jvmTarget = JvmTarget.JVM_1_8
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named { t -> t == "${this@jvm.name}Test" }.configureEach {
|
|
||||||
this as Test
|
|
||||||
useTestNG()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
|
||||||
// if use kotlin("stdlib") gitea ui brokes at paragraph with dependency versions
|
|
||||||
val kotlinStdlibDependency = "org.jetbrains.kotlin:kotlin-stdlib:${this@kotlin.coreLibrariesVersion}"
|
|
||||||
|
|
||||||
val commonMain by getting {
|
|
||||||
dependencies {
|
|
||||||
compileOnly(kotlinStdlibDependency)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val jvmMain by getting {
|
|
||||||
dependsOn(commonMain)
|
|
||||||
dependencies {
|
|
||||||
compileOnly(kotlinStdlibDependency)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val nonJvmMain by creating {
|
|
||||||
dependsOn(commonMain)
|
|
||||||
dependencies {
|
|
||||||
implementation(kotlinStdlibDependency)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jvmTest {
|
|
||||||
dependencies {
|
|
||||||
implementation("org.testng:testng:7.5.1")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configureEach {
|
|
||||||
when {
|
|
||||||
// commonMain !in dependsOn -> return@configureEach
|
|
||||||
!name.endsWith("Main") -> return@configureEach
|
|
||||||
this@configureEach === commonMain -> return@configureEach
|
|
||||||
this@configureEach === jvmMain -> return@configureEach
|
|
||||||
this@configureEach === nonJvmMain -> return@configureEach
|
|
||||||
}
|
|
||||||
dependsOn(nonJvmMain)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
repositories {
|
|
||||||
defineXomrkGiteaMavenRepo()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
kotlin.stdlib.default.dependency=false
|
|
||||||
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
|
|
@ -1 +0,0 @@
|
|||||||
rootProject.name = "highlevel-try-finally"
|
|
@ -1,7 +0,0 @@
|
|||||||
package ru.landgrafhomyak.utility.highlevel_try_finally
|
|
||||||
|
|
||||||
@PublishedApi
|
|
||||||
internal expect object ExceptionsKt {
|
|
||||||
@PublishedApi
|
|
||||||
internal fun addSuppressed(e1: Throwable?, e2: Throwable?)
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
package ru.landgrafhomyak.utility.highlevel_try_finally
|
|
||||||
|
|
||||||
import kotlin.contracts.InvocationKind
|
|
||||||
import kotlin.contracts.contract
|
|
||||||
|
|
||||||
class TryFinallyChainScope @PublishedApi internal constructor() {
|
|
||||||
@PublishedApi
|
|
||||||
internal var _actualException: Throwable? = null
|
|
||||||
|
|
||||||
@PublishedApi
|
|
||||||
internal fun _throw() {
|
|
||||||
this._actualException?.let { e -> throw e }
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun action(fn: () -> Unit): TryFinallyChainScope {
|
|
||||||
contract {
|
|
||||||
callsInPlace(fn, InvocationKind.EXACTLY_ONCE)
|
|
||||||
}
|
|
||||||
safeAutoClose3e(
|
|
||||||
onCrossReturn = { throw Error("Cross return not allowed in tryFinallyChain{action{}}") },
|
|
||||||
onError = { err -> this._actualException?.addSuppressed(err) ?: run { this._actualException = err } },
|
|
||||||
action = fn
|
|
||||||
)
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +1,7 @@
|
|||||||
@file:Suppress("unused")
|
|
||||||
@file:JvmName("SafeAutocloseKt")
|
|
||||||
|
|
||||||
package ru.landgrafhomyak.utility.highlevel_try_finally
|
package ru.landgrafhomyak.utility.highlevel_try_finally
|
||||||
|
|
||||||
import kotlin.contracts.InvocationKind
|
import kotlin.contracts.InvocationKind
|
||||||
import kotlin.contracts.contract
|
import kotlin.contracts.contract
|
||||||
import kotlin.jvm.JvmName
|
|
||||||
|
|
||||||
@Suppress("WRONG_INVOCATION_KIND")
|
@Suppress("WRONG_INVOCATION_KIND")
|
||||||
inline fun <R> safeAutoClose1(
|
inline fun <R> safeAutoClose1(
|
||||||
@ -47,6 +43,7 @@ inline fun <R> safeAutoClose2e(
|
|||||||
return safeAutoClose3e(onError = onError, onSuccess = onSuccess, onCrossReturn = onSuccess, action = action)
|
return safeAutoClose3e(onError = onError, onSuccess = onSuccess, onCrossReturn = onSuccess, action = action)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline fun <R> safeAutoClose3(
|
inline fun <R> safeAutoClose3(
|
||||||
onError: () -> Unit = {},
|
onError: () -> Unit = {},
|
||||||
onSuccess: () -> Unit = {},
|
onSuccess: () -> Unit = {},
|
||||||
@ -86,7 +83,7 @@ inline fun <R> safeAutoClose3e(
|
|||||||
try {
|
try {
|
||||||
onError(e1)
|
onError(e1)
|
||||||
} catch (e2: Throwable) {
|
} catch (e2: Throwable) {
|
||||||
ExceptionsKt.addSuppressed(e1, e2)
|
e1.addSuppressed(e2)
|
||||||
}
|
}
|
||||||
throw e1
|
throw e1
|
||||||
} finally {
|
} finally {
|
||||||
@ -98,4 +95,4 @@ inline fun <R> safeAutoClose3e(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
@file:Suppress("unused")
|
|
||||||
@file:JvmName("TryFinallyChainKt")
|
|
||||||
|
|
||||||
package ru.landgrafhomyak.utility.highlevel_try_finally
|
|
||||||
|
|
||||||
import kotlin.contracts.InvocationKind
|
|
||||||
import kotlin.contracts.contract
|
|
||||||
import kotlin.jvm.JvmName
|
|
||||||
|
|
||||||
inline fun tryFinallyChain(chains: (TryFinallyChainScope) -> Unit) {
|
|
||||||
contract {
|
|
||||||
callsInPlace(chains, InvocationKind.EXACTLY_ONCE)
|
|
||||||
}
|
|
||||||
|
|
||||||
val scope = TryFinallyChainScope()
|
|
||||||
safeAutoClose3e(
|
|
||||||
onCrossReturn = { throw Error("Cross return not allowed in tryFinallyChain{}") },
|
|
||||||
onError = { err -> throw Error("Unexpected exception in tryFinallyChain{}; calling anything outside action{} block isn't allowed", err) },
|
|
||||||
onSuccess = { scope._throw() },
|
|
||||||
action = { chains(scope) }
|
|
||||||
)
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
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")
|
|
||||||
(java.lang.Throwable::addSuppressed)(e1 as java.lang.Throwable, e2)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,48 +0,0 @@
|
|||||||
package ru.landgrafhomyak.utility.highlevel_try_finally.tests
|
|
||||||
|
|
||||||
import org.testng.annotations.Test
|
|
||||||
import ru.landgrafhomyak.utility.highlevel_try_finally.safeAutoClose1
|
|
||||||
|
|
||||||
@Test
|
|
||||||
class KotlinStdlibDependencyTest {
|
|
||||||
@Test
|
|
||||||
fun testNoKotlinStdlib() {
|
|
||||||
try {
|
|
||||||
if (KotlinVersion.CURRENT.major != -1)
|
|
||||||
throw AssertionError("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() })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Suppress("NOTHING_TO_INLINE")
|
|
||||||
private inline fun throw7throwIn() {
|
|
||||||
safeAutoClose1(finally = { throw CustomTestException() }, action = { throw CustomTestException() })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(dependsOnMethods = ["testNoKotlinStdlib"])
|
|
||||||
fun testAutoCloseFn() {
|
|
||||||
try {
|
|
||||||
throw7throwFn()
|
|
||||||
} catch (_: CustomTestException) {
|
|
||||||
} catch (le: LinkageError) {
|
|
||||||
throw AssertionError("safeAutoClose still has dependency on kotlin stdlib", le)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(dependsOnMethods = ["testNoKotlinStdlib"])
|
|
||||||
fun testAutoCloseIn() {
|
|
||||||
try {
|
|
||||||
throw7throwIn()
|
|
||||||
} catch (_: CustomTestException) {
|
|
||||||
} catch (le: LinkageError) {
|
|
||||||
throw AssertionError("safeAutoClose still has dependency on kotlin stdlib", le)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
package ru.landgrafhomyak.utility.highlevel_try_finally
|
|
||||||
|
|
||||||
import kotlin.addSuppressed as kotlinAddSuppressed
|
|
||||||
|
|
||||||
@PublishedApi
|
|
||||||
internal actual object ExceptionsKt {
|
|
||||||
@PublishedApi
|
|
||||||
internal actual fun addSuppressed(e1: Throwable?, e2: Throwable?) {
|
|
||||||
e1!!.kotlinAddSuppressed(e2!!)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user