Increase Gradle version to 7.1.3

app/build.gradle

@@ -8,6 +8,8 @@ plugins {
 apply from: rootProject.file("gradle/git-tag-version.gradle")
 
 android {
+    namespace 'no.nordicsemi.android.nrftoolbox'
+
     compileSdk android_api_version
 
     defaultConfig {
@@ -76,7 +78,6 @@ dependencies {
     implementation project(':profile_rscs')
 
     implementation project(':profile_uart')
-//    implementation project(':profile_dfu')
 
     implementation project(":lib_theme")
     implementation project(":lib_utils")

app/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="no.nordicsemi.android.nrftoolbox">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <package android:name="no.nordicsemi.android.dfu" />

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.40.4"

lib_log/build.gradle

@@ -1,5 +1,9 @@
 apply from: rootProject.file("library.gradle")
 
+android {
+    namespace 'no.nordicsemi.android.logger'
+}
+
 dependencies {
     implementation libs.nordic.log
 }

lib_log/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="no.nordicsemi.android.logger">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="no.nordicsemi.android.LOG"/>
 

lib_service/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.service'
+}
+
 dependencies {
     implementation project(":lib_theme")
 

lib_service/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="no.nordicsemi.android.service">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />

lib_theme/build.gradle

@@ -1,5 +1,9 @@
 apply from: rootProject.file("library.gradle")
 
+android {
+    namespace 'no.nordicsemi.android.theme'
+}
+
 dependencies {
     implementation project(":lib_log")
 

lib_theme/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="no.nordicsemi.android.theme">
+<manifest>
 
 </manifest>

lib_utils/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.utils'
+}
+
 dependencies {
     implementation libs.nordic.navigation
     implementation libs.nordic.ui.scanner

lib_utils/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="no.nordicsemi.android.utils">
+<manifest>
 
 </manifest>

profile_bps/build.gradle

@@ -24,3 +24,7 @@ dependencies {
 
     testImplementation libs.bundles.test
 }
+
+android {
+    namespace 'no.nordicsemi.android.bps'
+}

profile_bps/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="no.nordicsemi.android.bps">
+<manifest>
 
 </manifest>

profile_cgms/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.cgms'
+}
+
 dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")

profile_cgms/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="no.nordicsemi.android.cgms">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".repository.CGMService" />

profile_csc/build.gradle

@@ -24,3 +24,7 @@ dependencies {
 
     testImplementation libs.bundles.test
 }
+
+android {
+    namespace 'no.nordicsemi.android.csc'
+}

profile_csc/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="no.nordicsemi.android.csc">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

profile_gls/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.gls'
+}
+
 dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")

profile_gls/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="no.nordicsemi.android.gls">
+<manifest>
 
 </manifest>

profile_hrs/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.hrs'
+}
+
 dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")

profile_hrs/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="no.nordicsemi.android.hrs">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".service.HRSService" />

profile_hts/build.gradle

@@ -24,3 +24,7 @@ dependencies {
 
     testImplementation libs.bundles.test
 }
+
+android {
+    namespace 'no.nordicsemi.android.hts'
+}

profile_hts/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="no.nordicsemi.android.hts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".repository.HTSService" />

profile_prx/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.prx'
+}
+
 dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")

profile_prx/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="no.nordicsemi.android.prx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".repository.PRXService"/>

profile_rscs/build.gradle

@@ -1,6 +1,10 @@
 apply from: rootProject.file("library.gradle")
 apply plugin: 'kotlin-parcelize'
 
+android {
+    namespace 'no.nordicsemi.android.rscs'
+}
+
 dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")

profile_rscs/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="no.nordicsemi.android.rscs">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".repository.RSCSService"/>

profile_uart/build.gradle

@@ -55,3 +55,7 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
 }
+
+android {
+    namespace 'no.nordicsemi.android.uart'
+}

profile_uart/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="no.nordicsemi.android.uart">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".repository.UARTService" />