Merge pull request #87 from InsanusMokrassar/0.7.6

0.7.6

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## 0.7.6
+
+* `Kotlin`: `1.9.23`
+* `Compose`: `1.6.1`
+
+## 0.7.5
+
+* `Kotlin`: `1.9.22`
+* `Compose`: `1.6.0`
+
+## 0.7.4
+
+* `Kotlin`: `1.9.21`
+* `Compose`: `1.5.11`
+
+## 0.7.3
+
+* `Kotlin`: `1.9.20`
+* `Compose`: `1.5.10`
+
+## 0.7.2
+
+* `Kotlin`: `1.9.10`
+* `Compose`: `1.5.1`
+
+## 0.7.1
+
+* Type of `animation` parameter in `Alert` has been changed according to docs: now it is `Boolean`
+* Add tooltip `JS` part support
+
+## 0.7.0
+
+* `Kotlin`: `1.8.20`
+* `Compose`: `1.4.0`
+
+## 0.6.2
+
+* `Compose`: `1.3.1`
+
 ## 0.6.1
 
 * `DefaultInput` has been renamed to `StandardInput`

github_release.gradle

@@ -18,14 +18,14 @@ if (new File(projectDir, "secret.gradle").exists()) {
     githubRelease {
         token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
-        owner "InsanusMokrassar"
-        repo "JSUIKitKBindings"
+        owner = "InsanusMokrassar"
+        repo = "JSUIKitKBindings"
 
-        tagName "v${project.version}"
-        releaseName "${project.version}"
-        targetCommitish "${project.version}"
+        tagName = "v${project.version}"
+        releaseName = "${project.version}"
+        targetCommitish = "${project.version}"
 
-        body getCurrentVersionChangelog()
+        body = getCurrentVersionChangelog()
     }
 }
 

gradle.properties

@@ -7,4 +7,4 @@ kotlin.incremental.js=true
 # Project data
 
 group=dev.inmo
-version=0.6.1
+version=0.7.6

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
 
-kt = "1.8.10"
-jb-compose = "1.3.1-rc02"
-jb-dokka = "1.8.10"
-gh-release = "2.4.1"
+kt = "1.9.23"
+jb-compose = "1.6.1"
+jb-dokka = "1.9.20"
+gh-release = "2.5.1"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
@@ -38,20 +38,16 @@ publishing {
             }
         }
         repositories {
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "GITEA"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
-            
-                    credentials(HttpHeaderCredentials) {
-                        name = "Authorization"
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    name = "InmoNexus"
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+
+                    credentials {
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                     }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
-                    }
-            
+
                 }
             }
             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
@@ -84,4 +80,10 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://opensource.org/licenses/Apache-2.0"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/JSUIKitKBindings","vcsUrl":"https://github.com/InsanusMokrassar/JSUIKitKBindings.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GITEA","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://opensource.org/licenses/Apache-2.0"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/JSUIKitKBindings","vcsUrl":"https://github.com/InsanusMokrassar/JSUIKitKBindings.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

settings.gradle

@@ -1,3 +1 @@
 rootProject.name = 'kjsuikit'
-
-enableFeaturePreview("VERSION_CATALOGS")

src/jsMain/kotlin/dev/inmo/jsuikit/elements/Alert.kt

@@ -12,7 +12,7 @@ import org.w3c.dom.HTMLDivElement
 @Composable
 fun Alert(
     attrs: Attrs<HTMLDivElement> = Attrs.empty(),
-    animation: UIKitAnimation? = UIKitAnimation.Fade,
+    animation: Boolean = true,
     duration: Milliseconds? = null,
     selClose: String? = null,
     content: ContentBuilder<HTMLDivElement>
@@ -22,7 +22,7 @@ fun Alert(
         include(UIKitAlert)
 
         buildAndAddAttribute("uk-alert") {
-            "animation" to animation ?.classes ?.firstOrNull()
+            "animation" to animation
             "duration" to duration
             "sel-close" to selClose
         }

src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKit.kt

@@ -17,4 +17,7 @@ external interface UIKit {
 
     fun dropdown(element: Element, options: DropdownOptions = definedExternally): Dropdown
     fun dropdown(selector: String, options: DropdownOptions = definedExternally): Dropdown?
+
+    fun tooltip(element: Element): UIKitTooltip
+    fun tooltip(selector: String): UIKitTooltip?
 }

src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitTooltip.kt

@@ -0,0 +1,6 @@
+package dev.inmo.jsuikit.types
+
+external interface UIKitTooltip {
+    fun show()
+    fun hide()
+}