Bump org.jetbrains.compose from 1.2.0-alpha01-dev778 to 1.2.0-alpha01…

…-dev786 (#273) * Bump org.jetbrains.compose Bumps org.jetbrains.compose from 1.2.0-alpha01-dev778 to 1.2.0-alpha01-dev786. --- updated-dependencies: - dependency-name: org.jetbrains.compose dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Use upstream svg extensions Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hfhbd <[email protected]>
hfhbd · Sep 13, 2022 · 7e78fc1 · 7e78fc1
1 parent cc23f56
commit 7e78fc1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 72 deletions.
diff --git a/bootstrap-compose-icons/src/main/kotlin/app/softwork/bootstrapcompose/icons/svg.kt b/bootstrap-compose-icons/src/main/kotlin/app/softwork/bootstrapcompose/icons/svg.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.*
 
 plugins {
     kotlin("js") version "1.7.10"
-    id("org.jetbrains.compose") version "1.2.0-alpha01-dev778"
+    id("org.jetbrains.compose") version "1.2.0-alpha01-dev786"
     `maven-publish`
     signing
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
@@ -47,11 +47,6 @@ dependencies {
 
 licensee {
     allow("Apache-2.0")
-    val composeVersion = "1.2.0-alpha01-dev778"
-    allowDependency("org.jetbrains.compose.web", "web-core-js", "$composeVersion")
-    allowDependency("org.jetbrains.compose.web", "web-core", "$composeVersion")
-    allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime-js", "$composeVersion")
-    allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime", "$composeVersion")
 }
 
 val emptyJar by tasks.registering(Jar::class) {

diff --git a/buildSrc/src/main/kotlin/app/softwork/bootstrapcompose/icons/ConvertSvg.kt b/buildSrc/src/main/kotlin/app/softwork/bootstrapcompose/icons/ConvertSvg.kt
@@ -148,7 +148,7 @@ private data class Rect(
 ) : Content {
     override fun toCompose() = buildString {
         if (x == null || y == null) {
-            append("""Rect($width, $height, $rx, "$transform")""")
+            append("""Rect($width, $height, $rx, $rx, "$transform")""")
         } else {
             append("""Rect($x, $y, $width, $height, attrs = {""")
             append("""rx($rx)""")

diff --git a/showcase/src/main/kotlin/app/softwork/bootstrapcompose/showcase/BoxView.kt b/showcase/src/main/kotlin/app/softwork/bootstrapcompose/showcase/BoxView.kt
@@ -15,6 +15,7 @@ import app.softwork.bootstrapcompose.Text.Wraps.NoWrap
 import app.softwork.bootstrapcompose.icons.*
 import org.jetbrains.compose.web.*
 import org.jetbrains.compose.web.dom.*
+import org.jetbrains.compose.web.svg.*
 
 @OptIn(ExperimentalComposeWebSvgApi::class)
 @Composable