Skip to content

Commit bd19203

Browse files
authored
Replace use of deprecated Agg with Seq (#5085)
1 parent 132761b commit bd19203

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ trait ScalaPBModule extends ScalaModule {
9090
case false => Task.Anon { Seq.empty[PathRef] }
9191
}
9292

93-
def scalaPBProtoClasspath: T[Agg[PathRef]] = Task {
93+
def scalaPBProtoClasspath: T[Seq[PathRef]] = Task {
9494
millResolver().classpath(
9595
Seq(
9696
coursierDependency.withConfiguration(coursier.core.Configuration.provided),

example/androidlib/kotlin/4-sum-lib-kotlin/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ object app extends AndroidAppKotlinModule {
7373
)
7474
}
7575

76-
def mvnDeps = super.mvnDeps() ++ Agg(
76+
def mvnDeps = super.mvnDeps() ++ Seq(
7777
mvn"com.example.sumlib:lib:0.0.1"
7878
)
7979

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
2929

3030
def androidIsDebug = true
3131

32-
def mvnDeps: T[Agg[Dep]] = Agg(
32+
def mvnDeps: T[Seq[Dep]] = Seq(
3333
mvn"androidx.core:core-ktx:1.15.0",
3434
mvn"androidx.appcompat:appcompat:1.7.0",
3535
mvn"androidx.annotation:annotation:1.9.1",
@@ -72,7 +72,7 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
7272
mvn"androidx.customview:customview-poolingcontainer:1.0.0"
7373
)
7474

75-
def kotlinSymbolProcessors: T[Agg[Dep]] = Agg(
75+
def kotlinSymbolProcessors: T[Seq[Dep]] = Seq(
7676
mvn"androidx.room:room-compiler:2.6.1",
7777
mvn"com.google.dagger:hilt-android-compiler:2.56"
7878
)
@@ -106,7 +106,7 @@ object app extends AndroidAppKotlinModule with AndroidBuildConfig with AndroidHi
106106
}
107107

108108
object test extends AndroidAppKotlinTests with TestModule.Junit4 {
109-
def mvnDeps = super.mvnDeps() ++ Agg(
109+
def mvnDeps = super.mvnDeps() ++ Seq(
110110
mvn"junit:junit:4.13.2"
111111
)
112112
}

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
)

libs/scalalib/test/src/mill/scalalib/ScalaIvyDepsTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ object ScalaMvnDepsTests extends TestSuite {
6666
// CoursierModule#{allRepositories,millResolver}.
6767
def mvnDeps = Task {
6868
if (repositoriesTask().contains(coursier.Repositories.google))
69-
Agg(mvn"com.google.protobuf:protobuf-java:2.6.1")
69+
Seq(mvn"com.google.protobuf:protobuf-java:2.6.1")
7070
else
71-
Agg.empty
71+
Seq.empty
7272
}
7373
}
7474

website/blog/modules/ROOT/attachments/fast-assembly/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import mill._, scalalib._
33

44
object `package` extends SbtModule {
55
def scalaVersion = "2.12.19"
6-
def mvnDeps = Agg(
6+
def mvnDeps = Seq(
77
mvn"org.apache.spark::spark-core:3.5.4",
88
mvn"org.apache.spark::spark-sql:3.5.4"
99
)

website/blog/modules/ROOT/pages/9-mill-faster-assembly-jars.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ import mill._, scalalib._
108108
109109
object `package` extends SbtModule {
110110
def scalaVersion = "2.12.19"
111-
def mvnDeps = Agg(
111+
def mvnDeps = Seq(
112112
mvn"org.apache.spark::spark-core:3.5.4",
113113
mvn"org.apache.spark::spark-sql:3.5.4"
114114
)

0 commit comments

Comments
 (0)