Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Kotlin to 1.4.30 #157

Merged
merged 5 commits into from
Feb 4, 2021
Merged

Bump Kotlin to 1.4.30 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce1cefb
Bump Kotlin to 1.4.30-RC
erikc5000 Jan 18, 2021
ac6646a
Replace runCatching{} with try/catch
erikc5000 Jan 19, 2021
353fa9a
Bump Kotlin to 1.4.30 final
erikc5000 Feb 3, 2021
826bf72
Merge remote-tracking branch 'origin/master' into kotlin-1.4.30
erikc5000 Feb 3, 2021
9ca8f7e
Fix publishing
erikc5000 Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.4.21"
kotlin("jvm") version "1.4.30"
`kotlin-dsl`
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Versions {
const val kotlin = "1.4.21"
const val kotlin = "1.4.30"
const val serialization = "1.0.1"
const val atomicfu = "0.14.4"
const val androidxTest = "1.3.0"
Expand Down
17 changes: 5 additions & 12 deletions buildSrc/src/main/kotlin/multiplatform-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
kotlin("multiplatform")
id("published-library")
Expand Down Expand Up @@ -46,21 +44,16 @@ kotlin {
}
}

val emptySourcesJar by tasks.registering(Jar::class) {
archiveClassifier.set("sources")
}

publishing {
val pomMppArtifactId: String? by project

publications.withType<MavenPublication>().configureEach {
if (name == "kotlinMultiplatform") {
if (pomMppArtifactId != null) {
artifactId = pomMppArtifactId
if (pomMppArtifactId != null) {
artifactId = if (name == "kotlinMultiplatform") {
pomMppArtifactId
} else {
"${pomMppArtifactId}-$name"
}
artifact(emptySourcesJar.get())
} else if (pomMppArtifactId != null) {
artifactId = "${pomMppArtifactId}-$name"
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion core/src/darwinMain/kotlin/io/islandtime/internal/Concurrency.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ private fun <T> Worker.executeImmediately(block: () -> T): T {
return execute(
TransferMode.SAFE,
{ block.freeze() },
{ runCatching { it() }.freeze() }
{
try {
Result.success(it())
} catch (e: Throwable) {
Result.failure(e)
}.freeze()
}
).result.getOrThrow()
}
4 changes: 2 additions & 2 deletions tools/code-generator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.21"
kotlin("jvm") version "1.4.30"
application
}

repositories {1
repositories {
jcenter()
}

Expand Down
2 changes: 1 addition & 1 deletion tools/mkdocs-dokka-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.21"
kotlin("jvm") version "1.4.30"
}

repositories {
Expand Down