Skip to content

Commit a540764

Browse files
vaslabsvaslabs
committed
Fix some deprecations and do some housekeeping
1 parent e14943e commit a540764

File tree

4 files changed

+49
-48
lines changed

4 files changed

+49
-48
lines changed

‎example/kotlinlib/basic/7-dependency-injection/build.mill

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ object dagger extends KspModule {
1616

1717
def kotlincOptions = super.kotlincOptions() ++ Seq("-no-reflect", "-verbose")
1818

19-
def mvnDeps = Agg(
19+
def mvnDeps = Seq(
2020
mvn"com.google.dagger:dagger-compiler:2.55"
2121
)
2222

23-
def kotlinSymbolProcessors = Agg(
23+
def kotlinSymbolProcessors = Seq(
2424
mvn"com.google.dagger:dagger-compiler:2.55"
2525
)
2626

2727
object test extends KspTests with TestModule.Junit5 {
2828

2929
def kotlincOptions = super.kotlincOptions() ++ Seq("-no-reflect", "-verbose")
3030

31-
def mvnDeps = super.mvnDeps() ++ Agg(
31+
def mvnDeps = super.mvnDeps() ++ Seq(
3232
mvn"com.google.dagger:dagger-compiler:2.55",
3333
mvn"io.kotest:kotest-runner-junit5-jvm:5.9.1"
3434
)
3535

36-
def kotlinSymbolProcessors = Agg(
36+
def kotlinSymbolProcessors = Seq(
3737
mvn"com.google.dagger:dagger-compiler:2.55"
3838
)
3939

‎example/thirdparty/androidtodo/build.mill

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
1717
def kspVersion = "1.0.28"
1818

1919
def androidApplicationNamespace = "com.example.android.architecture.blueprints.todoapp"
20-
def androidApplicationId = "com.example.android.architecture.blueprints.main"
20+
// TODO change this to com.example.android.architecture.blueprints.main when mill supports build variants
21+
def androidApplicationId = "com.example.android.architecture.blueprints.todoapp"
2122

2223
def androidSdkModule = mill.define.ModuleRef(androidSdkModule0)
2324

@@ -29,11 +30,10 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
2930

3031
def androidIsDebug = true
3132

32-
def mvnDeps: T[Agg[Dep]] = Agg(
33+
def mvnDeps: T[Seq[Dep]] = Seq(
3334
mvn"androidx.core:core-ktx:1.15.0",
3435
mvn"androidx.appcompat:appcompat:1.7.0",
3536
mvn"androidx.annotation:annotation:1.9.1",
36-
mvn"org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0",
3737
mvn"com.jakewharton.timber:timber:5.0.1",
3838
mvn"androidx.test.espresso:espresso-idling-resource:3.6.1",
3939
mvn"androidx.room:room-runtime:2.6.1",
@@ -42,37 +42,34 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
4242
mvn"androidx.activity:activity-compose:1.10.0",
4343
mvn"androidx.compose.foundation:foundation:1.7.6",
4444
mvn"androidx.compose.animation:animation-core:1.7.6",
45-
mvn"androidx.compose.foundation:foundation-android:1.7.6",
4645
mvn"androidx.compose.foundation:foundation-layout:1.7.6",
4746
mvn"androidx.compose.animation:animation:1.7.6",
4847
mvn"androidx.compose.material3:material3:1.3.1",
4948
mvn"androidx.compose.material:material:1.7.6",
50-
mvn"androidx.compose.material:material-android:1.7.6",
5149
mvn"androidx.compose.material:material-icons-core:1.7.6",
52-
mvn"androidx.compose.material:material-ripple-android:1.7.6",
5350
mvn"androidx.compose.material:material-icons-extended:1.7.6",
5451
mvn"androidx.compose.ui:ui-tooling-preview:1.7.6",
5552
mvn"androidx.navigation:navigation-compose:2.8.5",
5653
mvn"androidx.compose.ui:ui:1.7.6",
57-
mvn"androidx.compose.ui:ui-android:1.7.6",
5854
mvn"androidx.compose.ui:ui-unit:1.7.6",
5955
mvn"androidx.compose.ui:ui-text:1.7.6",
56+
mvn"androidx.emoji2:emoji2:1.3.0",
6057
mvn"androidx.compose.ui:ui-graphics:1.7.6",
61-
mvn"androidx.compose.ui:ui:1.7.6",
58+
mvn"androidx.lifecycle:lifecycle-common:2.8.7",
59+
mvn"androidx.lifecycle:lifecycle-process:2.8.7",
6260
mvn"androidx.lifecycle:lifecycle-runtime-compose:2.8.7",
6361
mvn"androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7",
64-
mvn"androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.7",
65-
mvn"com.google.accompanist:accompanist-appcompat-theme:0.36.0"
66-
.exclude("androix.appcompat" -> "appcompat"),
67-
mvn"androidx.compose.material:material-icons-core-android:1.7.6",
62+
mvn"androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7",
63+
mvn"com.google.accompanist:accompanist-appcompat-theme:0.36.0",
6864
mvn"com.google.dagger:hilt-android:2.56",
6965
mvn"androidx.hilt:hilt-navigation-compose:1.2.0",
7066
mvn"com.google.accompanist:accompanist-swiperefresh:0.36.0",
7167
mvn"androidx.compose:compose-bom:2024.12.01",
72-
mvn"androidx.customview:customview-poolingcontainer:1.0.0"
68+
mvn"androidx.customview:customview-poolingcontainer:1.0.0",
69+
mvn"androidx.tracing:tracing:1.2.0"
7370
)
7471

75-
def kotlinSymbolProcessors: T[Agg[Dep]] = Agg(
72+
def kotlinSymbolProcessors: T[Seq[Dep]] = Seq(
7673
mvn"androidx.room:room-compiler:2.6.1",
7774
mvn"com.google.dagger:hilt-android-compiler:2.56"
7875
)
@@ -83,28 +80,6 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
8380
)
8481
}
8582

86-
private val dependencyPinning = Map(
87-
"android.collection" -> "1.4.4",
88-
"androidx.lifecycle" -> "2.8.7",
89-
"androidx.compose.runtime" -> "1.7.6",
90-
"androidx.compose.material" -> "1.7.6",
91-
"androidx.compose.ui" -> "1.7.6",
92-
"androidx.appcompat" -> "1.7.0",
93-
"androidx.emoji2" -> "1.3.0",
94-
"androidx.activity" -> "1.10.0",
95-
"androidx.compose.foundation" -> "1.7.6",
96-
"androidx.compose.animation" -> "1.7.6",
97-
"androidx.collection" -> "1.4.2"
98-
)
99-
// This is a temporary fix
100-
def mapDependencies: Task[coursier.Dependency => coursier.Dependency] = Task.Anon {
101-
super.mapDependencies().andThen { (d: coursier.Dependency) =>
102-
// otherwise there are some resolution problems (version conflicts), because Coursier is using pom files only,
103-
// but Gradle is working with .module files if available
104-
dependencyPinning.get(d.module.organization.value).map(d.withVersion).getOrElse(d)
105-
}
106-
}
107-
10883
object test extends AndroidAppKotlinTests with TestModule.Junit4 {
10984
def mvnDeps = super.mvnDeps() ++ Agg(
11085
mvn"junit:junit:4.13.2"
@@ -119,6 +94,29 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
11994

12095
/** Usage
12196

122-
> ./mill app.androidDex
97+
> ./mill app.androidApk
98+
99+
> ./mill show app.createAndroidVirtualDevice
100+
...Name: test, DeviceId: medium_phone...
101+
102+
> ./mill show app.startAndroidEmulator
103+
104+
> ./mill show app.androidInstall
105+
...All files should be loaded. Notifying the device...
106+
107+
> ./mill show app.androidRun --activity com.example.android.architecture.blueprints.todoapp.TodoActivity
108+
[
109+
"Starting: Intent { cmp=com.example.android.architecture.blueprints.todoapp/.TodoActivity }",
110+
"Status: ok",
111+
"LaunchState: COLD",
112+
"Activity: com.example.android.architecture.blueprints.todoapp/.TodoActivity",
113+
"TotalTime: ...",
114+
"WaitTime: ...",
115+
"Complete"
116+
]
117+
118+
> ./mill show app.stopAndroidEmulator
119+
120+
> ./mill show app.deleteAndroidVirtualDevice
123121

124122
*/

‎libs/androidlib/src/mill/androidlib/AndroidModule.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ trait AndroidModule extends JavaModule {
128128
override def resolutionParams: Task[ResolutionParams] = Task.Anon {
129129
super.resolutionParams().addVariantAttributes(
130130
"org.jetbrains.kotlin.platform.type" ->
131-
VariantMatcher.AnyOf(Seq(VariantMatcher.Equals("androidJvm"), VariantMatcher.Equals("jvm")))
131+
VariantMatcher.AnyOf(Seq(
132+
VariantMatcher.Equals("androidJvm"),
133+
VariantMatcher.Equals("jvm")
134+
))
132135
)
133136
}
134137

‎libs/kotlinlib/src/mill/kotlinlib/ksp/KspModule.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ trait KspModule extends KotlinModule { outer =>
4040
*
4141
* @return
4242
*/
43-
def kspPlugins: T[Agg[Dep]] = Task {
44-
Agg(
43+
def kspPlugins: T[Seq[Dep]] = Task {
44+
Seq(
4545
mvn"com.google.devtools.ksp:symbol-processing-api:${kotlinVersion()}-${kspVersion()}",
4646
mvn"com.google.devtools.ksp:symbol-processing:${kotlinVersion()}-${kspVersion()}"
4747
)
@@ -51,19 +51,19 @@ trait KspModule extends KotlinModule { outer =>
5151
super.generatedSources() ++ generatedSourcesWithKSP().sources
5252
}
5353

54-
def kspPluginsResolved: T[Agg[PathRef]] = Task {
54+
def kspPluginsResolved: T[Seq[PathRef]] = Task {
5555
defaultResolver().classpath(kspPlugins())
5656
}
5757

5858
/**
5959
* The symbol processors to be used by the Kotlin compiler.
6060
* Default is empty.
6161
*/
62-
def kotlinSymbolProcessors: T[Agg[Dep]] = Task {
63-
Agg.empty[Dep]
62+
def kotlinSymbolProcessors: T[Seq[Dep]] = Task {
63+
Seq.empty[Dep]
6464
}
6565

66-
def kotlinSymbolProcessorsResolved: T[Agg[PathRef]] = Task {
66+
def kotlinSymbolProcessorsResolved: T[Seq[PathRef]] = Task {
6767
defaultResolver().classpath(
6868
kotlinSymbolProcessors()
6969
)

0 commit comments

Comments
 (0)