Fix merge conflicts

spotify · Dec 14, 2023 · 321f7c9 · 321f7c9
1 parent 0eb1805
commit 321f7c9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 7 deletions.
diff --git a/ruler-cli/src/main/java/com/spotify/ruler/cli/RulerCli.kt b/ruler-cli/src/main/java/com/spotify/ruler/cli/RulerCli.kt
@@ -24,6 +24,8 @@ import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.types.file
 import com.spotify.ruler.common.BaseRulerTask
 import com.spotify.ruler.common.FEATURE_NAME
+import com.spotify.ruler.common.apk.ApkCreator
+import com.spotify.ruler.common.apk.InjectedToolApkCreator
 import com.spotify.ruler.common.dependency.ArtifactResult
 import com.spotify.ruler.common.dependency.DependencyComponent
 import com.spotify.ruler.common.dependency.DependencyEntry
@@ -38,15 +40,20 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import java.io.File
+import java.util.logging.Level
+import java.util.logging.Logger
 
 class RulerCli : CliktCommand(), BaseRulerTask {
+    private val logger = Logger.getLogger("Ruler")
     private val dependencyMap by option().file().required()
     private val rulerConfigJson by option().file().required()
     private val apkFile by option().file().required()
     private val reportDir by option().file(canBeDir = true).required()
     private val mappingFile: File? by option().file()
     private val resourceMappingFile: File? by option().file()
     private val unstrippedNativeFiles: List<File> by option().file().multiple()
+    private val aapt2Tool: File? by option().file()
+
     override fun print(content: String) = echo(content)
 
     override fun provideMappingFile() = mappingFile
@@ -60,7 +67,7 @@ class RulerCli : CliktCommand(), BaseRulerTask {
         val json = Json.decodeFromStream<JsonRulerConfig>(rulerConfigJson.inputStream())
         RulerConfig(
             projectPath = json.projectPath,
-            apkFilesMap = mapOf(FEATURE_NAME to listOf(apkFile)),
+            apkFilesMap = createApkFile(json.projectPath, json.deviceSpec!!),
             reportDir = reportDir,
             ownershipFile = json.ownershipFile?.let { File(it) },
             staticDependenciesFile = json.staticComponentsPath?.let { File(it) },
@@ -100,8 +107,40 @@ class RulerCli : CliktCommand(), BaseRulerTask {
     override fun provideDependencies(): Map<String, List<DependencyComponent>> = dependencies
 
     override fun run() {
+        logger.log(Level.INFO,  """
+        ~~~~~ Starting Ruler ~~~~~
+        Using Dependency Map: ${dependencyMap.path}
+        Using Ruler Config: ${rulerConfigJson.path}
+        Using App File: ${apkFile.path}
+        Using Proguard Mapping File: ${mappingFile?.path}
+        Using Resource Mapping File: ${resourceMappingFile?.path}
+        Using AAPT2: ${aapt2Tool?.path}
+        Writing reports to: ${reportDir.path}
+        """.trimIndent())
         super.run()
     }
+
+    private fun createApkFile(projectPath: String, deviceSpec: DeviceSpec): Map<String, List<File>> {
+
+        val apkCreator = if (aapt2Tool != null) {
+            InjectedToolApkCreator(aapt2Tool!!.toPath())
+        } else {
+            ApkCreator(File(config.projectPath))
+        }
+
+        return if (apkFile.extension == "apk") {
+            mapOf(FEATURE_NAME to listOf(apkFile))
+        } else {
+            apkCreator.createSplitApks(
+                apkFile,
+                deviceSpec,
+                File(projectPath).resolve(File("tmp")).apply {
+                    mkdir()
+                }
+            )
+        }
+    }
+
 }
 
 @Serializable

diff --git a/ruler-cli/src/test/resources/rulerConfig.json b/ruler-cli/src/test/resources/rulerConfig.json
@@ -4,6 +4,12 @@
     "variantName": "release",
     "versionName": "1.0.0"
   },
+  "deviceSpec": {
+    "supportedAbis": ["arm64-v8a"],
+    "supportedLocales": ["en"],
+    "screenDensity": 480,
+    "sdkVersion": 27
+  },
   "defaultOwner": "main_activity",
   "omitFileBreakdown": false,
   "ownershipFile": "src/test/resources/test_ownership.yaml",

diff --git a/...om/spotify/ruler/plugin/apk/ApkCreator.kt → ...om/spotify/ruler/common/apk/ApkCreator.kt b/...om/spotify/ruler/plugin/apk/ApkCreator.kt → ...om/spotify/ruler/common/apk/ApkCreator.kt
@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.spotify.ruler.plugin.apk
+package com.spotify.ruler.common.apk
 
 import com.android.SdkConstants
 import com.android.build.gradle.internal.SdkLocator
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit
  *
  * @param rootDir Root directory of the Gradle project, needed to look up the path of certain binaries.
  */
-class ApkCreator(private val rootDir: File) {
+open class ApkCreator(private val rootDir: File) {
 
     private val rulerDebugKey = "rulerDebug.keystore"
     private val rulerKeystorePassword = "rulerpassword"
@@ -91,7 +91,7 @@ class ApkCreator(private val rootDir: File) {
     }
 
     /** Finds and returns the location of the aapt2 executable. */
-    private fun getAapt2Location(): Path {
+    open fun getAapt2Location(): Path {
         val sdkLocation = getAndroidSdkLocation()
         val sdkHandler = AndroidSdkHandler.getInstance(AndroidLocationsSingleton, sdkLocation)
         val progressIndicator = object : ProgressIndicatorAdapter() { /* No progress reporting */ }
@@ -133,3 +133,7 @@ class ApkCreator(private val rootDir: File) {
         const val BASE_FEATURE_NAME = "base"
     }
 }
+
+class InjectedToolApkCreator(private val aapt2Tool: Path): ApkCreator(File("")) {
+    override fun getAapt2Location(): Path = aapt2Tool
+}
diff --git a/...om/spotify/ruler/plugin/ApkCreatorTest.kt → ...potify/ruler/common/apk/ApkCreatorTest.kt b/...om/spotify/ruler/plugin/ApkCreatorTest.kt → ...potify/ruler/common/apk/ApkCreatorTest.kt
@@ -14,11 +14,10 @@
 * limitations under the License.
 */
 
-package com.spotify.ruler.plugin
+package com.spotify.ruler.common.apk
 
 import com.google.common.truth.Truth.assertThat
 import com.spotify.ruler.common.models.DeviceSpec
-import com.spotify.ruler.plugin.apk.ApkCreator
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import java.io.File

diff --git a/ruler-gradle-plugin/src/main/kotlin/com/spotify/ruler/plugin/RulerTask.kt b/ruler-gradle-plugin/src/main/kotlin/com/spotify/ruler/plugin/RulerTask.kt
@@ -16,7 +16,7 @@
 
 package com.spotify.ruler.plugin
 
-import com.spotify.ruler.plugin.apk.ApkCreator
+import com.spotify.ruler.common.apk.ApkCreator
 import com.spotify.ruler.plugin.dependency.EntryParser
 import com.spotify.ruler.common.BaseRulerTask
 import com.spotify.ruler.common.dependency.DependencyComponent