From a85b546e1fb6a40bc45c7dfc6b17a7dd80aba212 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 22 Jul 2022 15:05:42 +0800
Subject: [PATCH] Use namespace dsl

---
 app/build.gradle                            | 3 ++-
 app/src/main/AndroidManifest.xml            | 3 +--
 app/src/normal/AndroidManifest.xml          | 3 +--
 appthemehelper/build.gradle                 | 1 +
 appthemehelper/src/main/AndroidManifest.xml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 830cc7e7f..ac36a81fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'kotlin-parcelize'
 
 android {
     compileSdk 32
+    namespace "code.name.monkey.retromusic"
 
     defaultConfig {
         minSdk 21
@@ -13,7 +14,7 @@ android {
 
         vectorDrawables.useSupportLibrary = true
 
-        applicationId "code.name.monkey.retromusic"
+        applicationId namespace
         versionCode 10597
         versionName '6.0.2-beta'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 987f89181..9df88e865 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/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="code.name.monkey.retromusic">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission
         android:name="android.permission.BLUETOOTH"
diff --git a/app/src/normal/AndroidManifest.xml b/app/src/normal/AndroidManifest.xml
index 1aca0bc31..750dacabc 100644
--- a/app/src/normal/AndroidManifest.xml
+++ b/app/src/normal/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="code.name.monkey.retromusic">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="com.android.vending.BILLING" />
 
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index cd8d1f030..31bfc76af 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 android {
     compileSdk 32
+    namespace "code.name.monkey.appthemehelper"
 
     defaultConfig {
         minSdk 21
diff --git a/appthemehelper/src/main/AndroidManifest.xml b/appthemehelper/src/main/AndroidManifest.xml
index a0b00a102..cc947c567 100644
--- a/appthemehelper/src/main/AndroidManifest.xml
+++ b/appthemehelper/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="code.name.monkey.appthemehelper" />
+<manifest />