Skip to content

Commit 0d636dd

Browse files
committed
1 parent a3a46ac commit 0d636dd

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

Jetchat/package.mill

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import mill.*
44
import androidlib.*
55
import kotlinlib.*
66
import build.*
7+
import mill.api.Task.Simple as T
8+
import mill.api.{PathRef, Task}
79
import mill.javalib.api.JvmWorkerApi
810
import mill.kotlinlib.ksp.KspModule
911

@@ -41,7 +43,17 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
4143
true
4244
}
4345

44-
override def mvnDeps = super.mvnDeps() ++ Seq(
46+
private def debugMvnDeps: T[Seq[Dep]] = Task {
47+
if (androidIsDebug())
48+
Seq(
49+
mvn"androidx.compose.ui:ui-test-manifest",
50+
mvn"androidx.compose.ui:ui-tooling"
51+
)
52+
else
53+
Seq.empty[Dep]
54+
}
55+
56+
override def mvnDeps: T[Seq[Dep]] = super.mvnDeps() ++ Seq(
4557
mvn"androidx.glance:glance-appwidget:1.1.1",
4658
mvn"androidx.glance:glance-material3:1.1.1",
4759
mvn"org.jetbrains.kotlin:kotlin-stdlib-jdk8:${build.Versions.kotlinVersion}",
@@ -61,14 +73,12 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
6173
mvn"androidx.compose.ui:ui-viewbinding",
6274
mvn"androidx.compose.ui:ui-text-google-fonts",
6375
mvn"androidx.databinding:viewbinding:8.13.0",
64-
mvn"androidx.compose.ui:ui-tooling",
6576
mvn"androidx.compose.ui:ui-tooling-preview",
66-
mvn"androidx.compose.ui:ui-test-manifest",
6777
mvn"com.google.android.material:material:1.6.0"
68-
)
78+
) ++ debugMvnDeps()
6979

7080

71-
object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8AppModule {
81+
object androidTest extends AndroidAppKotlinInstrumentedTests, AndroidR8InstrumentedTestsModule {
7282
override def bomMvnDeps = super.mvnDeps() ++ Seq(
7383
mvn"androidx.compose:compose-bom:2025.08.00"
7484
)
@@ -81,8 +91,6 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
8191
true
8292
}
8393

84-
// FIXME: R8 should compile without missing classes errors
85-
override def androidR8Args = Seq("--map-diagnostics", "error", "warning")
8694

8795
def mvnDeps = super.mvnDeps() ++ Seq(
8896
mvn"junit:junit:4.13.2",
@@ -92,14 +100,7 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
92100
mvn"androidx.test:rules:1.6.1",
93101
mvn"androidx.test.ext:junit:1.2.1",
94102
mvn"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2",
95-
mvn"androidx.compose.ui:ui-test",
96-
mvn"androidx.compose.ui:ui-test-junit4",
97-
mvn"androidx.collection:collection-ktx:1.5.0",
98-
99-
// Resolve conflicts
100-
mvn"androidx.savedstate:savedstate-ktx:1.3.0",
101-
mvn"androidx.appcompat:appcompat:1.7.0",
102-
mvn"androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0"
103+
mvn"androidx.compose.ui:ui-test-junit4"
103104
)
104105

105106
}

0 commit comments

Comments
 (0)