gradle update

app/build.gradle

@@ -104,6 +104,8 @@ tasks.matching { it instanceof Test }.all {
 }
 
 android {
+
+    namespace 'info.nightscout.androidaps'
     ndkVersion "21.1.6352462"
 
     defaultConfig {

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"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="info.nightscout.androidaps">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.BLUETOOTH" />

automation/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.automation'
+}
 
 
 dependencies {

automation/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.automation">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.BLUETOOTH" />

build.gradle

@@ -48,7 +48,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
 

combo/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.combo'
+}
 
 dependencies {
     implementation project(':core')

combo/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.combo">
 
     <application
         android:supportsRtl="true">

core/build.gradle

@@ -15,3 +15,7 @@ dependencies {
     implementation project(':shared')
     implementation project(':database')
 }
+
+android {
+    namespace 'info.nightscout.androidaps.core'
+}

core/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.core">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

dana/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.dana'
     defaultConfig {
         kapt {
             arguments {

dana/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.dana">
 
     <application
         android:supportsRtl="true">

danar/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.danar'
+}
 
 dependencies {
     implementation project(':core')

danar/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.danar" >
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
 

danars/build.gradle

@@ -11,6 +11,7 @@ apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
     ndkVersion "21.1.6352462"
+    namespace 'info.nightscout.androidaps.danars'
 
     defaultConfig {
 

danars/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.danars">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

database/build.gradle

@@ -7,6 +7,8 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.database'
     defaultConfig {
         kapt {
             arguments {

database/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
-    package="info.nightscout.androidaps.database" />

diaconn/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.diaconn'
     defaultConfig {
         kapt {
             arguments {

diaconn/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.diaconn">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

insight/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.insight'
     defaultConfig {
         kapt {
             arguments {

insight/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.insight">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

medtronic/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.medtronic'
+}
 
 dependencies {
     implementation project(':core')

medtronic/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.medtronic">
 
     <application
         android:supportsRtl="true">

omnipod-common/build.gradle

@@ -9,6 +9,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.omnipod.common'
+}
 
 dependencies {
     implementation project(':core')

omnipod-common/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="info.nightscout.androidaps.plugins.pump.omnipod.common"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:supportsRtl="true">

omnipod-dash/build.gradle

@@ -17,6 +17,8 @@ detekt { // TODO move to `subprojects` section in global build.gradle
 }
 
 android {
+
+    namespace 'info.nightscout.androidaps.plugins.pump.omnipod.dash'
     defaultConfig {
         kapt {
             arguments {

omnipod-dash/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.omnipod.dash">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

omnipod-eros/build.gradle

@@ -10,6 +10,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.androidaps.plugins.pump.omnipod.eros'
     defaultConfig {
         kapt {
             arguments {

omnipod-eros/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.omnipod.eros">
 
     <application
         android:supportsRtl="true">

openhumans/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugin.general.openhumans'
+}
 
 
 dependencies {

openhumans/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugin.general.openhumans">
 
     <application>
         <activity

pump-common/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.common'
+}
 
 dependencies {
     implementation project(':core')

pump-common/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest package="info.nightscout.androidaps.plugins.pump.common">
+<manifest>
 
     <application>
 

rileylink/build.gradle

@@ -8,6 +8,9 @@ apply from: "${project.rootDir}/core/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
+android {
+    namespace 'info.nightscout.androidaps.plugins.pump.common.hw.rileylink'
+}
 
 dependencies {
     implementation project(':core')

rileylink/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.androidaps.plugins.pump.common.hw.rileylink">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

shared/build.gradle

@@ -11,6 +11,8 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 android {
+
+    namespace 'info.nightscout.shared'
     defaultConfig {
         minSdkVersion 23  // for wear
     }

shared/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="info.nightscout.shared">
 
 </manifest>

wear/build.gradle

@@ -76,6 +76,7 @@ android {
             versionName version + "-nsclient"
         }
     }
+    namespace 'info.nightscout.androidaps'
 }
 
 allprojects {

wear/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"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="info.nightscout.androidaps">
 
     <uses-feature android:name="android.hardware.type.watch" />