update to latest compose version

maxkeppeler · DatL4g · Mar 29, 2024 · Mar 29, 2024 · Mar 29, 2024 · Mar 29, 2024
commit e53bb5f9fbee9f99b7338d77a931e5e3013b9f6b
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -20,7 +20,7 @@ jobs:
  uses: gradle/gradle-build-action@v3
 
  - name: Publish release
- run: ./gradlew publishAllPublicationsToMavenCentralRepository
+ run: ./gradlew publishAllPublicationsToMavenCentralRepository -x lint -x lintVitalRelease
  env:
  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
diff --git a/calendar/build.gradle.kts b/calendar/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /*
  * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
@@ -37,6 +36,11 @@ android {
  sourceCompatibility = JavaVersion.VERSION_11
  targetCompatibility = JavaVersion.VERSION_11
  }
+ lint {
+ checkGeneratedSources = false
+ checkReleaseBuilds = false
+ abortOnError = false
+ }
 }
 
 kotlin {
@@ -58,13 +62,6 @@ kotlin {
  binaries.executable()
  }
 
- @OptIn(ExperimentalWasmDsl::class)
- wasmJs {
- moduleName = Modules.CALENDAR.moduleName
- browser()
- binaries.executable()
- }
-
  applyDefaultHierarchyTemplate()
 
  sourceSets {
@@ -89,10 +86,6 @@ kotlin {
  nativeMain.orNull?.dependsOn(this)
  jsMain.orNull?.dependsOn(this)
  }
-
- val wasmJsMain by getting {
- dependsOn(nonJvmMain)
- }
  }
 }
 

diff --git a/clock/build.gradle.kts b/clock/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /*
  * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
@@ -37,6 +36,11 @@ android {
  sourceCompatibility = JavaVersion.VERSION_11
  targetCompatibility = JavaVersion.VERSION_11
  }
+ lint {
+ checkGeneratedSources = false
+ checkReleaseBuilds = false
+ abortOnError = false
+ }
 }
 
 kotlin {
@@ -58,13 +62,6 @@ kotlin {
  binaries.executable()
  }
 
- @OptIn(ExperimentalWasmDsl::class)
- wasmJs {
- moduleName = Modules.CLOCK.moduleName
- browser()
- binaries.executable()
- }
-
  applyDefaultHierarchyTemplate()
 
  sourceSets {

diff --git a/clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/models/ClockConfig.kt b/clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/models/ClockConfig.kt
@@ -15,6 +15,7 @@
  */
 package com.maxkeppeler.sheets.clock.models
 
+import androidx.compose.runtime.Stable
 import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
 import com.maxkeppeker.sheets.core.models.base.LibOrientation
@@ -29,6 +30,7 @@ import kotlinx.datetime.LocalTime
  * @param icons The style of icons that are used for dialog/ view-specific icons.
  * @param orientation The orientation of the view or null for auto orientation.
  */
