diff --git a/build.gradle.kts b/build.gradle.kts index e0484402..4a7818c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,6 @@ plugins { alias(libs.plugins.kotlinSerialization) apply false alias(libs.plugins.kotlinJvm) apply false alias(libs.plugins.composeCompiler) apply false - alias(libs.plugins.composeHotReload) apply false alias(libs.plugins.jib) apply false alias(libs.plugins.googleServices) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7535132b..4c4f6f9a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,13 +8,12 @@ android-targetSdk = "36" androidx-activityCompose = "1.11.0" androidx-core-ktx = "1.17.0" androidx-core-splashscreen = "1.0.1" -androidx-lifecycle = "2.9.4" -androidx-navigation = "2.9.0" +androidx-lifecycle = "2.10.0-alpha04" +androidx-navigation = "2.9.1" androidx-preference = "1.2.1" coil = "3.3.0" -compose-android = "1.9.0" -compose-hot-reload = "1.0.0-beta09" -compose-multiplatform = "1.9.0" +compose-multiplatform = "1.10.0-beta01" +compose-multiplatform-material3 = "1.9.0-beta03" coroutines = "1.10.2" doistx-normalize = "1.2.0" exposed = "0.61.0" @@ -47,10 +46,14 @@ androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navi androidx-preference = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" } coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } -components-ui-tooling-preview = { module = "org.jetbrains.compose.components:components-ui-tooling-preview", version.ref = "compose-multiplatform" } +compose-animation = { module = "org.jetbrains.compose.animation:animation", version.ref = "compose-multiplatform" } +compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose-multiplatform" } +compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-multiplatform" } +compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose-multiplatform-material3" } +compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" } compose-ui-backhandler = { module = "org.jetbrains.compose.ui:ui-backhandler", version.ref = "compose-multiplatform" } -compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-android" } -compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-android" } +compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "compose-multiplatform" } +compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose-multiplatform" } doistx-normalize = { module = "com.doist.x:normalize", version.ref = "doistx-normalize" } exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" } exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" } @@ -106,7 +109,6 @@ aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "abo androidApplication = { id = "com.android.application", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" } composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "compose-hot-reload" } composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } googleServices = { id = "com.google.gms.google-services", version.ref = "google-services" } jib = { id = "com.google.cloud.tools.jib", version.ref = "jib" } diff --git a/kotlin-js-store/wasm/yarn.lock b/kotlin-js-store/wasm/yarn.lock index b27bf3da..7cb0638d 100644 --- a/kotlin-js-store/wasm/yarn.lock +++ b/kotlin-js-store/wasm/yarn.lock @@ -12,11 +12,6 @@ resolved "https://registry.yarnpkg.com/@js-joda/timezone/-/timezone-2.3.0.tgz#72878f6dc8afef20c29906e5d8d946f91618a2c3" integrity sha512-DHXdNs0SydSqC5f0oRJPpTcNfnpRojgBqMCFupQFv6WgeZAjU3DBx+A7JtaGPP3dHrP2Odi2N8Vf+uAm/8ynCQ== -format-util@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" - integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== - ws@8.18.0: version "8.18.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" diff --git a/settings.gradle.kts b/settings.gradle.kts index 9e4b03ea..a2911bcf 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,12 +6,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { repositories { - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") { - mavenContent { - includeGroupAndSubgroups("org.jetbrains.compose") - includeGroupAndSubgroups("org.jetbrains.androidx") - } - } google { mavenContent { includeGroupAndSubgroups("android") @@ -28,12 +22,6 @@ pluginManagement { dependencyResolutionManagement { repositories { - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") { - mavenContent { - includeGroupAndSubgroups("org.jetbrains.compose") - includeGroupAndSubgroups("org.jetbrains.androidx") - } - } google { mavenContent { includeGroupAndSubgroups("android") @@ -46,10 +34,6 @@ dependencyResolutionManagement { } } -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" -} - include(":androidApp") include(":ui-components") include(":ui-components-gallery") diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 86655559..a1a998fd 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -2,9 +2,7 @@ import com.mikepenz.aboutlibraries.plugin.DuplicateMode import com.mikepenz.aboutlibraries.plugin.DuplicateRule -import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig plugins { alias(libs.plugins.aboutLibraries) @@ -14,7 +12,6 @@ plugins { alias(libs.plugins.composeCompiler) alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.kotlinSerialization) - alias(libs.plugins.composeHotReload) } kotlin { @@ -70,12 +67,11 @@ kotlin { commonMain.dependencies { api(projects.uiComponents) - api(compose.runtime) - api(compose.foundation) - api(compose.animation) - api(compose.components.resources) + api(libs.compose.runtime) + api(libs.compose.foundation) + api(libs.compose.animation) + api(libs.compose.components.resources) - api(libs.components.ui.tooling.preview) api(libs.koin.compose.viewmodel.navigation) api(libs.ktor.client.logging) @@ -159,7 +155,7 @@ android { // Android preview support dependencies { - debugImplementation(compose.uiTooling) + debugImplementation(libs.compose.ui.tooling) } compose.desktop { diff --git a/ui-components-gallery/build.gradle.kts b/ui-components-gallery/build.gradle.kts index 3f0b75e9..e8130907 100644 --- a/ui-components-gallery/build.gradle.kts +++ b/ui-components-gallery/build.gradle.kts @@ -1,11 +1,9 @@ -import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl plugins { alias(libs.plugins.composeMultiplatform) alias(libs.plugins.composeCompiler) alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.composeHotReload) alias(libs.plugins.androidApplication) } @@ -33,12 +31,12 @@ kotlin { sourceSets { commonMain.dependencies { - api(compose.runtime) - api(compose.foundation) - api(compose.animation) - implementation(compose.material3) - api(compose.components.resources) - api(compose.components.uiToolingPreview) + api(libs.compose.runtime) + api(libs.compose.foundation) + api(libs.compose.animation) + implementation(libs.compose.material3) + api(libs.compose.components.resources) + api(libs.compose.ui.tooling.preview) implementation(projects.uiComponents) } @@ -78,5 +76,5 @@ android { // Android preview support dependencies { - debugImplementation(compose.uiTooling) + debugImplementation(libs.compose.ui.tooling) } diff --git a/ui-components/build.gradle.kts b/ui-components/build.gradle.kts index 971ce0aa..9bed6c22 100644 --- a/ui-components/build.gradle.kts +++ b/ui-components/build.gradle.kts @@ -1,6 +1,5 @@ @file:OptIn(ExperimentalKotlinGradlePluginApi::class) -import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl @@ -9,7 +8,6 @@ plugins { alias(libs.plugins.composeMultiplatform) alias(libs.plugins.composeCompiler) alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.composeHotReload) } kotlin { @@ -33,12 +31,12 @@ kotlin { sourceSets { commonMain.dependencies { - api(compose.runtime) - api(compose.foundation) - api(compose.animation) - implementation(compose.material3) - api(compose.components.resources) - api(compose.components.uiToolingPreview) + api(libs.compose.runtime) + api(libs.compose.foundation) + api(libs.compose.animation) + implementation(libs.compose.material3) + api(libs.compose.components.resources) + implementation(libs.compose.ui.tooling.preview) implementation(libs.coil.compose) implementation(libs.coil.network.ktor3) @@ -96,5 +94,5 @@ compose.resources { // Android preview support dependencies { - debugImplementation(compose.uiTooling) + debugImplementation(libs.compose.ui.tooling) } diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Action.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Action.kt index c07616ea..79ccefe4 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Action.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Action.kt @@ -12,12 +12,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate import androidx.compose.ui.semantics.Role +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinconfapp.ui_components.generated.resources.UiRes import kotlinconfapp.ui_components.generated.resources.arrow_right_24 import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource -import org.jetbrains.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Button.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Button.kt index 41558fd4..74c544e7 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Button.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Button.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.role import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/CardTag.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/CardTag.kt index 51f44ceb..7187ecb7 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/CardTag.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/CardTag.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/DayHeader.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/DayHeader.kt index 3510b885..69f08cd7 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/DayHeader.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/DayHeader.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.Brand.colorGradient import org.jetbrains.kotlinconf.ui.theme.JetBrainsSans import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ErrorLoading.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ErrorLoading.kt index 9699be00..fa76e358 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ErrorLoading.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ErrorLoading.kt @@ -54,7 +54,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.vectorResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper import org.jetbrains.kotlinconf.ui.theme.UI diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FeedbackForm.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FeedbackForm.kt index 91a1a833..63e86653 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FeedbackForm.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FeedbackForm.kt @@ -37,7 +37,7 @@ import kotlinconfapp.ui_components.generated.resources.arrow_right_24 import kotlinconfapp.ui_components.generated.resources.feedback_form_send import kotlinconfapp.ui_components.generated.resources.feedback_form_type_something import org.jetbrains.compose.resources.stringResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Filters.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Filters.kt index 630548a5..a2b59dd2 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Filters.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Filters.kt @@ -55,7 +55,7 @@ import kotlinconfapp.ui_components.generated.resources.filter_label_session_form import kotlinconfapp.ui_components.generated.resources.up_24 import org.jetbrains.compose.resources.pluralStringResource import org.jetbrains.compose.resources.stringResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FiltersTag.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FiltersTag.kt index 948bb078..bedd7a54 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FiltersTag.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/FiltersTag.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Kodee.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Kodee.kt index bb7ff2ed..2cae6511 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Kodee.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Kodee.kt @@ -32,7 +32,7 @@ import kotlinconfapp.ui_components.generated.resources.kodee_small_positive_fill import kotlinconfapp.ui_components.generated.resources.kodee_small_positive_outline import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.vectorResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainHeader.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainHeader.kt index 44371cfa..3484fed7 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainHeader.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainHeader.kt @@ -39,7 +39,7 @@ import kotlinconfapp.ui_components.generated.resources.main_header_search_clear import kotlinconfapp.ui_components.generated.resources.main_header_search_hint import kotlinconfapp.ui_components.generated.resources.search_24 import org.jetbrains.compose.resources.stringResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainNavigation.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainNavigation.kt index 5e71bb31..b5e6101b 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainNavigation.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/MainNavigation.kt @@ -29,7 +29,7 @@ import kotlinconfapp.ui_components.generated.resources.team_28 import kotlinconfapp.ui_components.generated.resources.team_28_fill import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper import kotlin.reflect.KClass diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowButton.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowButton.kt index b732542e..7eda1c12 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowButton.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowButton.kt @@ -30,7 +30,7 @@ import kotlinconfapp.ui_components.generated.resources.arrow_down_16 import kotlinconfapp.ui_components.generated.resources.now import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.components.NowButtonState.After import org.jetbrains.kotlinconf.ui.components.NowButtonState.Before import org.jetbrains.kotlinconf.ui.components.NowButtonState.Current diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowLabel.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowLabel.kt index cb0a68df..75a416bd 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowLabel.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/NowLabel.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp import kotlinconfapp.ui_components.generated.resources.UiRes import kotlinconfapp.ui_components.generated.resources.now import org.jetbrains.compose.resources.stringResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageMenuItem.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageMenuItem.kt index fabe1a57..d200b50d 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageMenuItem.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageMenuItem.kt @@ -19,7 +19,7 @@ import kotlinconfapp.ui_components.generated.resources.UiRes import kotlinconfapp.ui_components.generated.resources.arrow_right_24 import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageTitle.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageTitle.kt index 43e0e4ce..5ceedb70 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageTitle.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PageTitle.kt @@ -44,7 +44,7 @@ import kotlinconfapp.ui_components.generated.resources.session_education import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.vectorResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ParagraphTitle.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ParagraphTitle.kt index baf14fac..6653b156 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ParagraphTitle.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ParagraphTitle.kt @@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PartnerCard.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PartnerCard.kt index ce94421c..c6aae77c 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PartnerCard.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/PartnerCard.kt @@ -17,7 +17,7 @@ import kotlinconfapp.ui_components.generated.resources.UiRes import kotlinconfapp.ui_components.generated.resources.kodee_large_positive_light import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ScrollIndicator.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ScrollIndicator.kt index 883c4d9c..bbaff63f 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ScrollIndicator.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ScrollIndicator.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper import kotlin.time.Duration.Companion.milliseconds diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SectionTitle.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SectionTitle.kt index 08c07252..79b83c63 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SectionTitle.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SectionTitle.kt @@ -2,7 +2,7 @@ package org.jetbrains.kotlinconf.ui.components import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ServiceEvents.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ServiceEvents.kt index 70f0987a..9edd2f2c 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ServiceEvents.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/ServiceEvents.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SettingsItem.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SettingsItem.kt index 09d2a748..9e7bd961 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SettingsItem.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SettingsItem.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SpeakerCard.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SpeakerCard.kt index 1203f9dd..e1cb8564 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SpeakerCard.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/SpeakerCard.kt @@ -21,7 +21,7 @@ import coil3.request.crossfade import kotlinconfapp.ui_components.generated.resources.UiRes import kotlinconfapp.ui_components.generated.resources.kodee_emotion_neutral import org.jetbrains.compose.resources.painterResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Switcher.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Switcher.kt index b3d75bef..14bed1a4 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Switcher.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Switcher.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TalkCard.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TalkCard.kt index 28cc5649..d1b9c486 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TalkCard.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TalkCard.kt @@ -81,7 +81,7 @@ import kotlinconfapp.ui_components.generated.resources.up_24 import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.vectorResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Toggle.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Toggle.kt index 6f444263..6b160712 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Toggle.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/Toggle.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.unit.dp -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TopMenuButton.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TopMenuButton.kt index 8f83443b..e7dacf29 100644 --- a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TopMenuButton.kt +++ b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TopMenuButton.kt @@ -25,7 +25,7 @@ import kotlinconfapp.ui_components.generated.resources.close_24 import kotlinconfapp.ui_components.generated.resources.search_24 import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource -import org.jetbrains.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme import org.jetbrains.kotlinconf.ui.theme.PreviewHelper