From b11f82ea45943a3519451daf1268378ecb515c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Miguel=20Rubio?= Date: Mon, 21 Aug 2023 13:13:23 +0200 Subject: [PATCH] Androapp 5449 local library (#27) * add testing dhis2 icon * [ANDROAPP-5431] Add DHIS2 icon library * [ANDROAPP-5431] rename dhis2 icons * [ANDROAPP-5449] Renaming packages * renaming * [ANDROAPP-5431] create publish script * [ANDROAPP-5449] update references * [ANDROAPP-5449] Rename step name --- .github/workflows/continuous-deployment.yml | 2 +- build.gradle.kts | 3 - common/build.gradle.kts | 4 +- .../kotlin/org/hisp/dhis/common/App.kt | 4 +- .../hisp/dhis/common/screens/ButtonScreen.kt | 6 +- .../common/screens/FormsComponentsScreen.kt | 8 +- .../dhis/common/screens/IconButtonScreen.kt | 6 +- .../common/screens/previews/ButtonPreview.kt | 4 +- .../previews/FormsComponentsPreview.kt | 14 +-- .../screens/previews/IconButtonPreview.kt | 6 +- .../screens/radio/RadioButtonPreview.kt | 2 +- .../common/screens/radio/RadioButtonScreen.kt | 4 +- convention-plugins/build.gradle.kts | 7 ++ .../kotlin/convention.publication.gradle.kts | 101 ++++++++++++++++++ designsystem/build.gradle.kts | 8 +- .../ui}/designsystem/component/Button.kt | 16 +-- .../ui}/designsystem/component/Container.kt | 4 +- .../ui}/designsystem/component/IconButton.kt | 16 +-- .../ui}/designsystem/component/InputField.kt | 10 +- .../ui}/designsystem/component/InputShell.kt | 12 +-- .../ui}/designsystem/component/RadioButton.kt | 12 +-- .../ui}/designsystem/component/Text.kt | 4 +- .../designsystem/extensions/IconResources.kt | 2 +- .../ui}/designsystem/theme/Color.kt | 2 +- .../ui}/designsystem/theme/Outline.kt | 2 +- .../ui}/designsystem/theme/Radius.kt | 2 +- .../ui}/designsystem/theme/Ripple.kt | 2 +- .../ui}/designsystem/theme/Shadow.kt | 2 +- .../ui}/designsystem/theme/Shape.kt | 2 +- .../ui}/designsystem/theme/Spacing.kt | 2 +- .../ui}/designsystem/theme/SurfaceColor.kt | 2 +- .../ui}/designsystem/theme/TextColor.kt | 2 +- .../ui}/designsystem/theme/Theme.kt | 4 +- .../dhis/mobileui/designsystem/icon/Icons.kt | 0 desktop/build.gradle.kts | 2 +- settings.gradle.kts | 1 + 36 files changed, 195 insertions(+), 85 deletions(-) create mode 100644 convention-plugins/build.gradle.kts create mode 100644 convention-plugins/src/main/kotlin/convention.publication.gradle.kts rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/Button.kt (93%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/Container.kt (94%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/IconButton.kt (92%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/InputField.kt (89%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/InputShell.kt (93%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/RadioButton.kt (87%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/component/Text.kt (93%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/extensions/IconResources.kt (84%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Color.kt (97%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Outline.kt (68%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Radius.kt (83%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Ripple.kt (91%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Shadow.kt (98%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Shape.kt (95%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Spacing.kt (94%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/SurfaceColor.kt (92%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/TextColor.kt (87%) rename designsystem/src/commonMain/kotlin/org/hisp/dhis/{mobileui => mobile/ui}/designsystem/theme/Theme.kt (97%) delete mode 100644 designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/icon/Icons.kt diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml index 1022a808f..bb8517b8d 100644 --- a/.github/workflows/continuous-deployment.yml +++ b/.github/workflows/continuous-deployment.yml @@ -33,5 +33,5 @@ jobs: run: chmod +x ./gradlew # Create publish to maven - - name: Build apk debug project (APK) - ${{ env.main_project_module }} module + - name: Publish to maven run: ./gradlew publishAllPublicationsToSonatypeRepository diff --git a/build.gradle.kts b/build.gradle.kts index a0ea77ec8..a22f81716 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,3 @@ -group = "org.hisp.dhis.mobileui" -version = "1.0-SNAPSHOT" - plugins { kotlin("jvm") apply false kotlin("multiplatform") apply false diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 50dc52684..51f036666 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -51,7 +51,7 @@ kotlin { android { compileSdk = (findProperty("android.compileSdk") as String).toInt() - namespace = "org.hisp.dhis.mobileui.common" + namespace = "org.hisp.dhis.mobile.ui.common" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") @@ -78,7 +78,7 @@ ktlint { } multiplatformResources { - multiplatformResourcesPackage = "org.hisp.dhis.mobileui.library" + multiplatformResourcesPackage = "org.hisp.dhis.mobile.ui" multiplatformResourcesClassName = "SharedRes" } diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt index edf8e7407..3751d122f 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt @@ -25,8 +25,8 @@ import org.hisp.dhis.common.screens.Components import org.hisp.dhis.common.screens.FormsComponentsScreen import org.hisp.dhis.common.screens.IconButtonScreen import org.hisp.dhis.common.screens.radio.RadioButtonScreen -import org.hisp.dhis.mobileui.designsystem.theme.DHIS2Theme -import org.hisp.dhis.mobileui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2Theme +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing @Composable fun App() { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ButtonScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ButtonScreen.kt index 7e63f204e..1917d20d7 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ButtonScreen.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ButtonScreen.kt @@ -4,9 +4,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import org.hisp.dhis.common.screens.previews.ButtonPreview import org.hisp.dhis.common.screens.previews.ButtonPreviewWithIcon -import org.hisp.dhis.mobileui.designsystem.component.ButtonStyle -import org.hisp.dhis.mobileui.designsystem.component.ColumnComponentContainer -import org.hisp.dhis.mobileui.designsystem.component.RowComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.ButtonStyle +import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.RowComponentContainer @Composable fun ButtonScreen() { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/FormsComponentsScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/FormsComponentsScreen.kt index b7a651d52..dbb2a68a1 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/FormsComponentsScreen.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/FormsComponentsScreen.kt @@ -7,10 +7,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import org.hisp.dhis.common.screens.previews.InputShellPreview -import org.hisp.dhis.mobileui.designsystem.component.ColumnComponentContainer -import org.hisp.dhis.mobileui.designsystem.component.InputShellState -import org.hisp.dhis.mobileui.designsystem.component.SimpleTextInputField -import org.hisp.dhis.mobileui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState +import org.hisp.dhis.mobile.ui.designsystem.component.SimpleTextInputField +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing @Composable fun FormsComponentsScreen() { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/IconButtonScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/IconButtonScreen.kt index d0d9418f1..5f20835f8 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/IconButtonScreen.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/IconButtonScreen.kt @@ -7,9 +7,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp import org.hisp.dhis.common.screens.previews.IconButtonPreview import org.hisp.dhis.common.screens.previews.SquareIconButtonPreview -import org.hisp.dhis.mobileui.designsystem.component.ColumnComponentContainer -import org.hisp.dhis.mobileui.designsystem.component.IconButtonStyle -import org.hisp.dhis.mobileui.designsystem.component.RowComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.IconButtonStyle +import org.hisp.dhis.mobile.ui.designsystem.component.RowComponentContainer @Composable fun IconButtonScreen() { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/ButtonPreview.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/ButtonPreview.kt index 4c54b0452..16340ecd0 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/ButtonPreview.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/ButtonPreview.kt @@ -4,8 +4,8 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material3.Icon import androidx.compose.runtime.Composable -import org.hisp.dhis.mobileui.designsystem.component.Button -import org.hisp.dhis.mobileui.designsystem.component.ButtonStyle +import org.hisp.dhis.mobile.ui.designsystem.component.Button +import org.hisp.dhis.mobile.ui.designsystem.component.ButtonStyle @Composable internal fun ButtonPreview(text: String, style: ButtonStyle = ButtonStyle.OUTLINED, enabled: Boolean = true) { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/FormsComponentsPreview.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/FormsComponentsPreview.kt index d43ec830b..88af0aae3 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/FormsComponentsPreview.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/FormsComponentsPreview.kt @@ -10,13 +10,13 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.hisp.dhis.mobileui.designsystem.component.EmptyInput -import org.hisp.dhis.mobileui.designsystem.component.IconButton -import org.hisp.dhis.mobileui.designsystem.component.InputShell -import org.hisp.dhis.mobileui.designsystem.component.InputShellState -import org.hisp.dhis.mobileui.designsystem.component.SquareIconButton -import org.hisp.dhis.mobileui.designsystem.theme.Spacing -import org.hisp.dhis.mobileui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.component.EmptyInput +import org.hisp.dhis.mobile.ui.designsystem.component.IconButton +import org.hisp.dhis.mobile.ui.designsystem.component.InputShell +import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState +import org.hisp.dhis.mobile.ui.designsystem.component.SquareIconButton +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor @Composable internal fun InputShellPreview( diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/IconButtonPreview.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/IconButtonPreview.kt index 97be4ed23..d30612170 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/IconButtonPreview.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/IconButtonPreview.kt @@ -4,9 +4,9 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.FileDownload import androidx.compose.material3.Icon import androidx.compose.runtime.Composable -import org.hisp.dhis.mobileui.designsystem.component.IconButton -import org.hisp.dhis.mobileui.designsystem.component.IconButtonStyle -import org.hisp.dhis.mobileui.designsystem.component.SquareIconButton +import org.hisp.dhis.mobile.ui.designsystem.component.IconButton +import org.hisp.dhis.mobile.ui.designsystem.component.IconButtonStyle +import org.hisp.dhis.mobile.ui.designsystem.component.SquareIconButton @Composable internal fun SquareIconButtonPreview(enabled: Boolean = true) { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonPreview.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonPreview.kt index a2b086d53..4541c92bc 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonPreview.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonPreview.kt @@ -1,7 +1,7 @@ package org.hisp.dhis.common.screens.radio import androidx.compose.runtime.Composable -import org.hisp.dhis.mobileui.designsystem.component.RadioButton +import org.hisp.dhis.mobile.ui.designsystem.component.RadioButton @Composable internal fun RadioButtonPreview(selected: Boolean = true, enabled: Boolean = true) { diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonScreen.kt index 75c8dc281..f8f637f3b 100644 --- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonScreen.kt +++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/radio/RadioButtonScreen.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import org.hisp.dhis.mobileui.designsystem.component.ColumnComponentContainer -import org.hisp.dhis.mobileui.designsystem.component.RowComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer +import org.hisp.dhis.mobile.ui.designsystem.component.RowComponentContainer @Composable fun RadioButtonScreen() { diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts new file mode 100644 index 000000000..39bd51e4f --- /dev/null +++ b/convention-plugins/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` // Is needed to turn our build logic written in Kotlin into the Gradle Plugin +} + +repositories { + gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin +} \ No newline at end of file diff --git a/convention-plugins/src/main/kotlin/convention.publication.gradle.kts b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts new file mode 100644 index 000000000..d7f2bd055 --- /dev/null +++ b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts @@ -0,0 +1,101 @@ +import org.gradle.api.publish.maven.MavenPublication +import org.gradle.api.tasks.bundling.Jar +import org.gradle.kotlin.dsl.`maven-publish` +import org.gradle.kotlin.dsl.signing +import java.util.* + +plugins { + `maven-publish` + signing +} + +// Stub secrets to let the project sync and build without the publication values set up +ext["signing.keyId"] = null +ext["signing.password"] = null +ext["signing.secretKeyRingFile"] = null +ext["ossrhUsername"] = null +ext["ossrhPassword"] = null + +// Grabbing secrets from local.properties file or from environment variables, which could be used on CI +val secretPropsFile = project.rootProject.file("local.properties") +if (secretPropsFile.exists()) { + secretPropsFile.reader().use { + Properties().apply { + load(it) + } + }.onEach { (name, value) -> + ext[name.toString()] = value + } +} else { + ext["signing.keyId"] = System.getenv("SIGNING_KEY_ID") + ext["signing.password"] = System.getenv("SIGNING_PASSWORD") + ext["signing.secretKeyRingFile"] = System.getenv("SIGNING_SECRET_KEY_RING_FILE") + ext["ossrhUsername"] = System.getenv("OSSRH_USERNAME") + ext["ossrhPassword"] = System.getenv("OSSRH_PASSWORD") +} + +val javadocJar by tasks.registering(Jar::class) { + archiveClassifier.set("javadoc") +} + +fun getExtraString(name: String) = ext[name]?.toString() + +publishing { + // Configure maven central repository + repositories { + maven { + name = "sonatype" + setUrl("https://oss.sonatype.org/content/repositories/snapshots/") + credentials { + username = getExtraString("ossrhUsername") + password = getExtraString("ossrhPassword") + } + } + } + + // Configure all publications + publications.withType { + // Stub javadoc.jar artifact + artifact(javadocJar.get()) + + // Provide artifacts information requited by Maven Central + pom { + name.set("DHIS2 Mobile Design system") + description.set("Compose Multiplatform DHIS2 Mobile UI components library") + url.set("https://github.com/dhis2/dhis2-mobile-ui") + + licenses { + license { + name.set("MIT") + url.set("https://opensource.org/licenses/MIT") + } + } + developers { + developer { + id.set("andresmr") + name.set("Andres") + email.set("andres@dhis2.org") + } + developer { + id.set("xavimolloy") + name.set("Xavi") + email.set("xavi@dhis2.org") + } + developer { + id.set("DavidAparicioAlbaAsenjo") + name.set("David") + email.set("david.aparicio@dhis2.org") + } + } + scm { + url.set("https://github.com/dhis2/dhis2-mobile-ui") + } + } + } +} + +// Signing artifacts. Signing.* extra properties values will be used +signing { + isRequired = false + sign(publishing.publications) +} \ No newline at end of file diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts index 0d8b95c94..a9d6935d9 100644 --- a/designsystem/build.gradle.kts +++ b/designsystem/build.gradle.kts @@ -1,9 +1,13 @@ +group = "org.hisp.dhis.mobile" +version = "1.0-SNAPSHOT" + plugins { kotlin("multiplatform") id("org.jetbrains.compose") id("com.android.library") id("org.jlleitschuh.gradle.ktlint") id("dev.icerock.mobile.multiplatform-resources") + id("convention.publication") } kotlin { @@ -28,7 +32,7 @@ kotlin { android { compileSdk = (findProperty("android.compileSdk") as String).toInt() - namespace = "org.hisp.dhis.mobileui.designsystem" + namespace = "org.hisp.dhis.mobile.ui.designsystem" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") sourceSets["main"].res.srcDirs("src/androidMain/res") @@ -55,7 +59,7 @@ ktlint { } multiplatformResources { - multiplatformResourcesPackage = "org.hisp.dhis.mobileui.designsystem.library" + multiplatformResourcesPackage = "org.hisp.dhis.mobile.ui.designsystem" multiplatformResourcesClassName = "SharedRes" } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Button.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt similarity index 93% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Button.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt index f66bc1eb4..d062788dd 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Button.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues @@ -12,13 +12,13 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import org.hisp.dhis.mobileui.designsystem.theme.Outline -import org.hisp.dhis.mobileui.designsystem.theme.Radius -import org.hisp.dhis.mobileui.designsystem.theme.Ripple -import org.hisp.dhis.mobileui.designsystem.theme.Spacing -import org.hisp.dhis.mobileui.designsystem.theme.SurfaceColor -import org.hisp.dhis.mobileui.designsystem.theme.TextColor -import org.hisp.dhis.mobileui.designsystem.theme.buttonShadow +import org.hisp.dhis.mobile.ui.designsystem.theme.Outline +import org.hisp.dhis.mobile.ui.designsystem.theme.Radius +import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.buttonShadow /** * DHIS2 button with generic icon slot. diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Container.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Container.kt similarity index 94% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Container.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Container.kt index ee7d2eb59..5d923d937 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Container.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Container.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -12,7 +12,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import org.hisp.dhis.mobileui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing /** * DHIS2 ColumnComponentContainer wraps Material 3 [Column] diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/IconButton.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt similarity index 92% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/IconButton.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt index 19394177a..c127da863 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/IconButton.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues @@ -18,13 +18,13 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import org.hisp.dhis.mobileui.designsystem.theme.Outline -import org.hisp.dhis.mobileui.designsystem.theme.Radius -import org.hisp.dhis.mobileui.designsystem.theme.Ripple -import org.hisp.dhis.mobileui.designsystem.theme.Spacing -import org.hisp.dhis.mobileui.designsystem.theme.SurfaceColor -import org.hisp.dhis.mobileui.designsystem.theme.TextColor -import org.hisp.dhis.mobileui.designsystem.theme.iconButtonshadow +import org.hisp.dhis.mobile.ui.designsystem.theme.Outline +import org.hisp.dhis.mobile.ui.designsystem.theme.Radius +import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.iconButtonshadow /** * DHIS2 square icon button with generic icon slot. Wraps Material 3 [ElevatedButton]. diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/InputField.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputField.kt similarity index 89% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/InputField.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputField.kt index 1999c7e6b..3bd5b9666 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/InputField.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputField.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -18,10 +18,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.graphics.PathEffect import androidx.compose.ui.graphics.drawscope.Stroke -import org.hisp.dhis.mobileui.designsystem.theme.Outline -import org.hisp.dhis.mobileui.designsystem.theme.Radius -import org.hisp.dhis.mobileui.designsystem.theme.Spacing -import org.hisp.dhis.mobileui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.Outline +import org.hisp.dhis.mobile.ui.designsystem.theme.Radius +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor /** * DHIS2 Text Input Field. Wraps Material· [BasicTextField]. diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/InputShell.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputShell.kt similarity index 93% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/InputShell.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputShell.kt index 354f40f09..3f8b18798 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/InputShell.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputShell.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -21,11 +21,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color -import org.hisp.dhis.mobileui.designsystem.theme.Outline -import org.hisp.dhis.mobileui.designsystem.theme.Radius -import org.hisp.dhis.mobileui.designsystem.theme.Spacing -import org.hisp.dhis.mobileui.designsystem.theme.SurfaceColor -import org.hisp.dhis.mobileui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.Outline +import org.hisp.dhis.mobile.ui.designsystem.theme.Radius +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor /** * DHIS2 Input Shell diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/RadioButton.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt similarity index 87% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/RadioButton.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt index 049a3d420..ffd6ad970 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/RadioButton.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -14,11 +14,11 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.hisp.dhis.mobileui.designsystem.theme.Outline -import org.hisp.dhis.mobileui.designsystem.theme.Ripple -import org.hisp.dhis.mobileui.designsystem.theme.Spacing -import org.hisp.dhis.mobileui.designsystem.theme.SurfaceColor -import org.hisp.dhis.mobileui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.Outline +import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor /** * DHIS2 radio button with or without text. Wraps Material 3 [RadioButton]. diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Text.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Text.kt similarity index 93% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Text.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Text.kt index dcdae19d1..a4c2b3cf8 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/component/Text.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Text.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.component +package org.hisp.dhis.mobile.ui.designsystem.component import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign -import org.hisp.dhis.mobileui.designsystem.theme.Spacing +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing /** * DHIS2 Text with generic icon slot. Wraps Material 3 [Text] diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/extensions/IconResources.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/extensions/IconResources.kt similarity index 84% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/extensions/IconResources.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/extensions/IconResources.kt index f53c46fac..33790c732 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/extensions/IconResources.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/extensions/IconResources.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.extensions +package org.hisp.dhis.mobile.ui.designsystem.extensions import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Color.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Color.kt similarity index 97% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Color.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Color.kt index 0c1355953..530d19001 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Color.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Color.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.ui.graphics.Color diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Outline.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Outline.kt similarity index 68% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Outline.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Outline.kt index 8e1cf866d..fd6f51b6c 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Outline.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Outline.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme object Outline { val Dark = Color.Charcoal200 diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Radius.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Radius.kt similarity index 83% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Radius.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Radius.kt index cd0049492..6566970b5 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Radius.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Radius.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Ripple.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt similarity index 91% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Ripple.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt index 4bf170516..6123e2ff3 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Ripple.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.material.ripple.RippleAlpha import androidx.compose.material.ripple.RippleTheme diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Shadow.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Shadow.kt similarity index 98% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Shadow.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Shadow.kt index 6a397d96e..89a3d3795 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Shadow.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Shadow.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.foundation.layout.size import androidx.compose.ui.Modifier diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Shape.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Shape.kt similarity index 95% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Shape.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Shape.kt index 201a9d272..246f791a9 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Shape.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Shape.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Spacing.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt similarity index 94% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Spacing.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt index 409622714..b85a7e8ee 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Spacing.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/SurfaceColor.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/SurfaceColor.kt similarity index 92% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/SurfaceColor.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/SurfaceColor.kt index d86e1efbc..062aa339a 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/SurfaceColor.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/SurfaceColor.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme object SurfaceColor { val Primary = Color.Blue500 diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/TextColor.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/TextColor.kt similarity index 87% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/TextColor.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/TextColor.kt index 3af812195..d56906fb5 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/TextColor.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/TextColor.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme object TextColor { val OnPrimary = Color.NeutralWhite diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Theme.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt similarity index 97% rename from designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Theme.kt rename to designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt index c32f6a9c0..129a0fd66 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/theme/Theme.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt @@ -1,4 +1,4 @@ -package org.hisp.dhis.mobileui.designsystem.theme +package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Typography @@ -8,7 +8,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import dev.icerock.moko.resources.compose.fontFamilyResource -import org.hisp.dhis.mobileui.designsystem.library.SharedRes +import org.hisp.dhis.mobile.ui.designsystem.SharedRes val DHIS2LightColorScheme = lightColorScheme( primary = SurfaceColor.Primary, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/icon/Icons.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobileui/designsystem/icon/Icons.kt deleted file mode 100644 index e69de29bb..000000000 diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 863281f4a..d2b2eff28 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -40,7 +40,7 @@ ktlint { } multiplatformResources { - multiplatformResourcesPackage = "org.hisp.dhis.mobileui" + multiplatformResourcesPackage = "org.hisp.dhis.mobile.ui.desktop" multiplatformResourcesClassName = "SharedRes" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 241edfc24..929d69de0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,7 @@ include(":android") include(":desktop") include(":common") include(":designsystem") +includeBuild("convention-plugins") pluginManagement { repositories {