Merge pull request #743 from Corvus400/bug/fix_build_failes_just_compile_modifier_problem

🔧 Modifier issues on the iosMain side of the code have been addressed.

Author: takahirom

app-android/build.gradle.kts

@@ -108,7 +108,7 @@ dependencies {
     implementation(projects.core.model)
     implementation(projects.core.data)
     implementation(projects.core.designsystem)
-    implementation(projects.core.ui)
+    implementation(projects.core.droidkaigiui)
     implementation(libs.composeNavigation)
     implementation(libs.composeHiltNavigation)
     implementation(libs.composeMaterialWindowSize)

app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt

@@ -50,6 +50,8 @@ import io.github.droidkaigi.confsched.contributors.contributorsScreenRoute
 import io.github.droidkaigi.confsched.contributors.contributorsScreens
 import io.github.droidkaigi.confsched.designsystem.theme.ColorContrast
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
+import io.github.droidkaigi.confsched.droidkaigiui.NavHostWithSharedAxisX
+import io.github.droidkaigi.confsched.droidkaigiui.compositionlocal.LocalSharedTransitionScope
 import io.github.droidkaigi.confsched.eventmap.eventMapScreenRoute
 import io.github.droidkaigi.confsched.eventmap.eventMapScreens
 import io.github.droidkaigi.confsched.eventmap.navigateEventMapScreen
@@ -87,8 +89,6 @@ import io.github.droidkaigi.confsched.sponsors.sponsorsScreenRoute
 import io.github.droidkaigi.confsched.sponsors.sponsorsScreens
 import io.github.droidkaigi.confsched.staff.staffScreenRoute
 import io.github.droidkaigi.confsched.staff.staffScreens
-import io.github.droidkaigi.confsched.ui.NavHostWithSharedAxisX
-import io.github.droidkaigi.confsched.ui.compositionlocal.LocalSharedTransitionScope
 import io.github.droidkaigi.confsched2024.R
 import kotlinx.collections.immutable.PersistentList
 

app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt

@@ -22,13 +22,13 @@ import androidx.window.layout.WindowInfoTracker
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.droidkaigi.confsched.data.di.RepositoryProvider
 import io.github.droidkaigi.confsched.designsystem.theme.dotGothic16FontFamily
+import io.github.droidkaigi.confsched.droidkaigiui.compositionlocal.LocalClock
 import io.github.droidkaigi.confsched.model.FontFamily.DotGothic16Regular
 import io.github.droidkaigi.confsched.model.FontFamily.SystemDefault
 import io.github.droidkaigi.confsched.model.Settings.DoesNotExists
 import io.github.droidkaigi.confsched.model.Settings.Exists
 import io.github.droidkaigi.confsched.model.Settings.Loading
 import io.github.droidkaigi.confsched.model.SettingsRepository
-import io.github.droidkaigi.confsched.ui.compositionlocal.LocalClock
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList

app-ios-shared/build.gradle.kts

@@ -52,7 +52,7 @@ kotlin {
             dependencies {
                 api(projects.core.model)
                 api(projects.core.data)
-                api(projects.core.ui)
+                api(projects.core.droidkaigiui)
                 api(projects.feature.main)
                 api(projects.feature.sessions)
                 api(projects.feature.eventmap)

app-ios-shared/src/commonMain/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiApp.kt

@@ -54,7 +54,7 @@ import io.github.droidkaigi.confsched.sponsors.sponsorsScreenRoute
 import io.github.droidkaigi.confsched.sponsors.sponsorsScreens
 import io.github.droidkaigi.confsched.staff.staffScreenRoute
 import io.github.droidkaigi.confsched.staff.staffScreens
-import io.github.droidkaigi.confsched.ui.NavHostWithSharedAxisX
+import io.github.droidkaigi.confsched.droidkaigiui.NavHostWithSharedAxisX
 import platform.Foundation.NSURL
 import platform.UIKit.UIApplication
 import platform.UIKit.UIViewController

…b/droidkaigi/confsched/ui/Annotations.kt …gi/confsched/droidkaigiui/Annotations.ktcore/common/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/Annotations.kt renamed to core/common/src/androidMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/Annotations.kt core/common/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/Annotations.kt renamed to core/common/src/androidMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/Annotations.kt

@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched.ui
+package io.github.droidkaigi.confsched.droidkaigiui
 
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject

…b/droidkaigi/confsched/ui/Annotations.kt …gi/confsched/droidkaigiui/Annotations.ktcore/common/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/Annotations.kt renamed to core/common/src/commonMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/Annotations.kt core/common/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/Annotations.kt renamed to core/common/src/commonMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/Annotations.kt

@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched.ui
+package io.github.droidkaigi.confsched.droidkaigiui
 
 @OptIn(ExperimentalMultiplatform::class)
 @OptionalExpectation

core/ui/.gitignore core/droidkaigiui/.gitignorecore/ui/.gitignore renamed to core/droidkaigiui/.gitignore

@@ -7,7 +7,9 @@ plugins {
     id("droidkaigi.primitive.detekt")
 }
 
-android.namespace = "io.github.droidkaigi.confsched.core.ui"
+// https://github.com/DroidKaigi/conference-app-2024/issues/485#issuecomment-2304251937
+// (KT-66568)[https://youtrack.jetbrains.com/issue/KT-66568/w-KLIB-resolver-The-same-uniquename...-found-in-more-than-one-library]
+android.namespace = "io.github.droidkaigi.confsched.core.droidkaigiui"
 
 kotlin {
     sourceSets {