From e618d4c949ea6e1e9f03e91079c9f6797738b80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?=
 <sylwester.zielinski@nordicsemi.no>
Date: Fri, 8 Apr 2022 13:27:50 +0200
Subject: [PATCH] Increase Gradle version to 7.1.3

---
 app/build.gradle                          | 3 ++-
 app/src/main/AndroidManifest.xml          | 3 +--
 build.gradle                              | 2 +-
 lib_log/build.gradle                      | 4 ++++
 lib_log/src/main/AndroidManifest.xml      | 3 +--
 lib_service/build.gradle                  | 4 ++++
 lib_service/src/main/AndroidManifest.xml  | 3 +--
 lib_theme/build.gradle                    | 4 ++++
 lib_theme/src/main/AndroidManifest.xml    | 2 +-
 lib_utils/build.gradle                    | 4 ++++
 lib_utils/src/main/AndroidManifest.xml    | 2 +-
 profile_bps/build.gradle                  | 4 ++++
 profile_bps/src/main/AndroidManifest.xml  | 2 +-
 profile_cgms/build.gradle                 | 4 ++++
 profile_cgms/src/main/AndroidManifest.xml | 3 +--
 profile_csc/build.gradle                  | 4 ++++
 profile_csc/src/main/AndroidManifest.xml  | 3 +--
 profile_gls/build.gradle                  | 4 ++++
 profile_gls/src/main/AndroidManifest.xml  | 2 +-
 profile_hrs/build.gradle                  | 4 ++++
 profile_hrs/src/main/AndroidManifest.xml  | 3 +--
 profile_hts/build.gradle                  | 4 ++++
 profile_hts/src/main/AndroidManifest.xml  | 3 +--
 profile_prx/build.gradle                  | 4 ++++
 profile_prx/src/main/AndroidManifest.xml  | 3 +--
 profile_rscs/build.gradle                 | 4 ++++
 profile_rscs/src/main/AndroidManifest.xml | 3 +--
 profile_uart/build.gradle                 | 4 ++++
 profile_uart/src/main/AndroidManifest.xml | 3 +--
 29 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5523aedd..8de01ced 100644
--- a/app/build.gradle
+++ b/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")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25355ea9..238b7db8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/build.gradle b/build.gradle
index b96c056f..9ffc8cb1 100644
--- a/build.gradle
+++ b/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"
diff --git a/lib_log/build.gradle b/lib_log/build.gradle
index c68ef9ba..40887f1e 100644
--- a/lib_log/build.gradle
+++ b/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
 }
diff --git a/lib_log/src/main/AndroidManifest.xml b/lib_log/src/main/AndroidManifest.xml
index a7d5fbd7..1afac85e 100644
--- a/lib_log/src/main/AndroidManifest.xml
+++ b/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"/>
 
diff --git a/lib_service/build.gradle b/lib_service/build.gradle
index 8515601d..2820d9fb 100644
--- a/lib_service/build.gradle
+++ b/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")
 
diff --git a/lib_service/src/main/AndroidManifest.xml b/lib_service/src/main/AndroidManifest.xml
index efd228af..e6f10bee 100644
--- a/lib_service/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/lib_theme/build.gradle b/lib_theme/build.gradle
index a75f213e..39b5a7c3 100644
--- a/lib_theme/build.gradle
+++ b/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")
 
diff --git a/lib_theme/src/main/AndroidManifest.xml b/lib_theme/src/main/AndroidManifest.xml
index 423e376a..44008a43 100644
--- a/lib_theme/src/main/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/lib_utils/build.gradle b/lib_utils/build.gradle
index 99f8d52f..bbb3d2d0 100644
--- a/lib_utils/build.gradle
+++ b/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
diff --git a/lib_utils/src/main/AndroidManifest.xml b/lib_utils/src/main/AndroidManifest.xml
index 26b65fb5..44008a43 100644
--- a/lib_utils/src/main/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/profile_bps/build.gradle b/profile_bps/build.gradle
index 5a2ccbc8..459d5360 100644
--- a/profile_bps/build.gradle
+++ b/profile_bps/build.gradle
@@ -24,3 +24,7 @@ dependencies {
 
     testImplementation libs.bundles.test
 }
