LouisCAD · tasomaniac · Nov 10, 2020 · Nov 11, 2020 · Nov 13, 2020 · Nov 13, 2020
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,7 @@ buildscript {
 
 plugins {
     id("com.osacky.doctor")
+    id("com.gradleup.auto.manifest") apply false
 }
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

diff --git a/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt b/buildSrc/src/main/kotlin/config/AndroidLibraryConfig.kt
@@ -4,9 +4,10 @@
 
 @file:Suppress("PackageDirectoryMismatch")
 
+import org.gradle.api.Project
 import com.android.build.gradle.LibraryExtension as AndroidLibraryExtension
 
-fun AndroidLibraryExtension.setDefaults(generateBuildConfig: Boolean = false) {
+fun AndroidLibraryExtension.setDefaults(project: Project, generateBuildConfig: Boolean = false) {
     compileSdkVersion(ProjectVersions.androidSdk)
     buildToolsVersion(ProjectVersions.androidBuildTools)
     defaultConfig {
@@ -24,15 +25,15 @@ fun AndroidLibraryExtension.setDefaults(generateBuildConfig: Boolean = false) {
         this.buildConfig = generateBuildConfig
     }
     sourceSets.getByName("main") {
-        manifest.srcFile("src/androidMain/AndroidManifest.xml")
+        if (project.file("src/androidMain/AndroidManifest.xml").exists()) {
+            manifest.srcFile("src/androidMain/AndroidManifest.xml")
+        }
         res.srcDir("src/androidMain/res")
     }
     sourceSets.getByName("debug") {
-        manifest.srcFile("src/androidDebug/AndroidManifest.xml")
         res.srcDir("src/androidDebug/res")
     }
     sourceSets.getByName("release") {
-        manifest.srcFile("src/androidRelease/AndroidManifest.xml")
         res.srcDir("src/androidRelease/res")
     }
     sourceSets.getByName("androidTest") {

diff --git a/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts b/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/fun-packs/android-appcompat-with-views-dsl/src/androidMain/AndroidManifest.xml b/fun-packs/android-appcompat-with-views-dsl/src/androidMain/AndroidManifest.xml
diff --git a/fun-packs/android-appcompat/build.gradle.kts b/fun-packs/android-appcompat/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/fun-packs/android-appcompat/src/androidMain/AndroidManifest.xml b/fun-packs/android-appcompat/src/androidMain/AndroidManifest.xml
diff --git a/fun-packs/android-base-with-views-dsl/build.gradle.kts b/fun-packs/android-base-with-views-dsl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/fun-packs/android-base-with-views-dsl/src/androidMain/AndroidManifest.xml b/fun-packs/android-base-with-views-dsl/src/androidMain/AndroidManifest.xml
diff --git a/fun-packs/android-base/build.gradle.kts b/fun-packs/android-base/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/fun-packs/android-base/src/androidMain/AndroidManifest.xml b/fun-packs/android-base/src/androidMain/AndroidManifest.xml
diff --git a/fun-packs/android-material-components-with-views-dsl/build.gradle.kts b/fun-packs/android-material-components-with-views-dsl/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/fun-packs/android-material-components-with-views-dsl/src/androidMain/AndroidManifest.xml b/fun-packs/android-material-components-with-views-dsl/src/androidMain/AndroidManifest.xml
diff --git a/fun-packs/android-material-components/build.gradle.kts b/fun-packs/android-material-components/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/fun-packs/android-material-components/src/androidMain/AndroidManifest.xml b/fun-packs/android-material-components/src/androidMain/AndroidManifest.xml
diff --git a/fun-packs/build.gradle.kts b/fun-packs/build.gradle.kts
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2020 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.gradleup.auto.manifest")
+}
+
+autoManifest {
+    packageName.set("splitties.fun.pack")
+    replaceDashesWithDot.set(true)
+}
diff --git a/modules/activities/build.gradle.kts b/modules/activities/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/activities/src/androidMain/AndroidManifest.xml b/modules/activities/src/androidMain/AndroidManifest.xml
diff --git a/modules/alertdialog-appcompat-coroutines/build.gradle.kts b/modules/alertdialog-appcompat-coroutines/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/alertdialog-appcompat-coroutines/src/androidMain/AndroidManifest.xml b/modules/alertdialog-appcompat-coroutines/src/androidMain/AndroidManifest.xml
diff --git a/modules/alertdialog-appcompat/build.gradle.kts b/modules/alertdialog-appcompat/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml b/modules/alertdialog-appcompat/src/androidMain/AndroidManifest.xml
diff --git a/modules/alertdialog-material/build.gradle.kts b/modules/alertdialog-material/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/alertdialog-material/src/androidMain/AndroidManifest.xml b/modules/alertdialog-material/src/androidMain/AndroidManifest.xml
diff --git a/modules/alertdialog/build.gradle.kts b/modules/alertdialog/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/alertdialog/src/androidMain/AndroidManifest.xml b/modules/alertdialog/src/androidMain/AndroidManifest.xml
diff --git a/modules/appctx/build.gradle.kts b/modules/appctx/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/arch-lifecycle/build.gradle.kts b/modules/arch-lifecycle/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/arch-lifecycle/src/androidMain/AndroidManifest.xml b/modules/arch-lifecycle/src/androidMain/AndroidManifest.xml
diff --git a/modules/arch-room/build.gradle.kts b/modules/arch-room/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/arch-room/src/androidMain/AndroidManifest.xml b/modules/arch-room/src/androidMain/AndroidManifest.xml
diff --git a/modules/build.gradle.kts b/modules/build.gradle.kts
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2020 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.gradleup.auto.manifest")
+}
+
+autoManifest {
+    packageName.set("splitties")
+    replaceDashesWithDot.set(true)
+}
diff --git a/modules/bundle/build.gradle.kts b/modules/bundle/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/bundle/src/androidMain/AndroidManifest.xml b/modules/bundle/src/androidMain/AndroidManifest.xml
diff --git a/modules/checkedlazy/build.gradle.kts b/modules/checkedlazy/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/checkedlazy/src/androidMain/AndroidManifest.xml b/modules/checkedlazy/src/androidMain/AndroidManifest.xml
diff --git a/modules/dimensions/build.gradle.kts b/modules/dimensions/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/dimensions/src/androidMain/AndroidManifest.xml b/modules/dimensions/src/androidMain/AndroidManifest.xml
diff --git a/modules/exceptions/build.gradle.kts b/modules/exceptions/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/exceptions/src/androidMain/AndroidManifest.xml b/modules/exceptions/src/androidMain/AndroidManifest.xml
diff --git a/modules/fragmentargs/build.gradle.kts b/modules/fragmentargs/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/fragmentargs/src/androidMain/AndroidManifest.xml b/modules/fragmentargs/src/androidMain/AndroidManifest.xml
diff --git a/modules/fragments/build.gradle.kts b/modules/fragments/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/fragments/src/androidMain/AndroidManifest.xml b/modules/fragments/src/androidMain/AndroidManifest.xml
diff --git a/modules/initprovider/build.gradle.kts b/modules/initprovider/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {

diff --git a/modules/initprovider/src/androidMain/AndroidManifest.xml b/modules/initprovider/src/androidMain/AndroidManifest.xml
diff --git a/modules/intents/build.gradle.kts b/modules/intents/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
     buildTypes.getByName("release").consumerProguardFiles("proguard-rules.pro")
 }
 

diff --git a/modules/intents/src/androidMain/AndroidManifest.xml b/modules/intents/src/androidMain/AndroidManifest.xml
diff --git a/modules/lifecycle-coroutines/build.gradle.kts b/modules/lifecycle-coroutines/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    setDefaults()
+    setDefaults(project)
 }
 
 kotlin {