Коммит 75c9469b создал по автору Radch-enko's avatar Radch-enko
Просмотр файлов

Feature: add SelectRoom and RoomInfo modules with improved dependency management

- Introduced `RoomInfo` and `SelectRoom` feature modules for tablet clients.
- Updated `libs.versions.toml` with `kotlinx-datetime` and `decompose` dependencies.
- Configured reusable dependency management for `datetime` and `decompose` in feature modules.
- Improved iOS project setup with updated Xcode scheme and corrected `BookingApp` configurations.
- Enhanced Gradle build scripts for modularization and consistency across tablet features.
владелец e5573217
import band.effective.office.backend.libs
import gradle.kotlin.dsl.accessors._628e4eb050456810d51173b39b973811.kotlin
import gradle.kotlin.dsl.accessors._628e4eb050456810d51173b39b973811.sourceSets
......@@ -8,7 +9,7 @@ plugins {
kotlin {
sourceSets {
commonMain.dependencies {
//getLibraryFromLibsToml("kotlinx.datetime")
implementation(libs.findLibrary("kotlinx.datetime").get())
}
}
}
import band.effective.office.backend.libs
import gradle.kotlin.dsl.accessors._628e4eb050456810d51173b39b973811.kotlin
import gradle.kotlin.dsl.accessors._628e4eb050456810d51173b39b973811.sourceSets
plugins {
id("band.effective.office.client.kmp.library")
id("band.effective.office.client.kmp.ui")
......@@ -9,6 +13,9 @@ kotlin {
implementation(project(":clients:tablet:core:ui"))
implementation(project(":clients:tablet:core:domain"))
implementation(project(":clients:tablet:core:data"))
implementation(libs.findLibrary("decompose").get())
implementation(libs.findLibrary("decompose.compose.jetbrains").get())
}
}
}
\ Нет новой строки в конце файла
}
......@@ -18,6 +18,12 @@ kotlin {
isStatic = true
}
}
sourceSets {
commonMain.dependencies {
implementation(libs.findLibrary("napier").get())
}
}
}
android {
......
plugins {
id("band.effective.office.client.kmp.domain")
}
\ Нет новой строки в конце файла
}
kotlin {
sourceSets {
commonMain.dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.7.0")
implementation(libs.kotlin.coroutines.core)
}
androidMain.dependencies {
implementation(libs.coroutines.android)
}
}
}
plugins {
id("band.effective.office.client.kmp.feature")
}
\ Нет новой строки в конце файла
plugins {
id("band.effective.office.client.kmp.feature")
}
kotlin {
sourceSets {
commonMain.dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.7.0")
}
}
}
......@@ -66,6 +66,12 @@ koin = "4.1.0"
multiplatformSettings = "1.3.0"
buildkonfig = "0.15.1"
## Datetime
datetime = "0.7.0"
## Decompose
decompose = "3.3.0"
[libraries]
# Common
## Kotlin
......@@ -165,6 +171,13 @@ multiplatformSettings = { module = "com.russhwolf:multiplatform-settings-no-arg"
## Coroutines
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinCoroutines" }
## Datetime
kotlinx-datetime = { module="org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
## Decompose
decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" }
decompose-compose-jetbrains = { module = "com.arkivanov.decompose:extensions-compose-jetbrains", version.ref = "decompose" }
[plugins]
# Common
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
......
......@@ -13,7 +13,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
A93A953729CC810C00F8E227 /* BookingApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BookingApp.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A93A953729CC810C00F8E227 /* BookingApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BookingApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
A93A953A29CC810C00F8E227 /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = "<group>"; };
A93A953E29CC810D00F8E227 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A93A954129CC810D00F8E227 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
......@@ -291,6 +291,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = "${TEAM_ID}";
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = iosApp/Info.plist;
......@@ -301,7 +302,7 @@
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = band.effective.office.tablet.iosApp;
PRODUCT_NAME = "BookingApp";
PRODUCT_NAME = BookingApp;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -326,7 +327,7 @@
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = band.effective.office.tablet.iosApp;
PRODUCT_NAME = "BookingApp";
PRODUCT_NAME = BookingApp;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
......
......@@ -28,5 +28,9 @@
ReferencedContainer = "container:iosApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<LocationScenarioReference
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
referenceType = "1">
</LocationScenarioReference>
</LaunchAction>
</Scheme>
......@@ -45,4 +45,6 @@ include(
"clients:tablet:core:domain",
"clients:tablet:core:data",
"clients:tablet:feature:main",
)
\ Нет новой строки в конце файла
"clients:tablet:feature:roominfo",
"clients:tablet:feature:selectroom",
)
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать