From 83a33d8ac5eac17bcef6dc0c8e9b5d521008d6c4 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 9 May 2022 19:56:05 +0200
Subject: [PATCH] Update Gradle

---
 accounts/build.gradle.kts                             | 1 +
 accounts/src/main/AndroidManifest.xml                 | 3 +--
 app/build.gradle.kts                                  | 1 +
 app/src/main/AndroidManifest.xml                      | 3 +--
 applications/build.gradle.kts                         | 1 +
 applications/src/main/AndroidManifest.xml             | 3 +--
 appshortcuts/build.gradle.kts                         | 1 +
 appshortcuts/src/main/AndroidManifest.xml             | 3 +--
 badges/build.gradle.kts                               | 1 +
 badges/src/main/AndroidManifest.xml                   | 3 +--
 base/build.gradle.kts                                 | 1 +
 base/src/main/AndroidManifest.xml                     | 3 +--
 build.gradle.kts                                      | 2 +-
 calculator/build.gradle.kts                           | 1 +
 calculator/src/main/AndroidManifest.xml               | 3 +--
 calendar/build.gradle.kts                             | 1 +
 calendar/src/main/AndroidManifest.xml                 | 3 +--
 compat/build.gradle.kts                               | 1 +
 compat/src/main/AndroidManifest.xml                   | 3 +--
 contacts/build.gradle.kts                             | 1 +
 contacts/src/main/AndroidManifest.xml                 | 3 +--
 crashreporter/build.gradle.kts                        | 1 +
 crashreporter/src/main/AndroidManifest.xml            | 3 +--
 currencies/build.gradle.kts                           | 1 +
 currencies/src/main/AndroidManifest.xml               | 2 +-
 database/build.gradle.kts                             | 1 +
 database/src/main/AndroidManifest.xml                 | 3 +--
 favorites/build.gradle.kts                            | 1 +
 favorites/src/main/AndroidManifest.xml                | 2 +-
 files/build.gradle.kts                                | 1 +
 files/src/main/AndroidManifest.xml                    | 3 +--
 g-services/build.gradle.kts                           | 1 +
 g-services/src/main/AndroidManifest.xml               | 3 +--
 gradle/wrapper/gradle-wrapper.properties              | 2 +-
 hiddenitems/build.gradle.kts                          | 1 +
 hiddenitems/src/main/AndroidManifest.xml              | 3 +--
 i18n/build.gradle.kts                                 | 1 +
 i18n/src/main/AndroidManifest.xml                     | 3 +--
 icons/build.gradle.kts                                | 1 +
 icons/src/main/AndroidManifest.xml                    | 3 +--
 ktx/build.gradle.kts                                  | 1 +
 ktx/src/main/AndroidManifest.xml                      | 3 +--
 material-color-utilities/build.gradle.kts             | 1 +
 material-color-utilities/src/main/AndroidManifest.xml | 3 +--
 ms-services/build.gradle.kts                          | 1 +
 ms-services/src/main/AndroidManifest.xml              | 3 +--
 music/build.gradle.kts                                | 1 +
 music/src/main/AndroidManifest.xml                    | 3 +--
 nextcloud/build.gradle.kts                            | 1 +
 nextcloud/src/main/AndroidManifest.xml                | 3 +--
 notifications/build.gradle.kts                        | 1 +
 notifications/src/main/AndroidManifest.xml            | 3 +--
 owncloud/build.gradle.kts                             | 1 +
 owncloud/src/main/AndroidManifest.xml                 | 3 +--
 permissions/build.gradle.kts                          | 1 +
 permissions/src/main/AndroidManifest.xml              | 3 +--
 preferences/build.gradle.kts                          | 1 +
 preferences/src/main/AndroidManifest.xml              | 3 +--
 search/build.gradle.kts                               | 1 +
 search/src/main/AndroidManifest.xml                   | 2 +-
 transition/build.gradle.kts                           | 1 +
 transition/src/main/AndroidManifest.xml               | 3 +--
 ui/build.gradle.kts                                   | 1 +
 ui/src/main/AndroidManifest.xml                       | 3 +--
 unitconverter/build.gradle.kts                        | 1 +
 unitconverter/src/main/AndroidManifest.xml            | 3 +--
 weather/build.gradle.kts                              | 1 +
 weather/src/main/AndroidManifest.xml                  | 3 +--
 webdav/build.gradle.kts                               | 1 +
 webdav/src/main/AndroidManifest.xml                   | 3 +--
 websites/build.gradle.kts                             | 1 +
 websites/src/main/AndroidManifest.xml                 | 3 +--
 widgets/build.gradle.kts                              | 1 +
 widgets/src/main/AndroidManifest.xml                  | 3 +--
 wikipedia/build.gradle.kts                            | 1 +
 wikipedia/src/main/AndroidManifest.xml                | 3 +--
 76 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/accounts/build.gradle.kts b/accounts/build.gradle.kts
