Skip to content

Commit 83164f8

Browse files
committed
refactor(thundermail): migrate to full android modules
1 parent ffe33e8 commit 83164f8

7 files changed

Lines changed: 26 additions & 48 deletions

File tree

feature/thundermail/api/build.gradle.kts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
plugins {
2-
id(ThunderbirdPlugins.Library.kmpCompose)
3-
alias(libs.plugins.dev.mokkery)
2+
id(ThunderbirdPlugins.Library.androidCompose)
43
}
54

6-
kotlin {
7-
android {
8-
namespace = "net.thunderbird.feature.thundermail"
9-
androidResources.enable = true
10-
withHostTest {
5+
android {
6+
namespace = "net.thunderbird.feature.thundermail"
7+
8+
testOptions {
9+
unitTests {
1110
isIncludeAndroidResources = true
1211
}
1312
}
14-
sourceSets {
15-
commonMain.dependencies {
16-
implementation(projects.core.featureflag)
17-
implementation(projects.core.ui.compose.theme2.common)
18-
implementation(libs.jetbrains.compose.components.resources)
19-
}
20-
}
2113
}
2214

23-
compose.resources {
24-
publicResClass = false
25-
packageOfResClass = "net.thunderbird.feature.thundermail.resources"
15+
dependencies {
16+
implementation(projects.core.featureflag)
17+
implementation(projects.core.ui.compose.theme2.common)
18+
implementation(libs.jetbrains.compose.components.resources)
2619
}
2720

2821
codeCoverage {

feature/thundermail/api/src/commonMain/kotlin/net/thunderbird/feature/thundermail/ui/RegisteredTrademarkInjector.kt renamed to feature/thundermail/api/src/main/kotlin/net/thunderbird/feature/thundermail/ui/RegisteredTrademarkInjector.kt

File renamed without changes.

feature/thundermail/api/src/commonTest/kotlin/net/thunderbird/feature/thundermail/ui/RegisteredTrademarkInjectorTest.kt renamed to feature/thundermail/api/src/test/kotlin/net/thunderbird/feature/thundermail/ui/RegisteredTrademarkInjectorTest.kt

File renamed without changes.

feature/thundermail/k9mail/build.gradle.kts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
11
plugins {
2-
id(ThunderbirdPlugins.Library.kmpCompose)
3-
alias(libs.plugins.dev.mokkery)
2+
id(ThunderbirdPlugins.Library.androidCompose)
43
}
54

6-
kotlin {
7-
android {
8-
namespace = "net.thunderbird.feature.thundermail.k9mail"
9-
androidResources.enable = true
10-
withHostTest {
5+
android {
6+
namespace = "net.thunderbird.feature.thundermail.k9mail"
7+
8+
testOptions {
9+
unitTests {
1110
isIncludeAndroidResources = true
1211
}
1312
}
14-
sourceSets {
15-
commonMain.dependencies {
16-
implementation(projects.feature.thundermail.api)
17-
}
18-
}
1913
}
2014

21-
compose.resources {
22-
publicResClass = false
23-
packageOfResClass = "net.thunderbird.feature.thundermail.k9mail.resources"
15+
dependencies {
16+
implementation(projects.feature.thundermail.api)
2417
}
2518

2619
codeCoverage {

feature/thundermail/k9mail/src/commonMain/kotlin/net/thunderbird/feature/thundermail/thunderbird/inject/FeatureThundermailModule.kt renamed to feature/thundermail/k9mail/src/main/kotlin/net/thunderbird/feature/thundermail/thunderbird/inject/FeatureThundermailModule.kt

File renamed without changes.

feature/thundermail/thunderbird/build.gradle.kts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
plugins {
2-
id(ThunderbirdPlugins.Library.kmpCompose)
3-
alias(libs.plugins.dev.mokkery)
2+
id(ThunderbirdPlugins.Library.androidCompose)
43
}
54

6-
kotlin {
7-
android {
8-
namespace = "net.thunderbird.feature.thundermail.thunderbird"
9-
androidResources.enable = true
10-
withHostTest {
5+
android {
6+
namespace = "net.thunderbird.feature.thundermail.thunderbird"
7+
testOptions {
8+
unitTests {
119
isIncludeAndroidResources = true
1210
}
1311
}
14-
sourceSets {
15-
commonMain.dependencies {
16-
implementation(projects.feature.thundermail.api)
17-
implementation(projects.core.ui.compose.theme2.common)
18-
}
19-
}
2012
}
2113

22-
compose.resources {
23-
publicResClass = false
24-
packageOfResClass = "net.thunderbird.feature.thundermail.thunderbird.resources"
14+
dependencies {
15+
implementation(projects.feature.thundermail.api)
16+
implementation(projects.core.ui.compose.theme2.common)
2517
}
2618

2719
codeCoverage {

feature/thundermail/thunderbird/src/commonMain/kotlin/net/thunderbird/feature/thundermail/thunderbird/inject/FeatureThundermailModule.kt renamed to feature/thundermail/thunderbird/src/main/kotlin/net/thunderbird/feature/thundermail/thunderbird/inject/FeatureThundermailModule.kt

File renamed without changes.

0 commit comments

Comments
 (0)