Skip to content

Commit

Permalink
Compose 1.6.0
Browse files Browse the repository at this point in the history
Closes #215
  • Loading branch information
mpetuska committed Mar 1, 2024
1 parent 676de4f commit 9e5f1e3
Show file tree
Hide file tree
Showing 270 changed files with 3,431 additions and 1,594 deletions.
28 changes: 25 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Verified Versions

- [JDK]\: 11+
- [Kotlin]\: 1.8.20
- [Compose]\: 1.4.0
- [Kotlin]\: 1.9.22
- [Compose]\: 1.6.0
- [MDC]\: ^14.0.0

### Added
Expand All @@ -22,6 +22,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

## [0.1.2]

### Verified Versions

- [JDK]\: 11+
- [Kotlin]\: 1.9.22
- [Compose]\: 1.6.0
- [MDC]\: ^14.0.0

### Added

- `MDCTextField` Overload to allow specifying input type (such as `Password`)

### Changed

- Updated kotlin & compose versions
- Migrated back to kotlin-multiplatform plugin

### Removed

---

## [0.1.1]
Expand Down Expand Up @@ -226,7 +246,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

---

[SNAPSHOT]: https://github.com/mpetuska/npm-publish/compare/0.1.1...HEAD
[SNAPSHOT]: https://github.com/mpetuska/npm-publish/compare/0.1.2...HEAD

[0.1.2]: https://github.com/mpetuska/npm-publish/compare/0.1.1...0.1.2

[0.1.1]: https://github.com/mpetuska/npm-publish/compare/0.1.0...0.1.1

Expand Down
2 changes: 1 addition & 1 deletion build-conventions/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("com.gradle.enterprise") version "3.14"
id("com.gradle.enterprise") version "3.16.2"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("convention.common")
kotlin("js")
kotlin("multiplatform")
id("convention.dokka")
id("convention.compose")
}
Expand All @@ -20,7 +20,7 @@ kotlin {
}
compilations["test"].defaultSourceSet {
dependencies {
// implementation(compose.html.testUtils)
implementation(compose.html.testUtils)
implementation(libs.kotlin.test)
implementation(libs.kotest.assertions.core)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ tasks {

publishing {
publications {
create<MavenPublication>("js") {
groupId = "${project.group}"
artifactId = project.name
version = "${project.version}"
from(components["kotlin"])
}
// create<MavenPublication>("js") {
// groupId = "${project.group}"
// artifactId = project.name
// version = "${project.version}"
// from(components["kotlin"])
// }
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
org.gradle.vfs.watch=true
org.gradle.cache=true
org.gradle.parallel=true
org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g -Xmx2g
#org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g -Xmx2g
systemProp.org.gradle.unsafe.kotlin.assignment=true
#======================================== Kotlin ========================================
kotlin.code.style=official
Expand All @@ -14,7 +14,7 @@ kotlin.incremental.js=true
kotlin.incremental.js.ir=true
kotlin.js.generate.externals=false
kotlin.js.compiler=ir
kotlin.js.browser.karma.browsers=chromium-headless
kotlin.js.browser.karma.browsers=firefox-headless
#======================================= Project ========================================
group=dev.petuska
version=0.1.2-SNAPSHOT
Expand Down
23 changes: 11 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[versions]
build-config = "4.1.2"
compose = "1.4.3"
detekt = "1.23.0"
dokka = "1.8.20"
kotest = "5.6.2"
kotlin = "1.9.0"
compose = "1.6.0"
detekt = "1.23.5"
dokka = "1.9.10"
kotest = "5.8.0"
kotlin = "1.9.22"
kotlinpoet = "1.14.2"
ksp = "1.8.20-1.0.11"
npm-material-icons = "^1.10.4"
ksp = "1.9.22-1.0.18"
npm-material-icons = "^1.13.12"
npm-mdc = "^14.0.0"
versions = "0.47.0"
versions-update = "0.8.1"
versions = "0.51.0"
versions-update = "0.8.4"

[libraries]
compose-routing = "app.softwork:routing-compose:0.2.12"
compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "compose" }
compose-html-svg = { module = "org.jetbrains.compose.html:html-svg", version.ref = "compose" }
compose-routing = "app.softwork:routing-compose:0.2.14"
compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
Expand All @@ -29,13 +29,12 @@ plugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref
plugin-git-hooks = "com.github.jakemarsden:git-hooks-gradle-plugin:0.0.2"
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
plugin-publish = "io.github.gradle-nexus:publish-plugin:1.3.0"
plugin-publish = "io.github.gradle-nexus:publish-plugin:2.0.0-rc-2"
plugin-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versions" }
plugin-versions-update = { module = "nl.littlerobots.vcu:plugin", version.ref = "versions-update" }

[plugins]
build-config = { id = "com.github.gmazzo.buildconfig", version.ref = "build-config" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
versions-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "versions-update" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion katalog/katalog-runtime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

kotlin {
sourceSets {
main {
jsMain {
dependencies {
api(libs.compose.runtime)
api(libs.compose.html.core)
Expand Down
Loading

0 comments on commit 9e5f1e3

Please sign in to comment.