File tree Expand file tree Collapse file tree 2 files changed +2
-10
lines changed
scalalib/src/mill/javalib/android Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -840,7 +840,7 @@ trait AndroidAppModule extends AndroidModule {
840840
841841 // ProGuard configuration files: add our extra rules file and all provided config files.
842842 val pgArgs = Seq (" --pg-conf" , extraRulesFile.toString) ++
843- proguardReleaseConfigs ().flatMap(cfg => Seq (" --pg-conf" , cfg.path.toString))
843+ proguardConfigs ().flatMap(cfg => Seq (" --pg-conf" , cfg.path.toString))
844844
845845 r8ArgsBuilder ++= pgArgs
846846
Original file line number Diff line number Diff line change @@ -708,22 +708,14 @@ trait AndroidModule extends JavaModule {
708708 }
709709
710710 /** ProGuard/R8 rules configuration files (user-provided and generated) */
711- def proguardReleaseConfigs : T [Seq [PathRef ]] = {
711+ def proguardConfigs : T [Seq [PathRef ]] = {
712712 Seq (
713713 PathRef (moduleDir / " proguard-rules.pro" ),
714714 PathRef (androidModuleGeneratedSourcesFunc().androidReleaseDex.path / " proguard-rules.pro" ),
715715 PathRef (moduleDir / " test-proguard-rules.pro" )
716716 )
717717 }
718718
719- def proguardDebugConfigs : T [Seq [PathRef ]] = {
720- Seq (
721- PathRef (moduleDir / " proguard-rules.pro" ),
722- PathRef (androidModuleGeneratedSourcesFunc().androidDebugDex.path / " proguard-rules.pro" ),
723- PathRef (moduleDir / " test-proguard-rules.pro" )
724- )
725- }
726-
727719 /** Additional library classes (if any) that should be treated as provided */
728720 def libraryClassesPaths : T [Seq [PathRef ]] = T {
729721 Seq (
You can’t perform that action at this time.
0 commit comments