Skip to content

Commit d3bb6fa

Browse files
committed
Update build config files
1 parent 1ae12a2 commit d3bb6fa

File tree

24 files changed

+52
-205
lines changed

24 files changed

+52
-205
lines changed

app-common/designsystem/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,9 @@ kotlin {
2424
implementation(libs.jetbrains.compose.runtime)
2525
implementation(libs.jetbrains.compose.ui)
2626
}
27-
28-
androidMain.dependencies {
29-
implementation(libs.jetbrains.compose.uiTooling)
30-
}
3127
androidUnitTest.dependencies {
3228
implementation(libs.junit)
3329
}
34-
val desktopMain by getting
35-
desktopMain.dependencies {
36-
implementation(libs.jetbrains.compose.uiTooling)
37-
}
3830

3931
all {
4032
languageSettings.optIn("kotlin.RequiresOptIn")

app-common/ui-tooling/build.gradle.kts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@ plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.jetbrains.compose)
44
alias(libs.plugins.jetbrains.composeCompiler)
5+
alias(libs.plugins.jetbrains.kotlinMultiplatform)
56
alias(libs.plugins.sergiobelda.gradle.common.library.android)
67
alias(libs.plugins.sergiobelda.gradle.dependencyGraphGenerator)
78
alias(libs.plugins.sergiobelda.gradle.lint)
8-
kotlin("android")
99
}
1010

11-
android {
12-
namespace = "dev.sergiobelda.todometer.app.common.ui.tooling"
13-
}
11+
kotlin {
12+
androidTarget()
13+
jvm("desktop")
14+
iosX64()
15+
iosArm64()
16+
iosSimulatorArm64()
1417

15-
dependencies {
16-
implementation(projects.appCommon.ui)
17-
implementation(projects.common.resources)
18+
sourceSets {
19+
commonMain.dependencies {
20+
api(projects.common.uiTooling)
21+
implementation(projects.appCommon.ui)
22+
implementation(projects.common.resources)
23+
}
24+
}
25+
}
1826

19-
implementation(libs.jetbrains.compose.ui)
20-
implementation(libs.jetbrains.compose.uiToolingPreview)
27+
android {
28+
namespace = "dev.sergiobelda.todometer.app.common.ui.tooling"
2129
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package dev.sergiobelda.todometer.app.common.ui.tooling.preview
1818

19-
import android.content.res.Configuration.UI_MODE_NIGHT_YES
20-
import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
19+
import androidx.compose.ui.tooling.preview.AndroidUiModes.UI_MODE_NIGHT_YES
20+
import androidx.compose.ui.tooling.preview.AndroidUiModes.UI_MODE_TYPE_NORMAL
2121
import androidx.compose.ui.tooling.preview.Preview
2222

2323
@Retention(AnnotationRetention.BINARY)

app-common/ui/build.gradle.kts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ kotlin {
1717

1818
sourceSets {
1919
commonMain.dependencies {
20-
implementation(projects.appCommon.designsystem)
21-
implementation(projects.common.domain)
22-
implementation(projects.common.resources)
23-
implementation(projects.common.ui)
24-
25-
implementation(libs.jetbrains.kotlin.datetime)
20+
api(projects.common.ui)
21+
api(projects.appCommon.designsystem)
2622

2723
implementation(libs.sergiobelda.pigment)
2824
}

app-feature/about/build.gradle.kts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,8 @@ kotlin {
1818

1919
sourceSets {
2020
commonMain.dependencies {
21-
implementation(projects.appCommon.designsystem)
2221
implementation(projects.appCommon.ui)
23-
implementation(projects.common.resources)
24-
implementation(projects.common.ui)
25-
}
26-
androidMain.dependencies {
27-
implementation(libs.jetbrains.compose.animationGraphics)
28-
}
29-
val desktopMain by getting
30-
desktopMain.dependencies {
31-
api(libs.jetbrains.compose.uiTooling)
32-
api(libs.jetbrains.kotlin.coroutines.swing)
22+
implementation(projects.appCommon.uiTooling)
3323
}
3424

3525
all {
@@ -40,11 +30,4 @@ kotlin {
4030

4131
android {
4232
namespace = "dev.sergiobelda.todometer.app.feature.about"
43-
44-
dependencies {
45-
debugImplementation(projects.appCommon.uiTooling)
46-
debugImplementation(projects.common.uiTooling)
47-
debugImplementation(libs.jetbrains.compose.uiTooling)
48-
implementation(libs.jetbrains.compose.uiToolingPreview)
49-
}
5033
}

app-feature/addtask/build.gradle.kts

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,8 @@ kotlin {
1818

1919
sourceSets {
2020
commonMain.dependencies {
21-
implementation(projects.appCommon.designsystem)
2221
implementation(projects.appCommon.ui)
23-
implementation(projects.common.domain)
24-
implementation(projects.common.resources)
25-
implementation(projects.common.ui)
26-
}
27-
androidMain.dependencies {
28-
implementation(libs.jetbrains.compose.animationGraphics)
29-
}
30-
val desktopMain by getting
31-
desktopMain.dependencies {
32-
api(libs.jetbrains.compose.uiTooling)
33-
api(libs.jetbrains.kotlin.coroutines.swing)
22+
implementation(projects.appCommon.uiTooling)
3423
}
3524

3625
all {
@@ -41,11 +30,4 @@ kotlin {
4130

4231
android {
4332
namespace = "dev.sergiobelda.todometer.app.feature.addtask"
44-
45-
dependencies {
46-
debugImplementation(projects.appCommon.uiTooling)
47-
debugImplementation(projects.common.uiTooling)
48-
debugImplementation(libs.jetbrains.compose.uiTooling)
49-
implementation(libs.jetbrains.compose.uiToolingPreview)
50-
}
5133
}

0 commit comments

Comments
 (0)