Add manifest validation, replace manifest build dir generation

application/build.gradle.kts

@@ -22,5 +22,7 @@ androidProjectConfiguration(
     compileSdk = 29,
     versionCode = 1,
     versionName = "1.0",
-    dataBinding = true
+    dataBinding = true,
+    validateManifestPackages = true,
+    generateMissedManifests = true
 )

application/common/extensions/android-util/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.common.extensions.android.util"/>

application/common/extensions/databinding-adapter/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.common.extensions.databinding.adapter"/>

application/common/placeholder/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.common.placeholder.res"/>

application/common/progressbar/databinding/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.common.progressbar.databinding"/>

application/common/progressbar/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.common.progressbar.res"/>

application/common/recyclerview/widget/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.common.recyclerview.widget"/>

application/core/di/library/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.core.di.library"/>

application/core/mvvm/library/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.core.mvvm.library"/>

application/core/navigation/library/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.core.navigation.library"/>

application/core/theme/android-util/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.core.theme.android.util"/>

application/core/theme/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.core.theme.android.res"/>

application/feature/characters/core/impl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.characters.core.impl"/>

application/feature/characters/detail/databinding/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.characters.detail.databinding"/>

application/feature/characters/detail/impl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.characters.detail.impl"/>

application/feature/characters/detail/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.character.detail.res"/>

application/feature/characters/favorite/databinding/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.favorite.res"/>

application/feature/characters/favorite/impl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.characters.favorite.impl"/>

application/feature/characters/favorite/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.character.favorite.res"/>

application/feature/characters/list/databinding/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.characters.list.databinding"/>

application/feature/characters/list/impl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.characters.list.impl"/>

application/feature/characters/list/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.character.list.res"/>

application/feature/home/databinding/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.home.databinding"/>

application/feature/home/impl/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.home.impl"/>

application/feature/home/res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.feature.home.res"/>

application/root-res/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.rootres"/>

application/toggle-widget/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.stepango.blockme.widget.toggle"/>

plugins/android/src/main/java/androidApp.kt

