From 1d58ac3acd64016d9ed249d64434190dd4660bce Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 07:59:24 +0530
Subject: [PATCH] all: migrate namespaces to Gradle

---
 android/build.gradle.kts                     | 1 +
 android/src/main/AndroidManifest.xml         | 3 +--
 common/build.gradle.kts                      | 1 +
 common/src/androidMain/AndroidManifest.xml   | 2 +-
 database/build.gradle.kts                    | 5 ++++-
 database/src/androidMain/AndroidManifest.xml | 2 +-
 model/build.gradle.kts                       | 5 ++++-
 model/src/androidMain/AndroidManifest.xml    | 2 +-
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 1dd27d03..20b74851 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
 }
 
 android {
+  namespace = "dev.msfjarvis.claw.android"
   defaultConfig {
     applicationId = "dev.msfjarvis.claw.android"
     versionCode = 1
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 9027e23a..1c6a010d 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="dev.msfjarvis.claw.android">
+  xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission android:name="android.permission.INTERNET" />
   <application
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 0aba104d..b9e82935 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -57,6 +57,7 @@ kotlin {
 
 android {
   buildFeatures { androidResources = true }
+  namespace = "dev.msfjarvis.claw.common"
   sourceSets["main"].apply {
     manifest.srcFile("src/androidMain/AndroidManifest.xml")
     res.srcDirs("src/commonMain/resources")
diff --git a/common/src/androidMain/AndroidManifest.xml b/common/src/androidMain/AndroidManifest.xml
index 4b195a02..fc20db30 100644
--- a/common/src/androidMain/AndroidManifest.xml
+++ b/common/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<manifest package="dev.msfjarvis.claw.common" />
+<manifest />
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 33f1d7d4..a88070d8 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -26,7 +26,10 @@ kotlin {
   }
 }
 
-android { sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") }
+android {
+  namespace = "dev.msfjarvis.claw.database"
+  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+}
 
 sqldelight {
   database("LobstersDatabase") {
diff --git a/database/src/androidMain/AndroidManifest.xml b/database/src/androidMain/AndroidManifest.xml
index 07a08dbe..cc947c56 100644
--- a/database/src/androidMain/AndroidManifest.xml
+++ b/database/src/androidMain/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="dev.msfjarvis.claw.database" />
+<manifest />
diff --git a/model/build.gradle.kts b/model/build.gradle.kts
index 740df474..fe08361f 100644
--- a/model/build.gradle.kts
+++ b/model/build.gradle.kts
@@ -16,4 +16,7 @@ kotlin {
   }
 }
 
-android { sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") }
+android {
+  namespace = "dev.msfjarvis.claw.model"
+  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+}
diff --git a/model/src/androidMain/AndroidManifest.xml b/model/src/androidMain/AndroidManifest.xml
index e9cdeca8..cc947c56 100644
--- a/model/src/androidMain/AndroidManifest.xml
+++ b/model/src/androidMain/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="dev.msfjarvis.claw.model" />
+<manifest />