+
+android {
+    namespace 'no.nordicsemi.android.bps'
+}
diff --git a/profile_bps/src/main/AndroidManifest.xml b/profile_bps/src/main/AndroidManifest.xml
index 984c6c4e..44008a43 100644
--- a/profile_bps/src/main/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/profile_cgms/build.gradle b/profile_cgms/build.gradle
index 4b382312..5a6b3f72 100644
--- a/profile_cgms/build.gradle
+++ b/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")
diff --git a/profile_cgms/src/main/AndroidManifest.xml b/profile_cgms/src/main/AndroidManifest.xml
index 08a93443..f4da06bb 100644
--- a/profile_cgms/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/profile_csc/build.gradle b/profile_csc/build.gradle
index 82f77d95..b5a6c8cd 100644
--- a/profile_csc/build.gradle
+++ b/profile_csc/build.gradle
@@ -24,3 +24,7 @@ dependencies {
 
     testImplementation libs.bundles.test
 }
+
+android {
+    namespace 'no.nordicsemi.android.csc'
+}
diff --git a/profile_csc/src/main/AndroidManifest.xml b/profile_csc/src/main/AndroidManifest.xml
index 320c554c..98df606d 100644
--- a/profile_csc/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/profile_gls/build.gradle b/profile_gls/build.gradle
index 68227809..4322b8ca 100644
--- a/profile_gls/build.gradle
+++ b/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")
diff --git a/profile_gls/src/main/AndroidManifest.xml b/profile_gls/src/main/AndroidManifest.xml
index eb9eb3d1..44008a43 100644
--- a/profile_gls/src/main/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/profile_hrs/build.gradle b/profile_hrs/build.gradle
index 64ef56ef..3c89c30f 100644
--- a/profile_hrs/build.gradle
+++ b/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")
diff --git a/profile_hrs/src/main/AndroidManifest.xml b/profile_hrs/src/main/AndroidManifest.xml
index f623e468..26b3aa30 100644
--- a/profile_hrs/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/profile_hts/build.gradle b/profile_hts/build.gradle
index 4b382312..735ac727 100644
--- a/profile_hts/build.gradle
+++ b/profile_hts/build.gradle
@@ -24,3 +24,7 @@ dependencies {
 
     testImplementation libs.bundles.test
 }
+
+android {
+    namespace 'no.nordicsemi.android.hts'
+}
diff --git a/profile_hts/src/main/AndroidManifest.xml b/profile_hts/src/main/AndroidManifest.xml
index 11709b85..7ff86c05 100644
--- a/profile_hts/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/profile_prx/build.gradle b/profile_prx/build.gradle
index 0f677454..6d940edc 100644
--- a/profile_prx/build.gradle
+++ b/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")
diff --git a/profile_prx/src/main/AndroidManifest.xml b/profile_prx/src/main/AndroidManifest.xml
index 257c562d..07826030 100644
--- a/profile_prx/src/main/AndroidManifest.xml
+++ b/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"/>
diff --git a/profile_rscs/build.gradle b/profile_rscs/build.gradle
index 4b382312..526911f2 100644
--- a/profile_rscs/build.gradle
+++ b/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")
diff --git a/profile_rscs/src/main/AndroidManifest.xml b/profile_rscs/src/main/AndroidManifest.xml
index 8280717d..de70e2ec 100644
--- a/profile_rscs/src/main/AndroidManifest.xml
+++ b/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"/>
diff --git a/profile_uart/build.gradle b/profile_uart/build.gradle
index 9a25a429..cc25b94c 100644
--- a/profile_uart/build.gradle
+++ b/profile_uart/build.gradle
@@ -55,3 +55,7 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
 }
+
+android {
+    namespace 'no.nordicsemi.android.uart'
+}
diff --git a/profile_uart/src/main/AndroidManifest.xml b/profile_uart/src/main/AndroidManifest.xml
index cc7c18cb..fd3681ff 100644
--- a/profile_uart/src/main/AndroidManifest.xml
+++ b/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" />