@@ -41,9 +41,7 @@ fun Project.androidApp(
         buildConfiguration,
         testInstrumentationRunner,
         consumerMinificationFiles,
-        manifestPlaceholders,
-        // AndroidApp should always use custom manifest
-        generateManifest = false
+        manifestPlaceholders
     )
     applyFeatures(
         androidLibraryFeatureDefinition(libraryFeatureConfiguration),

plugins/android/src/main/java/androidLibrary.kt

@@ -30,7 +30,6 @@ fun Project.androidLibrary(
     buildConfiguration: BuildConfiguration = BuildConfiguration(),
     consumerMinificationFiles: Set<String> = emptySet(),
     manifestPlaceholders: Map<String, Any> = emptyMap(),
-    generateManifest: Boolean = true
 ): TargetBuilder {
     target.validate(LibraryTargetTemplate)
     val libraryFeatureConfiguration = AndroidLibraryFeatureConfiguration(
@@ -39,7 +38,6 @@ fun Project.androidLibrary(
         testInstrumentationRunner,
         consumerMinificationFiles,
         manifestPlaceholders,
-        generateManifest
     )
     applyFeatures(
         androidLibraryFeatureDefinition(libraryFeatureConfiguration),

plugins/android/src/main/java/androidProjectConfiguration.kt

@@ -7,6 +7,16 @@ import org.gradle.api.tasks.Delete
 import tools.forma.android.config.FormaConfiguration
 import tools.forma.android.utils.register
 
+// TODO: add docs for every fun param
+/**
+ * Configures common values for whole forma modules.
+ * @param minSdk is min android sdk
+ * @param targetSdk is target android sdk
+ * @param compileSdk is compile android sdk
+ * @param versionCode is version code for
+ * @param validateManifestPackages enabling validation of manifests during configuration
+ * @param generateMissedManifests enabling generation missing manifests during configuration
+ */
 fun Project.androidProjectConfiguration(
     minSdk: Int,
     targetSdk: Int,
@@ -15,6 +25,8 @@ fun Project.androidProjectConfiguration(
     versionName: String,
     repositories: RepositoryHandler.() -> Unit = {},
     dataBinding: Boolean = false,
+    validateManifestPackages: Boolean = false,
+    generateMissedManifests: Boolean = false,
     javaVersionCompatibility: JavaVersion = JavaVersion.VERSION_1_8, // Java/Kotlin configuration
     mandatoryOwners: Boolean = false
 ) {
@@ -37,6 +49,8 @@ fun Project.androidProjectConfiguration(
         versionName = versionName,
         repositories = repositories,
         dataBinding = dataBinding,
+        generateMissedManifests = generateMissedManifests,
+        validateManifestPackages = validateManifestPackages,
         javaVersionCompatibility = javaVersionCompatibility,
         mandatoryOwners = mandatoryOwners
     )

plugins/android/src/main/java/tools/forma/android/config/FormaConfiguration.kt

@@ -32,6 +32,8 @@ data class FormaConfiguration(
     // Databinding is Application level feature, android_binary will be infering dataBinding flag, developers does not need to know about
     val dataBinding: Boolean = false,
     val compose: Boolean = false,
+    val validateManifestPackages: Boolean = false,
+    val generateMissedManifests: Boolean = false,
     val vectorDrawablesUseSupportLibrary: Boolean = minSdk < AndroidSdkVersion.N,
     val javaVersionCompatibility: JavaVersion = JavaVersion.VERSION_1_8, // Java/Kotlin configuration
     val mandatoryOwners: Boolean

plugins/android/src/main/java/tools/forma/android/feature/AndroidLibrary.kt

@@ -4,12 +4,15 @@ import androidJunitRunner
 import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.support.listFilesOrdered
+import org.xml.sax.InputSource
 import tools.forma.android.target.LibraryTargetTemplate
 import tools.forma.android.utils.BuildConfiguration
 import tools.forma.android.utils.applyFrom
 import tools.forma.validation.Validator
 import tools.forma.validation.validator
 import java.io.File
+import javax.xml.parsers.DocumentBuilderFactory
 
 class AndroidLibraryFeatureConfiguration(
     val packageName: String,
@@ -19,7 +22,6 @@ class AndroidLibraryFeatureConfiguration(
     val manifestPlaceholders: Map<String, Any> = emptyMap(),
     val viewBinding: Boolean = false,
     val dataBinding: Boolean = false,
-    val generateManifest: Boolean = true,
     val selfValidator: Validator = validator(LibraryTargetTemplate)
 )
 
@@ -31,10 +33,12 @@ fun androidLibraryFeatureDefinition(
     featureConfiguration = featureConfiguration,
     configuration = { extension, feature, project, formaConfiguration ->
         with(extension) {
-            if (feature.generateManifest) {
+            if (formaConfiguration.generateMissedManifests) {
                 maybeGenerateManifest(project, feature)
             }
-
+            if (formaConfiguration.validateManifestPackages) {
+                validateManifestPackage(feature.packageName, project)
+            }
             compileSdkVersion(formaConfiguration.compileSdk)
 
             defaultConfig.applyFrom(
@@ -57,24 +61,51 @@ fun androidLibraryFeatureDefinition(
     }
 )
 
+private fun LibraryExtension.validateManifestPackage(
+    packageName: String,
+    project: Project
+) {
+    sourceSets.forEach {
+        if (it.manifest.srcFile.exists()) {
+            val manifestPackageName = DocumentBuilderFactory
+                .newInstance()
+                .newDocumentBuilder()
+                .parse(InputSource(it.manifest.srcFile.reader()))
+                .documentElement
+                .getAttribute("package")
+
+            if (manifestPackageName != packageName) {
+                error(
+                    "Manifest package != build.gradle.kts packageName, it must be equal" +
+                            "\nmanifest ${it.manifest.srcFile.absolutePath}" +
+                            "\npackage $manifestPackageName" +
+                            "\nbuild script ${project.buildFile.absolutePath}" +
+                            "\npackageName $packageName"
+                )
+            }
+        }
+    }
+}
+
 private fun LibraryExtension.maybeGenerateManifest(
     project: Project,
     feature: AndroidLibraryFeatureConfiguration
 ) {
-    val manifestFile = manifestFile(project.buildDir, feature.packageName)
-    populateManifest(manifestFile, feature.packageName)
-    sourceSets {
-        /**
-         * Manifest file resolved during configuration,
-         * so we need to create file before we get into plugin is configured
-         */
-        getByName("main").manifest.srcFile(manifestFile.path)
+    val srcDir = File(project.projectDir, "src")
+    val mainDir = File(srcDir, "main")
+    // other source sets inherit manifest in case of existing main manifest
+    if (mainDir.isDirectory && mainDir.exists()) {
+        populateManifest(File(mainDir, "AndroidManifest.xml"), feature.packageName)
+    } else {
+        val sourceSetNames = sourceSets.names
+        srcDir
+            .listFilesOrdered { it.name in sourceSetNames && it.isDirectory }
+            .forEach {
+                populateManifest(File(it, "AndroidManifest.xml"), feature.packageName)
+            }
     }
 }
 
-fun manifestFile(buildDir: File, packageName: String) =
-    File(buildDir, "tmp/manifest/${packageName}.xml")
-
 /**
  * Manifest file generated and added it to sourceSet
  * @param buildDir - project's build dir
@@ -94,9 +125,8 @@ private fun populateManifest(
             parentFile.mkdirs()
             createNewFile()
             writeText(
-                """<?xml version="1.0" encoding="utf-8"?>
-                           <manifest package="$packageName"/>
-                """.trimIndent()
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                        "<manifest package=\"$packageName\"/>"
             )
         }
     }

plugins/android/src/main/java/uiLibrary.kt

@@ -36,7 +36,6 @@ fun Project.uiLibrary(
     buildConfiguration: BuildConfiguration = BuildConfiguration(),
     consumerMinificationFiles: Set<String> = emptySet(),
     manifestPlaceholders: Map<String, Any> = emptyMap(),
-    generateManifest: Boolean = true
 ): TargetBuilder {
     target.validate(UiLibraryTargetTemplate)
     val libraryFeatureConfiguration = AndroidLibraryFeatureConfiguration(
@@ -45,7 +44,6 @@ fun Project.uiLibrary(
         testInstrumentationRunner,
         consumerMinificationFiles,
         manifestPlaceholders,
-        generateManifest
     )
     applyFeatures(
         androidLibraryFeatureDefinition(libraryFeatureConfiguration),