Skip to content

Commit

Permalink
[patch] fixing issues with updates and wasm
Browse files Browse the repository at this point in the history
  • Loading branch information
robertfmurdock committed Oct 8, 2024
1 parent 9db6034 commit a2b828b
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 71 deletions.
5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

28 changes: 0 additions & 28 deletions .idea/jsLibraryMappings.xml

This file was deleted.

10 changes: 0 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@ tasks {
}
}

fun org.ajoberstar.grgit.Commit.extractVersion(): String? {
val open = fullMessage.indexOf("[")
val close = fullMessage.indexOf("]")

if (open < 0 || close < 0) {
return null
}
return fullMessage.subSequence(open + 1, close).toString()
}

fun Project.isSnapshot() = version.toString().contains("SNAPSHOT")

fun Project.isMacRelease() = findProperty("release-target") == "mac"
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[plugins]
com-github-sghill-distribution-sha = "com.github.sghill.distribution-sha:0.4.0"
com-zegreatrob-tools-digger = "com.zegreatrob.tools.digger:1.4.27"
com-zegreatrob-tools-tagger = "com.zegreatrob.tools.tagger:1.4.27"
com-zegreatrob-tools-digger = "com.zegreatrob.tools.digger:1.5.21"
com-zegreatrob-tools-tagger = "com.zegreatrob.tools.tagger:1.5.21"
nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.4"
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.zegreatrob.testmints.async

import kotlinx.coroutines.await
import kotlin.js.Promise

actual suspend fun waitForTest(testFunction: () -> kotlinx.coroutines.test.TestResult) {
testFunction().await()
testFunction().unsafeCast<Promise<Unit>>().await()
}

actual fun <T> eventLoopProtect(thing: () -> T) = thing()
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.zegreatrob.testmints.async

import kotlinx.coroutines.await
import kotlinx.coroutines.test.TestResult
import kotlin.js.Promise

actual suspend fun waitForTest(testFunction: () -> kotlinx.coroutines.test.TestResult) {
testFunction().await<Any>()
actual suspend fun waitForTest(testFunction: () -> TestResult) {
val testResult = testFunction()
@Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE", "CAST_NEVER_SUCCEEDS")
(testResult as JsAny).unsafeCast<Promise<JsAny>>().await<JsAny?>()
}

actual fun <T> eventLoopProtect(thing: () -> T): T = thing()
6 changes: 3 additions & 3 deletions libraries/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ com-google-devtools-ksp-symbol-processing-api = "com.google.devtools.ksp:symbol-
com-squareup-kotlinpoet-ksp = "com.squareup:kotlinpoet-ksp:1.18.1"
io-github-oshai-kotlin-logging = "io.github.oshai:kotlin-logging:7.0.0"
org-jetbrains-kotlin-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "org-jetbrains-kotlin" }
org-jetbrains-kotlinx-kotlinx-coroutines-bom = "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1"
org-jetbrains-kotlinx-kotlinx-serialization-bom = "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.2"
org-junit-junit-bom = "org.junit:junit-bom:5.11.0"
org-jetbrains-kotlinx-kotlinx-coroutines-bom = "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"
org-jetbrains-kotlinx-kotlinx-serialization-bom = "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"
org-junit-junit-bom = "org.junit:junit-bom:5.11.2"
org-slf4j-slf4j-simple = "org.slf4j:slf4j-simple:2.0.16"

[plugins]
Expand Down
Binary file removed libraries/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 0 additions & 7 deletions libraries/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Binary file removed plugins-test/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions plugins-test/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

2 changes: 1 addition & 1 deletion plugins/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org-jetbrains-kotlin = "2.0.20"
[libraries]
com-google-devtools-ksp = "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.20-1.0.25"
org-jetbrains-kotlin-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "org-jetbrains-kotlin" }
org-junit-junit-bom = "org.junit:junit-bom:5.11.0"
org-junit-junit-bom = "org.junit:junit-bom:5.11.2"

[plugins]
com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
Expand Down
Binary file removed plugins/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions plugins/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

0 comments on commit a2b828b

Please sign in to comment.