index 691f3a1b..7af645de 100644
--- a/accounts/build.gradle.kts
+++ b/accounts/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.accounts"
 }
 
 dependencies {
diff --git a/accounts/src/main/AndroidManifest.xml b/accounts/src/main/AndroidManifest.xml
index b69a17f8..a5918e68 100644
--- a/accounts/src/main/AndroidManifest.xml
+++ b/accounts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.accounts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0a9483eb..8cdf0f43 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -64,6 +64,7 @@ android {
     lint {
         abortOnError = false
     }
+    namespace = "de.mm20.launcher2"
 }
 
 fun buildTime(): String {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89abd467..89f6514c 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="de.mm20.launcher2">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SET_ALARM" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
diff --git a/applications/build.gradle.kts b/applications/build.gradle.kts
index 44e63ff0..c5947322 100644
--- a/applications/build.gradle.kts
+++ b/applications/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "de.mm20.launcher2.applications"
 }
 
 dependencies {
diff --git a/applications/src/main/AndroidManifest.xml b/applications/src/main/AndroidManifest.xml
index a1e7322f..a5c40216 100644
--- a/applications/src/main/AndroidManifest.xml
+++ b/applications/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.applications">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/appshortcuts/build.gradle.kts b/appshortcuts/build.gradle.kts
index 770b0276..57c552e4 100644
--- a/appshortcuts/build.gradle.kts
+++ b/appshortcuts/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "de.mm20.launcher2.appshortcuts"
 }
 
 dependencies {
diff --git a/appshortcuts/src/main/AndroidManifest.xml b/appshortcuts/src/main/AndroidManifest.xml
index 7e42faf4..a5918e68 100644
--- a/appshortcuts/src/main/AndroidManifest.xml
+++ b/appshortcuts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.appshortcuts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/badges/build.gradle.kts b/badges/build.gradle.kts
index dfcc3b06..7e99d0e3 100644
--- a/badges/build.gradle.kts
+++ b/badges/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.badges"
 }
 
 dependencies {
diff --git a/badges/src/main/AndroidManifest.xml b/badges/src/main/AndroidManifest.xml
index 839d84a6..a5c40216 100644
--- a/badges/src/main/AndroidManifest.xml
+++ b/badges/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.badges">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index b651e3b8..df2c67bf 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.base"
 }
 
 dependencies {
diff --git a/base/src/main/AndroidManifest.xml b/base/src/main/AndroidManifest.xml
index e1598c62..972c3a83 100644
--- a/base/src/main/AndroidManifest.xml
+++ b/base/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.base">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 24464e24..d5450428 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.3")
+        classpath("com.android.tools.build:gradle:7.2.0")
         classpath(libs.kotlin.gradle)
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/calculator/build.gradle.kts b/calculator/build.gradle.kts
index 28ce625b..b276590e 100644
--- a/calculator/build.gradle.kts
+++ b/calculator/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.calculator"
 }
 
 dependencies {
diff --git a/calculator/src/main/AndroidManifest.xml b/calculator/src/main/AndroidManifest.xml
index be86c1bd..a5c40216 100644
--- a/calculator/src/main/AndroidManifest.xml
+++ b/calculator/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/calendar/build.gradle.kts b/calendar/build.gradle.kts
index 0862b17b..7234ea5d 100644
--- a/calendar/build.gradle.kts
+++ b/calendar/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.calendar"
 }
 
 dependencies {
diff --git a/calendar/src/main/AndroidManifest.xml b/calendar/src/main/AndroidManifest.xml
index 40b502ee..38e1bfaa 100644
--- a/calendar/src/main/AndroidManifest.xml
+++ b/calendar/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.calendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_CALENDAR" />
 </manifest>
\ No newline at end of file
diff --git a/compat/build.gradle.kts b/compat/build.gradle.kts
index 2f513358..3ea7828c 100644
--- a/compat/build.gradle.kts
+++ b/compat/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.compat"
 }
 
 dependencies {
diff --git a/compat/src/main/AndroidManifest.xml b/compat/src/main/AndroidManifest.xml
index 4446b93f..a5918e68 100644
--- a/compat/src/main/AndroidManifest.xml
+++ b/compat/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.compat">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/contacts/build.gradle.kts b/contacts/build.gradle.kts
index 7fb672b6..d4ca2e94 100644
--- a/contacts/build.gradle.kts
+++ b/contacts/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.contacts"
 }
 
 dependencies {
diff --git a/contacts/src/main/AndroidManifest.xml b/contacts/src/main/AndroidManifest.xml
index 7842fbc7..a5c40216 100644
--- a/contacts/src/main/AndroidManifest.xml
+++ b/contacts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.contacts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/crashreporter/build.gradle.kts b/crashreporter/build.gradle.kts
index 8715fbb7..f134c094 100644
--- a/crashreporter/build.gradle.kts
+++ b/crashreporter/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.crashreporter"
 }
 
 dependencies {
diff --git a/crashreporter/src/main/AndroidManifest.xml b/crashreporter/src/main/AndroidManifest.xml
index 8146fcf8..487940a6 100644
--- a/crashreporter/src/main/AndroidManifest.xml
+++ b/crashreporter/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.crashreporter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <provider
             android:name="com.balsikandar.crashreporter.CrashReporterInitProvider"
diff --git a/currencies/build.gradle.kts b/currencies/build.gradle.kts
index 4303f312..f620a9f3 100644
--- a/currencies/build.gradle.kts
+++ b/currencies/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.currencies"
 }
 
 dependencies {
diff --git a/currencies/src/main/AndroidManifest.xml b/currencies/src/main/AndroidManifest.xml
index 78f9c468..a2e15ef6 100644
--- a/currencies/src/main/AndroidManifest.xml
+++ b/currencies/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-<manifest package="de.mm20.launcher2.currencies">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index baf83e66..1bdedd04 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -38,6 +38,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.database"
 }
 
 dependencies {
diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml
index d8973773..a5c40216 100644
--- a/database/src/main/AndroidManifest.xml
+++ b/database/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.database">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/favorites/build.gradle.kts b/favorites/build.gradle.kts
index d747a6c0..ac9a8103 100644
--- a/favorites/build.gradle.kts
+++ b/favorites/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.favorites"
 }
 
 dependencies {
diff --git a/favorites/src/main/AndroidManifest.xml b/favorites/src/main/AndroidManifest.xml
index ec0d4793..227314ee 100644
--- a/favorites/src/main/AndroidManifest.xml
+++ b/favorites/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="de.mm20.launcher2.favorites" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/files/build.gradle.kts b/files/build.gradle.kts
index 4db9d056..95e133f7 100644
--- a/files/build.gradle.kts
+++ b/files/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.files"
 }
 
 dependencies {
diff --git a/files/src/main/AndroidManifest.xml b/files/src/main/AndroidManifest.xml
index b5b954c3..a5c40216 100644
--- a/files/src/main/AndroidManifest.xml
+++ b/files/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.files">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/g-services/build.gradle.kts b/g-services/build.gradle.kts
index 01518a9e..c0d51802 100644
--- a/g-services/build.gradle.kts
+++ b/g-services/build.gradle.kts
@@ -32,6 +32,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.gservices"
 }
 
 dependencies {
diff --git a/g-services/src/main/AndroidManifest.xml b/g-services/src/main/AndroidManifest.xml
index 7a13544e..6033eb75 100644
--- a/g-services/src/main/AndroidManifest.xml
+++ b/g-services/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.gservices">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c788fcfc..2f1f8a5d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 16 10:19:49 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/hiddenitems/build.gradle.kts b/hiddenitems/build.gradle.kts
index 868de885..80d1de51 100644
--- a/hiddenitems/build.gradle.kts
+++ b/hiddenitems/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.hiddenitems"
 }
 
 dependencies {
diff --git a/hiddenitems/src/main/AndroidManifest.xml b/hiddenitems/src/main/AndroidManifest.xml
index 0692c026..a5c40216 100644
--- a/hiddenitems/src/main/AndroidManifest.xml
+++ b/hiddenitems/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.hiddenitems">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts
index 060a4335..646c0fe7 100644
--- a/i18n/build.gradle.kts
+++ b/i18n/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.i18n"
 }
 
 dependencies {
diff --git a/i18n/src/main/AndroidManifest.xml b/i18n/src/main/AndroidManifest.xml
index fab88aca..972c3a83 100644
--- a/i18n/src/main/AndroidManifest.xml
+++ b/i18n/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.i18n">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/icons/build.gradle.kts b/icons/build.gradle.kts
index 52de5e0d..7968632f 100644
--- a/icons/build.gradle.kts
+++ b/icons/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.icons"
 }
 
 dependencies {
diff --git a/icons/src/main/AndroidManifest.xml b/icons/src/main/AndroidManifest.xml
index 6e78bb99..c3f283bf 100644
--- a/icons/src/main/AndroidManifest.xml
+++ b/icons/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.icons">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <intent>
diff --git a/ktx/build.gradle.kts b/ktx/build.gradle.kts
index 5501b587..3ae57c9b 100644
--- a/ktx/build.gradle.kts
+++ b/ktx/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.ktx"
 }
 
 dependencies {
diff --git a/ktx/src/main/AndroidManifest.xml b/ktx/src/main/AndroidManifest.xml
index 3b1edbcf..a5c40216 100644
--- a/ktx/src/main/AndroidManifest.xml
+++ b/ktx/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/material-color-utilities/build.gradle.kts b/material-color-utilities/build.gradle.kts
index 34fc4180..8dee7013 100644
--- a/material-color-utilities/build.gradle.kts
+++ b/material-color-utilities/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.materialcolorutilities"
 }
 
 dependencies {
diff --git a/material-color-utilities/src/main/AndroidManifest.xml b/material-color-utilities/src/main/AndroidManifest.xml
index 3a283795..a5918e68 100644
--- a/material-color-utilities/src/main/AndroidManifest.xml
+++ b/material-color-utilities/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.materialcolorutilities">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/ms-services/build.gradle.kts b/ms-services/build.gradle.kts
index 3905a10d..c6326ad2 100644
--- a/ms-services/build.gradle.kts
+++ b/ms-services/build.gradle.kts
@@ -32,6 +32,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.msservices"
 }
 
 dependencies {
diff --git a/ms-services/src/main/AndroidManifest.xml b/ms-services/src/main/AndroidManifest.xml
index 1dbe0cd5..b9c82bd1 100644
--- a/ms-services/src/main/AndroidManifest.xml
+++ b/ms-services/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.msservices">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
index b70a405d..9d071c9b 100644
--- a/music/build.gradle.kts
+++ b/music/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.music"
 }
 
 dependencies {
diff --git a/music/src/main/AndroidManifest.xml b/music/src/main/AndroidManifest.xml
index 8766846e..a5c40216 100644
--- a/music/src/main/AndroidManifest.xml
+++ b/music/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.music">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/nextcloud/build.gradle.kts b/nextcloud/build.gradle.kts
index 8e7c8f8f..c6ab8092 100644
--- a/nextcloud/build.gradle.kts
+++ b/nextcloud/build.gradle.kts
@@ -35,6 +35,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.nextcloud"
 }
 
 dependencies {
diff --git a/nextcloud/src/main/AndroidManifest.xml b/nextcloud/src/main/AndroidManifest.xml
index 929b68b3..ab04e2d9 100644
--- a/nextcloud/src/main/AndroidManifest.xml
+++ b/nextcloud/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.nextcloud">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/notifications/build.gradle.kts b/notifications/build.gradle.kts
index ab5a63a2..32c69c0c 100644
--- a/notifications/build.gradle.kts
+++ b/notifications/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.notifications"
 }
 
 dependencies {
diff --git a/notifications/src/main/AndroidManifest.xml b/notifications/src/main/AndroidManifest.xml
index e8ea614f..6f50ba30 100644
--- a/notifications/src/main/AndroidManifest.xml
+++ b/notifications/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.notifications">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service
diff --git a/owncloud/build.gradle.kts b/owncloud/build.gradle.kts
index 3d6a1dae..67043216 100644
--- a/owncloud/build.gradle.kts
+++ b/owncloud/build.gradle.kts
@@ -35,6 +35,7 @@ android {
     buildFeatures {
         viewBinding = true
     }
+    namespace = "de.mm20.launcher2.owncloud"
 }
 
 dependencies {
diff --git a/owncloud/src/main/AndroidManifest.xml b/owncloud/src/main/AndroidManifest.xml
index 3b333ea8..fa73c4fc 100644
--- a/owncloud/src/main/AndroidManifest.xml
+++ b/owncloud/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.owncloud">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index bb5c86bb..49d45264 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.permissions"
 }
 
 dependencies {
diff --git a/permissions/src/main/AndroidManifest.xml b/permissions/src/main/AndroidManifest.xml
index 9482c8ac..a5918e68 100644
--- a/permissions/src/main/AndroidManifest.xml
+++ b/permissions/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.permissions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts
index ae306e77..c27835f7 100644
--- a/preferences/build.gradle.kts
+++ b/preferences/build.gradle.kts
@@ -34,6 +34,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "de.mm20.launcher2.preferences"
 }
 
 protobuf {
diff --git a/preferences/src/main/AndroidManifest.xml b/preferences/src/main/AndroidManifest.xml
index 6618030f..972c3a83 100644
--- a/preferences/src/main/AndroidManifest.xml
+++ b/preferences/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.preferences">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/search/build.gradle.kts b/search/build.gradle.kts
index cfa4b3a7..410fe7b8 100644
--- a/search/build.gradle.kts
+++ b/search/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.search"
 }
 
 dependencies {
diff --git a/search/src/main/AndroidManifest.xml b/search/src/main/AndroidManifest.xml
index 78749221..227314ee 100644
--- a/search/src/main/AndroidManifest.xml
+++ b/search/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="de.mm20.launcher2.search" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/transition/build.gradle.kts b/transition/build.gradle.kts
index 370ff588..2fc6ad45 100644
--- a/transition/build.gradle.kts
+++ b/transition/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.transition"
 }
 
 dependencies {
diff --git a/transition/src/main/AndroidManifest.xml b/transition/src/main/AndroidManifest.xml
index 578925b4..a5c40216 100644
--- a/transition/src/main/AndroidManifest.xml
+++ b/transition/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.transition">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 3aaae275..f6f2ba47 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -45,6 +45,7 @@ android {
     lint {
         abortOnError = false
     }
+    namespace = "de.mm20.launcher2.ui"
 }
 
 dependencies {
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 6e9a9dd2..1347ac8d 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <application>
diff --git a/unitconverter/build.gradle.kts b/unitconverter/build.gradle.kts
index 20e73c72..f369f2f6 100644
--- a/unitconverter/build.gradle.kts
+++ b/unitconverter/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.unitconverter"
 }
 
 dependencies {
diff --git a/unitconverter/src/main/AndroidManifest.xml b/unitconverter/src/main/AndroidManifest.xml
index 978f561a..a5c40216 100644
--- a/unitconverter/src/main/AndroidManifest.xml
+++ b/unitconverter/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.unitconverter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/weather/build.gradle.kts b/weather/build.gradle.kts
index 6151f391..c287843e 100644
--- a/weather/build.gradle.kts
+++ b/weather/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.weather"
 }
 
 dependencies {
diff --git a/weather/src/main/AndroidManifest.xml b/weather/src/main/AndroidManifest.xml
index 6e41a107..f4cc71dd 100644
--- a/weather/src/main/AndroidManifest.xml
+++ b/weather/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.weather">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>
\ No newline at end of file
diff --git a/webdav/build.gradle.kts b/webdav/build.gradle.kts
index 9e5af7ad..569b2cf3 100644
--- a/webdav/build.gradle.kts
+++ b/webdav/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.webdav"
 }
 
 dependencies {
diff --git a/webdav/src/main/AndroidManifest.xml b/webdav/src/main/AndroidManifest.xml
index 85197f98..a5c40216 100644
--- a/webdav/src/main/AndroidManifest.xml
+++ b/webdav/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.webdav">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/websites/build.gradle.kts b/websites/build.gradle.kts
index c89225ca..f1275a97 100644
--- a/websites/build.gradle.kts
+++ b/websites/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.websites"
 }
 
 dependencies {
diff --git a/websites/src/main/AndroidManifest.xml b/websites/src/main/AndroidManifest.xml
index 53f93c8f..a5c40216 100644
--- a/websites/src/main/AndroidManifest.xml
+++ b/websites/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.websites">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts
index 1d522193..69849a13 100644
--- a/widgets/build.gradle.kts
+++ b/widgets/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.widgets"
 }
 
 dependencies {
diff --git a/widgets/src/main/AndroidManifest.xml b/widgets/src/main/AndroidManifest.xml
index 8fb5f0b7..a5c40216 100644
--- a/widgets/src/main/AndroidManifest.xml
+++ b/widgets/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.widgets">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/wikipedia/build.gradle.kts b/wikipedia/build.gradle.kts
index 695d71c4..4feb9e68 100644
--- a/wikipedia/build.gradle.kts
+++ b/wikipedia/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.wikipedia"
 }
 
 dependencies {
diff --git a/wikipedia/src/main/AndroidManifest.xml b/wikipedia/src/main/AndroidManifest.xml
index 1aeb7e78..a5c40216 100644
--- a/wikipedia/src/main/AndroidManifest.xml
+++ b/wikipedia/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.wikipedia">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file