diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 9920ef2242..5a61a48b7f 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -27,7 +27,7 @@ jobs: publishKotlinOSSRHPublicationToGithubRepository \ release \ shadowJar \ - uploadKotlinOSSRH uploadKotlinMultiplatform \ + uploadKotlinOSSRH uploadKotlinMultiplatform uploadJvm uploadJs \ --dry-run " eval $COMMAND || eval $COMMAND @@ -57,10 +57,9 @@ jobs: with: build-command: true check-command: true - deploy-command: >- - ./gradlew uploadKotlinOSSRH uploadKotlinMultiplatform close --parallel || - ./gradlew uploadKotlinOSSRH uploadKotlinMultiplatform close --parallel || - ./gradlew uploadKotlinOSSRH uploadKotlinMultiplatform close --parallel + deploy-command: | + COMMAND="./gradlew uploadJvm uploadJs uploadKotlinOSSRH uploadKotlinMultiplatform close --parallel" + eval "$COMMAND" || eval "$COMMAND" || eval "$COMMAND" java-version: 11 should-run-codecov: false should-deploy: true diff --git a/alchemist-web-renderer/build.gradle.kts b/alchemist-web-renderer/build.gradle.kts index 15a8130a2a..860a15eb19 100644 --- a/alchemist-web-renderer/build.gradle.kts +++ b/alchemist-web-renderer/build.gradle.kts @@ -66,7 +66,6 @@ kotlin { val jsMain by getting { dependencies { implementation(libs.bundles.ktor.client) - implementation(project.dependencies.enforcedPlatform(libs.kotlin.wrappers.bom)) implementation(libs.bundles.kotlin.react) implementation(npm("react-bootstrap", "2.5.0")) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d81e73e3a3..23d1cd4e80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,6 @@ kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", versi kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" } kotlin-react = { module = "org.jetbrains.kotlin-wrappers:kotlin-react", version.ref = "react" } kotlin-react-dom = { module = "org.jetbrains.kotlin-wrappers:kotlin-react-dom", version.ref = "react" } -kotlin-wrappers-bom = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.454" kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 915d82d353..8bd62d93dc 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -837,7 +837,7 @@ cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -csstype@^3.0.2, csstype@^3.1.0: +csstype@^3.0.2, csstype@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==