+@Stable
 data class ClockConfig(
  val defaultTime: LocalTime? = null,
  val boundary: ClosedRange<LocalTime>? = null,

diff --git a/clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/models/ClockSelection.kt b/clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/models/ClockSelection.kt
@@ -17,13 +17,15 @@
 
 package com.maxkeppeler.sheets.clock.models
 
+import androidx.compose.runtime.Stable
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.BaseConstants
 
 /**
  * The selection configuration for the clock dialog.
  */
+@Stable
 sealed class ClockSelection : BaseSelection() {
 
  /**
@@ -36,7 +38,8 @@ sealed class ClockSelection : BaseSelection() {
  * @param positiveButton The button that will be used as a positive button.
  * @param onPositiveClick The listener that returns the selected hours and minutes.
  */
- class HoursMinutes(
+ @Stable
+ data class HoursMinutes(
  override val withButtonView: Boolean = false,
  override val extraButton: SelectionButton? = null,
  override val onExtraButtonClick: (() -> Unit)? = null,
@@ -56,7 +59,8 @@ sealed class ClockSelection : BaseSelection() {
  * @param positiveButton The button that will be used as a positive button.
  * @param onPositiveClick The listener that returns the selected hours, minutes and seconds.
  */
- class HoursMinutesSeconds(
+ @Stable
+ data class HoursMinutesSeconds(
  override val withButtonView: Boolean = false,
  override val extraButton: SelectionButton? = null,
  override val onExtraButtonClick: (() -> Unit)? = null,

diff --git a/color/build.gradle.kts b/color/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
  alias(libs.plugins.android.library)
@@ -21,6 +20,11 @@ android {
  sourceCompatibility = JavaVersion.VERSION_11
  targetCompatibility = JavaVersion.VERSION_11
  }
+ lint {
+ checkGeneratedSources = false
+ checkReleaseBuilds = false
+ abortOnError = false
+ }
 }
 
 kotlin {
@@ -42,13 +46,6 @@ kotlin {
  binaries.executable()
  }
 
- @OptIn(ExperimentalWasmDsl::class)
- wasmJs {
- moduleName = Modules.COLOR.moduleName
- browser()
- binaries.executable()
- }
-
  applyDefaultHierarchyTemplate()
 
  sourceSets {

diff --git a/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/ColorConfig.kt b/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/ColorConfig.kt
@@ -15,6 +15,7 @@
  */
 package com.maxkeppeler.sheets.color.models
 
+import androidx.compose.runtime.Stable
 import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
 import com.maxkeppeker.sheets.core.utils.BaseConstants.DEFAULT_ICON_STYLE
@@ -27,6 +28,7 @@ import com.maxkeppeker.sheets.core.utils.BaseConstants.DEFAULT_ICON_STYLE
  * @param allowCustomColorAlphaValues Allow alpha values in the custom color picker.
  * @param icons The style of icons that are used for dialog/ view-specific icons.
  */
+@Stable
 data class ColorConfig(
  val displayMode: ColorSelectionMode? = null,
  val defaultDisplayMode: ColorSelectionMode? = null,

diff --git a/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/ColorSelection.kt b/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/ColorSelection.kt
@@ -17,6 +17,7 @@
 
 package com.maxkeppeler.sheets.color.models
 
+import androidx.compose.runtime.Stable
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.BaseConstants
@@ -33,6 +34,7 @@ import com.maxkeppeker.sheets.core.utils.BaseConstants
  * @param onSelectNone The listener that is invoked when no color is selected.
  * @param onSelectColor The listener that returns the selected color.
  */
+@Stable
 data class ColorSelection(
  val selectedColor: SingleColor? = null,
  override val withButtonView: Boolean = true,

diff --git a/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/ColorSelectionMode.kt b/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/ColorSelectionMode.kt
@@ -15,11 +15,13 @@
  */
 package com.maxkeppeler.sheets.color.models
 
+import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable
 
 /**
  * Defined display modes for the calendar.
  */
+@Stable
 @Serializable
 enum class ColorSelectionMode {
 

diff --git a/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/SingleColor.kt b/color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/SingleColor.kt
@@ -15,6 +15,7 @@
  */
 package com.maxkeppeler.sheets.color.models
 
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 
@@ -25,6 +26,7 @@ import androidx.compose.ui.graphics.toArgb
  * @param colorRes Res of color value.
  * @param colorHex Color value as Hex-String.
  */
+@Stable
 data class SingleColor(
  val colorInt: Int? = null,
  val colorHex: String? = null,

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /*
  * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
@@ -37,6 +36,11 @@ android {
  sourceCompatibility = JavaVersion.VERSION_11
  targetCompatibility = JavaVersion.VERSION_11
  }
+ lint {
+ checkGeneratedSources = false
+ checkReleaseBuilds = false
+ abortOnError = false
+ }
 }
 
 kotlin {
@@ -58,13 +62,6 @@ kotlin {
  binaries.executable()
  }
 
- @OptIn(ExperimentalWasmDsl::class)
- wasmJs {
- moduleName = Modules.CORE.moduleName
- browser()
- binaries.executable()
- }
-
  applyDefaultHierarchyTemplate()
 
  sourceSets {
@@ -98,11 +95,6 @@ kotlin {
  nativeMain.orNull?.dependsOn(this)
  jsMain.orNull?.dependsOn(this)
  }
-
- val wasmJsMain by getting {
- dependsOn(nonJvmMain)
- dependsOn(nonMacosMain)
- }
  }
 }
 

diff --git a/core/src/commonMain/kotlin/com/maxkeppeker/sheets/core/icons/LibIcons.kt b/core/src/commonMain/kotlin/com/maxkeppeker/sheets/core/icons/LibIcons.kt
@@ -2,10 +2,12 @@
 
 package com.maxkeppeker.sheets.core.icons
 
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.maxkeppeker.sheets.core.utils.JvmSerializable
 import kotlinx.serialization.Serializable
 
+@Stable
 sealed class LibIcons : JvmSerializable {
 
  abstract var EmojiEmotions: ImageVector
@@ -35,7 +37,8 @@ sealed class LibIcons : JvmSerializable {
  * [Filled icons](https://material.io/resources/icons/?style=baseline) (previously the only
  * available theme, also known as the baseline theme) are the default icon theme.
  */
- object Filled : LibIcons() {
+ @Stable
+ data object Filled : LibIcons() {
  override var EmojiEmotions = com.maxkeppeker.sheets.core.icons.filled.EmojiEmotions
  override var EmojiNature = com.maxkeppeker.sheets.core.icons.filled.EmojiNature
  override var EmojiFoodBeverage = com.maxkeppeker.sheets.core.icons.filled.EmojiFoodBeverage
@@ -64,7 +67,8 @@ sealed class LibIcons : JvmSerializable {
  * [Outlined icons](https://material.io/resources/icons/?style=outline) make use of a thin
  * stroke and empty space inside for a lighter appearance.
  */
- object Outlined : LibIcons() {
+ @Stable
+ data object Outlined : LibIcons() {
  override var EmojiEmotions = com.maxkeppeker.sheets.core.icons.outlined.EmojiEmotions
  override var EmojiNature = com.maxkeppeker.sheets.core.icons.outlined.EmojiNature
  override var EmojiFoodBeverage = com.maxkeppeker.sheets.core.icons.outlined.EmojiFoodBeverage
@@ -94,7 +98,8 @@ sealed class LibIcons : JvmSerializable {
  * pairs well with brands that use heavier typography, curved logos, or circular elements to
  * express their style.
  */
- object Rounded : LibIcons() {
+ @Stable
+ data object Rounded : LibIcons() {
  override var EmojiEmotions = com.maxkeppeker.sheets.core.icons.rounded.EmojiEmotions
  override var EmojiNature = com.maxkeppeker.sheets.core.icons.rounded.EmojiNature
  override var EmojiFoodBeverage = com.maxkeppeker.sheets.core.icons.rounded.EmojiFoodBeverage
@@ -124,7 +129,8 @@ sealed class LibIcons : JvmSerializable {
  * straight edges, for a crisp style that remains legible even at smaller scales. These
  * rectangular shapes can support brand styles that are not well-reflected by rounded shapes.
  */
- object TwoTone : LibIcons() {
+ @Stable
+ data object TwoTone : LibIcons() {
  override var EmojiEmotions = com.maxkeppeker.sheets.core.icons.twotone.EmojiEmotions
  override var EmojiNature = com.maxkeppeker.sheets.core.icons.twotone.EmojiNature
  override var EmojiFoodBeverage = com.maxkeppeker.sheets.core.icons.twotone.EmojiFoodBeverage
@@ -154,7 +160,8 @@ sealed class LibIcons : JvmSerializable {
  * straight edges, for a crisp style that remains legible even at smaller scales. These
  * rectangular shapes can support brand styles that are not well-reflected by rounded shapes.
  */
- object Sharp : LibIcons() {
+ @Stable
+ data object Sharp : LibIcons() {
  override var EmojiEmotions = com.maxkeppeker.sheets.core.icons.sharp.EmojiEmotions
  override var EmojiNature = com.maxkeppeker.sheets.core.icons.sharp.EmojiNature
  override var EmojiFoodBeverage = com.maxkeppeker.sheets.core.icons.sharp.EmojiFoodBeverage

diff --git a/date_time/build.gradle.kts b/date_time/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /*
  * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
@@ -37,6 +36,11 @@ android {
  sourceCompatibility = JavaVersion.VERSION_11
  targetCompatibility = JavaVersion.VERSION_11
  }
+ lint {
+ checkGeneratedSources = false
+ checkReleaseBuilds = false
+ abortOnError = false
+ }
 }
 
 kotlin {
@@ -58,13 +62,6 @@ kotlin {
  binaries.executable()
  }
 
- @OptIn(ExperimentalWasmDsl::class)
- wasmJs {
- moduleName = Modules.DATE_TIME.moduleName
- browser()
- binaries.executable()
- }
-
  applyDefaultHierarchyTemplate()
 
  sourceSets {