Skip to content

Commit 8926137

Browse files
committed
Fixes
1 parent 96565fa commit 8926137

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

example/thirdparty/androidtodo/build.mill

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ object app extends AndroidAppKotlinModule with AndroidR8AppModule with AndroidBu
3636
)
3737
)
3838
}
39+
40+
// TODO consider using a debug module
3941
def debugSources = Task.Sources("src/debug/java")
4042

4143
override def sources = super.sources() ++ debugSources()

libs/androidlib/src/mill/androidlib/AndroidAppModule.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ trait AndroidAppModule extends AndroidModule { outer =>
233233
PathRef(ref.path),
234234
ref.path.subRelativeTo(metaInfRoot(ref.path))
235235
)
236-
)
236+
).distinctBy(_.destination)
237+
237238
}
238239

239240
/**
@@ -1025,10 +1026,6 @@ trait AndroidAppModule extends AndroidModule { outer =>
10251026
PathRef(destManifest)
10261027
}
10271028

1028-
override def androidPackageMetaInfoFiles: T[Seq[AndroidPackageableExtraFile]] = Task {
1029-
Seq.empty[AndroidPackageableExtraFile]
1030-
}
1031-
10321029
private def androidxTestManifests: Task[Seq[PathRef]] = Task {
10331030
androidUnpackArchives().flatMap {
10341031
unpackedArchive =>

0 commit comments

Comments
 (0)