fmt

Author: vaslabs

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

@@ -217,6 +217,7 @@ trait AndroidAppModule extends AndroidModule { outer =>
       .map(PathRef(_))
       .toSeq
   }
+
   /**
    * Packages DEX files and Android resources into an unsigned APK.
    *
@@ -699,7 +700,7 @@ trait AndroidAppModule extends AndroidModule { outer =>
     pathRef
   }
 
-  //TODO consider managing with proguard and/or r8
+  // TODO consider managing with proguard and/or r8
   private def isExcludedFromPackaging(relPath: RelPath): Boolean = {
     val topPath = relPath.segments.head
     // TODO do this better
@@ -797,7 +798,6 @@ trait AndroidAppModule extends AndroidModule { outer =>
     )
   }
 
-
   /**
    * Provides the output path for the generated main-dex list file, which is used
    * during the DEX generation process.
@@ -858,7 +858,7 @@ trait AndroidAppModule extends AndroidModule { outer =>
       if (buildSettings.isMinifyEnabled) {
         androidR8Dex()
       } else
-        androidD8DexArgs()
+        androidD8Dex()
     }
 
     Task.log.debug("Building dex with command: " + dexCliArgs.mkString(" "))
@@ -869,9 +869,8 @@ trait AndroidAppModule extends AndroidModule { outer =>
 
   }
 
-
   // uses the d8 tool to generate the dex file, when minification is disabled
-  private def androidD8DexArgs: T[(PathRef, Seq[String])] = Task {
+  private def androidD8Dex: T[(PathRef, Seq[String])] = Task {
 
     val outPath = T.dest
 
@@ -923,7 +922,6 @@ trait AndroidAppModule extends AndroidModule { outer =>
     PathRef(outPath) -> d8Args
   }
 
-
   // uses the R8 tool to generate the dex (to shrink and obfuscate)
   private def androidR8Dex: Task[(PathRef, Seq[String])] = Task {
     val destDir = T.dest / "minify"
@@ -1066,7 +1064,7 @@ trait AndroidAppModule extends AndroidModule { outer =>
     override def androidCompileSdk: T[Int] = outer.androidCompileSdk()
     override def androidMinSdk: T[Int] = outer.androidMinSdk()
     override def androidTargetSdk: T[Int] = outer.androidTargetSdk()
-    
+
     override def androidIsDebug: T[Boolean] = Task { true }
 
     override def androidApplicationId: String = outer.androidApplicationId

libs/androidlib/src/mill/androidlib/AndroidBuildTypeSettings.scala

@@ -9,27 +9,27 @@ import mill.define.JsonFormatters.pathReadWrite
  *
  * Useful for getting different packaging strategies for code shrinking and
  * supporting build variants
- *
  */
 case class AndroidBuildTypeSettings(
-  isMinifyEnabled: Boolean = false,
-  isShrinkEnabled: Boolean = false,
-  enableDesugaring: Boolean = false,
-  proguardFiles: ProguardFiles = ProguardFiles()
+    isMinifyEnabled: Boolean = false,
+    isShrinkEnabled: Boolean = false,
+    enableDesugaring: Boolean = false,
+    proguardFiles: ProguardFiles = ProguardFiles()
 ) {
   def withProguardLocalFiles(localFiles: Seq[os.Path]): AndroidBuildTypeSettings =
     copy(proguardFiles = proguardFiles.copy(localFiles = localFiles))
 }
 
 case class ProguardFiles(
-  defaultProguardFile: Option[String] = None,
-  localFiles: Seq[os.Path] = List.empty
+    defaultProguardFile: Option[String] = None,
+    localFiles: Seq[os.Path] = List.empty
 )
 
 object AndroidBuildTypeSettings {
-  implicit val resultRW: upickle.default.ReadWriter[AndroidBuildTypeSettings] = upickle.default.macroRW
+  implicit val resultRW: upickle.default.ReadWriter[AndroidBuildTypeSettings] =
+    upickle.default.macroRW
 }
 
 object ProguardFiles {
   implicit val resultRW: upickle.default.ReadWriter[ProguardFiles] = upickle.default.macroRW
-}
+}

libs/androidlib/src/mill/androidlib/AndroidModuleGeneratedDexVariants.scala

@@ -3,13 +3,12 @@ package mill.androidlib
 import mill.define.PathRef
 
 case class AndroidModuleGeneratedDexVariants(
-                                          androidDebugDex: PathRef,
-                                          androidReleaseDex: PathRef,
-                                          mainDexListOutput: PathRef
-                                        )
+    androidDebugDex: PathRef,
+    androidReleaseDex: PathRef,
+    mainDexListOutput: PathRef
+)
 
 object AndroidModuleGeneratedDexVariants {
   implicit def resultRW: upickle.default.ReadWriter[AndroidModuleGeneratedDexVariants] =
     upickle.default.macroRW
 }
-

libs/androidlib/src/mill/androidlib/AndroidSdkModule.scala

@@ -199,7 +199,7 @@ trait AndroidSdkModule extends Module {
   }
 
   /**
-   * Location of the default proguard optimisation config. 
+   * Location of the default proguard optimisation config.
    * See also [[https://developer.android.com/build/shrink-code]]
    */
   def androidProguardPath: T[PathRef] = Task {