Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency org.jetbrains.compose to v1.5.0 #23

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Update dependency org.jetbrains.compose to v1.5.0 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
490b58a
Update dependency org.jetbrains.compose to v1.5.0
renovate[bot] Aug 28, 2023
2cd3435
fix build errors
jordond Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions demo/composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@file:Suppress("UNUSED_VARIABLE")

import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
Expand Down Expand Up @@ -41,7 +39,6 @@ kotlin {
baseName = "ComposeApp"
isStatic = true
}
extraSpecAttributes["resources"] = "['src/commonMain/resources/**']"
}

sourceSets {
Expand Down Expand Up @@ -121,7 +118,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
packagingOptions {
packaging {
resources.excludes.add("META-INF/**")
}
}
Expand Down
2 changes: 1 addition & 1 deletion demo/composeApp/composeApp.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ Pod::Spec.new do |spec|
SCRIPT
}
]
spec.resources = ['src/commonMain/resources/**']
spec.resources = ['build/compose/ios/ComposeApp/compose-resources']
end
2 changes: 1 addition & 1 deletion demo/composeApp/src/commonMain/kotlin/com/materialkolor/demo/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ internal fun App() {
modifier = Modifier.fillMaxWidth().wrapContentWidth(),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
PaletteStyle.values().forEach { paletteStyle ->
PaletteStyle.entries.forEach { paletteStyle ->
FilterChip(
label = { Text(text = paletteStyle.name) },
selected = style == paletteStyle,
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
org.jetbrains.compose.experimental.uikit.enabled=true
org.jetbrains.compose.experimental.jscanvas.enabled=true
org.jetbrains.compose.experimental.macos.enabled=true
kotlin.native.cacheKind=none

# Maven
SONATYPE_HOST=S01
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sdk-min = "24"
agp = "8.1.1"
kotlin = "1.9.0"
versions = "0.47.0"
compose-multiplatform = "1.4.3"
compose-multiplatform = "1.5.0"
androidx-core-ktx = "1.10.1"
androidx-appcompat = "1.6.1"
androidx-lifecycle = "2.6.1"
Expand Down
Loading