From 373f3f8915b0f3e31f25a361804a8daa869c6680 Mon Sep 17 00:00:00 2001
From: valentunn <70131744+valentunn@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:27:27 +0300
Subject: [PATCH] Upgrade agp (#1804)

---
 app/build.gradle                                        | 1 +
 app/src/main/AndroidManifest.xml                        | 3 +--
 bindings/hydra-dx-math/build.gradle                     | 1 +
 bindings/hydra-dx-math/src/main/AndroidManifest.xml     | 2 +-
 build.gradle                                            | 2 +-
 common/build.gradle                                     | 1 +
 common/src/main/AndroidManifest.xml                     | 2 +-
 core-api/build.gradle                                   | 1 +
 core-api/src/main/AndroidManifest.xml                   | 2 +-
 core-db/build.gradle                                    | 1 +
 core-db/src/main/AndroidManifest.xml                    | 2 +-
 feature-account-api/build.gradle                        | 1 +
 feature-account-api/src/main/AndroidManifest.xml        | 2 +-
 feature-account-impl/build.gradle                       | 1 +
 feature-account-impl/src/main/AndroidManifest.xml       | 2 +-
 feature-assets/build.gradle                             | 1 +
 feature-assets/src/main/AndroidManifest.xml             | 3 +--
 feature-crowdloan-api/build.gradle                      | 1 +
 feature-crowdloan-api/src/main/AndroidManifest.xml      | 2 +-
 feature-crowdloan-impl/build.gradle                     | 1 +
 feature-crowdloan-impl/src/main/AndroidManifest.xml     | 2 +-
 feature-currency-api/build.gradle                       | 1 +
 feature-currency-api/src/main/AndroidManifest.xml       | 2 +-
 feature-currency-impl/build.gradle                      | 1 +
 feature-currency-impl/src/main/AndroidManifest.xml      | 2 +-
 feature-dapp-api/build.gradle                           | 1 +
 feature-dapp-api/src/main/AndroidManifest.xml           | 3 +--
 feature-dapp-impl/build.gradle                          | 1 +
 feature-dapp-impl/src/main/AndroidManifest.xml          | 3 +--
 feature-deep-linking/build.gradle                       | 1 +
 feature-deep-linking/src/main/AndroidManifest.xml       | 2 +-
 feature-ledger-api/build.gradle                         | 1 +
 feature-ledger-api/src/main/AndroidManifest.xml         | 2 +-
 feature-ledger-impl/build.gradle                        | 1 +
 feature-ledger-impl/src/main/AndroidManifest.xml        | 2 +-
 feature-nft-api/build.gradle                            | 1 +
 feature-nft-api/src/main/AndroidManifest.xml            | 3 +--
 feature-nft-impl/build.gradle                           | 1 +
 feature-nft-impl/src/main/AndroidManifest.xml           | 3 +--
 feature-onboarding-api/build.gradle                     | 1 +
 feature-onboarding-api/src/main/AndroidManifest.xml     | 2 +-
 feature-onboarding-impl/build.gradle                    | 1 +
 feature-onboarding-impl/src/main/AndroidManifest.xml    | 2 +-
 feature-proxy-api/build.gradle                          | 1 +
 feature-proxy-api/src/main/AndroidManifest.xml          | 3 +--
 feature-push-notifications/build.gradle                 | 1 +
 feature-push-notifications/src/main/AndroidManifest.xml | 3 +--
 feature-splash/build.gradle                             | 1 +
 feature-splash/src/main/AndroidManifest.xml             | 2 +-
 feature-staking-api/build.gradle                        | 1 +
 feature-staking-api/src/main/AndroidManifest.xml        | 2 +-
 feature-staking-impl/build.gradle                       | 1 +
 feature-staking-impl/src/main/AndroidManifest.xml       | 2 +-
 feature-versions-api/build.gradle                       | 1 +
 feature-versions-api/src/main/AndroidManifest.xml       | 2 +-
 feature-versions-impl/build.gradle                      | 1 +
 feature-versions-impl/src/main/AndroidManifest.xml      | 2 +-
 feature-wallet-api/build.gradle                         | 1 +
 feature-wallet-api/src/main/AndroidManifest.xml         | 2 +-
 feature-wallet-impl/build.gradle                        | 1 +
 feature-wallet-impl/src/main/AndroidManifest.xml        | 2 +-
 gradle.properties                                       | 3 +++
 gradle/wrapper/gradle-wrapper.properties                | 2 +-
 jacoco.gradle                                           | 2 --
 runtime/build.gradle                                    | 1 +
 runtime/src/main/AndroidManifest.xml                    | 2 +-
 test-shared/build.gradle                                | 1 +
 test-shared/src/main/AndroidManifest.xml                | 2 +-
 68 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2af7f8df9b..66c991279c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,6 +157,7 @@ android {
         resources.excludes.add("META-INF/versions/9/previous-compilation-data.bin")
         resources.excludes.add("META-INF/DEPENDENCIES")
     }
+    namespace 'io.novafoundation.nova.app'
 }
 
 void createBindReleaseFileTask(String destination) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ccdb9d9880..c7d5a40ba1 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="io.novafoundation.nova.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/bindings/hydra-dx-math/build.gradle b/bindings/hydra-dx-math/build.gradle
index becf327e8d..9f299c828e 100644
--- a/bindings/hydra-dx-math/build.gradle
+++ b/bindings/hydra-dx-math/build.gradle
@@ -30,6 +30,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.hydra_dx_math'
 }
 
 dependencies {
diff --git a/bindings/hydra-dx-math/src/main/AndroidManifest.xml b/bindings/hydra-dx-math/src/main/AndroidManifest.xml
index 2a1b44c606..cc947c5679 100644
--- a/bindings/hydra-dx-math/src/main/AndroidManifest.xml
+++ b/bindings/hydra-dx-math/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.novafoundation.nova.hydra_dx_math" />
+<manifest />
diff --git a/build.gradle b/build.gradle
index b9a137473f..fc92bebdc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -225,7 +225,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'org.mozilla.rust-android-gradle:plugin:0.9.3'
diff --git a/common/build.gradle b/common/build.gradle
index d1703b00c1..07c9ac1fa6 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -72,6 +72,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.common'
 }
 
 dependencies {
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index c426ce0ae8..cc947c5679 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.novafoundation.nova.common" />
+<manifest />
diff --git a/core-api/build.gradle b/core-api/build.gradle
index bed580296f..9979085548 100644
--- a/core-api/build.gradle
+++ b/core-api/build.gradle
@@ -21,6 +21,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.core'
 }
 
 dependencies {
diff --git a/core-api/src/main/AndroidManifest.xml b/core-api/src/main/AndroidManifest.xml
index ee68e4874b..44008a4332 100644
--- a/core-api/src/main/AndroidManifest.xml
+++ b/core-api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.core">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/core-db/build.gradle b/core-db/build.gradle
index 1296b685a6..2c48e32ae7 100644
--- a/core-db/build.gradle
+++ b/core-db/build.gradle
@@ -39,6 +39,7 @@ android {
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
+    namespace 'io.novafoundation.nova.core_db'
 }
 
 dependencies {
diff --git a/core-db/src/main/AndroidManifest.xml b/core-db/src/main/AndroidManifest.xml
index f23921786c..cc947c5679 100644
--- a/core-db/src/main/AndroidManifest.xml
+++ b/core-db/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.novafoundation.nova.core_db" />
+<manifest />
diff --git a/feature-account-api/build.gradle b/feature-account-api/build.gradle
index be34a0c303..f94177ab15 100644
--- a/feature-account-api/build.gradle
+++ b/feature-account-api/build.gradle
@@ -23,6 +23,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_account_api'
 }
 
 dependencies {
diff --git a/feature-account-api/src/main/AndroidManifest.xml b/feature-account-api/src/main/AndroidManifest.xml
index fc8443c73a..44008a4332 100644
--- a/feature-account-api/src/main/AndroidManifest.xml
+++ b/feature-account-api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_account_api">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-account-impl/build.gradle b/feature-account-impl/build.gradle
index 537e8bbab2..f1a7b3361e 100644
--- a/feature-account-impl/build.gradle
+++ b/feature-account-impl/build.gradle
@@ -31,6 +31,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_account_impl'
 }
 
 dependencies {
diff --git a/feature-account-impl/src/main/AndroidManifest.xml b/feature-account-impl/src/main/AndroidManifest.xml
index 720e27d520..cc947c5679 100644
--- a/feature-account-impl/src/main/AndroidManifest.xml
+++ b/feature-account-impl/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.novafoundation.nova.feature_account_impl" />
+<manifest />
diff --git a/feature-assets/build.gradle b/feature-assets/build.gradle
index 48ab759f6c..f29113bd70 100644
--- a/feature-assets/build.gradle
+++ b/feature-assets/build.gradle
@@ -31,6 +31,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_assets'
 }
 
 dependencies {
diff --git a/feature-assets/src/main/AndroidManifest.xml b/feature-assets/src/main/AndroidManifest.xml
index 05c5761696..a5918e68ab 100644
--- a/feature-assets/src/main/AndroidManifest.xml
+++ b/feature-assets/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="io.novafoundation.nova.feature_assets">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature-crowdloan-api/build.gradle b/feature-crowdloan-api/build.gradle
index a794d2be96..ab5ec0cdae 100644
--- a/feature-crowdloan-api/build.gradle
+++ b/feature-crowdloan-api/build.gradle
@@ -21,6 +21,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_crowdloan_api'
 }
 
 dependencies {
diff --git a/feature-crowdloan-api/src/main/AndroidManifest.xml b/feature-crowdloan-api/src/main/AndroidManifest.xml
index eaf30a1342..44008a4332 100644
--- a/feature-crowdloan-api/src/main/AndroidManifest.xml
+++ b/feature-crowdloan-api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_crowdloan_api">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-crowdloan-impl/build.gradle b/feature-crowdloan-impl/build.gradle
index 534928ba0b..fa03a61efe 100644
--- a/feature-crowdloan-impl/build.gradle
+++ b/feature-crowdloan-impl/build.gradle
@@ -44,6 +44,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_crowdloan_impl'
 }
 
 dependencies {
diff --git a/feature-crowdloan-impl/src/main/AndroidManifest.xml b/feature-crowdloan-impl/src/main/AndroidManifest.xml
index 75270bfb65..44008a4332 100644
--- a/feature-crowdloan-impl/src/main/AndroidManifest.xml
+++ b/feature-crowdloan-impl/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_crowdloan_impl">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-currency-api/build.gradle b/feature-currency-api/build.gradle
index 0434266e65..299efc39cb 100644
--- a/feature-currency-api/build.gradle
+++ b/feature-currency-api/build.gradle
@@ -21,6 +21,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_currency_api'
 }
 
 dependencies {
diff --git a/feature-currency-api/src/main/AndroidManifest.xml b/feature-currency-api/src/main/AndroidManifest.xml
index 40f8bdb42e..568741e54f 100644
--- a/feature-currency-api/src/main/AndroidManifest.xml
+++ b/feature-currency-api/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_currency_api"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-currency-impl/build.gradle b/feature-currency-impl/build.gradle
index a5dcde1cac..2565235e03 100644
--- a/feature-currency-impl/build.gradle
+++ b/feature-currency-impl/build.gradle
@@ -29,6 +29,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_currency_impl'
 }
 
 dependencies {
diff --git a/feature-currency-impl/src/main/AndroidManifest.xml b/feature-currency-impl/src/main/AndroidManifest.xml
index b5298244ce..568741e54f 100644
--- a/feature-currency-impl/src/main/AndroidManifest.xml
+++ b/feature-currency-impl/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_currency_impl"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-dapp-api/build.gradle b/feature-dapp-api/build.gradle
index c9d45185e4..c06ff9fec8 100644
--- a/feature-dapp-api/build.gradle
+++ b/feature-dapp-api/build.gradle
@@ -22,6 +22,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_dapp_api'
 }
 
 dependencies {
diff --git a/feature-dapp-api/src/main/AndroidManifest.xml b/feature-dapp-api/src/main/AndroidManifest.xml
index e7a37a1ff7..a5918e68ab 100644
--- a/feature-dapp-api/src/main/AndroidManifest.xml
+++ b/feature-dapp-api/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="io.novafoundation.nova.feature_dapp_api">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature-dapp-impl/build.gradle b/feature-dapp-impl/build.gradle
index 7d1a5dd1d7..a4d5d23849 100644
--- a/feature-dapp-impl/build.gradle
+++ b/feature-dapp-impl/build.gradle
@@ -35,6 +35,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_dapp_impl'
 }
 
 task actualizeJsScripts(type: Exec) {
diff --git a/feature-dapp-impl/src/main/AndroidManifest.xml b/feature-dapp-impl/src/main/AndroidManifest.xml
index 3fc0d4ad25..a5918e68ab 100644
--- a/feature-dapp-impl/src/main/AndroidManifest.xml
+++ b/feature-dapp-impl/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="io.novafoundation.nova.feature_dapp_impl">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature-deep-linking/build.gradle b/feature-deep-linking/build.gradle
index 2bbdb2d76e..df7beaaf0f 100644
--- a/feature-deep-linking/build.gradle
+++ b/feature-deep-linking/build.gradle
@@ -30,6 +30,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_deep_linking'
 }
 
 dependencies {
diff --git a/feature-deep-linking/src/main/AndroidManifest.xml b/feature-deep-linking/src/main/AndroidManifest.xml
index 3d1c1166b6..568741e54f 100644
--- a/feature-deep-linking/src/main/AndroidManifest.xml
+++ b/feature-deep-linking/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_deep_linking" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-ledger-api/build.gradle b/feature-ledger-api/build.gradle
index 27676b9963..ce8e2eb1b6 100644
--- a/feature-ledger-api/build.gradle
+++ b/feature-ledger-api/build.gradle
@@ -21,6 +21,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_ledger_api'
 }
 
 dependencies {
diff --git a/feature-ledger-api/src/main/AndroidManifest.xml b/feature-ledger-api/src/main/AndroidManifest.xml
index f97ce79a9e..568741e54f 100644
--- a/feature-ledger-api/src/main/AndroidManifest.xml
+++ b/feature-ledger-api/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_ledger_api" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-ledger-impl/build.gradle b/feature-ledger-impl/build.gradle
index 48d7755845..86885ada61 100644
--- a/feature-ledger-impl/build.gradle
+++ b/feature-ledger-impl/build.gradle
@@ -29,6 +29,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_ledger_impl'
 }
 
 dependencies {
diff --git a/feature-ledger-impl/src/main/AndroidManifest.xml b/feature-ledger-impl/src/main/AndroidManifest.xml
index e1c68cc6d6..568741e54f 100644
--- a/feature-ledger-impl/src/main/AndroidManifest.xml
+++ b/feature-ledger-impl/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_ledger_impl" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-nft-api/build.gradle b/feature-nft-api/build.gradle
index fc1ecf1a9b..49441d40ca 100644
--- a/feature-nft-api/build.gradle
+++ b/feature-nft-api/build.gradle
@@ -18,6 +18,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_nft_api'
 }
 
 dependencies {
diff --git a/feature-nft-api/src/main/AndroidManifest.xml b/feature-nft-api/src/main/AndroidManifest.xml
index 65cd60ae2c..a5918e68ab 100644
--- a/feature-nft-api/src/main/AndroidManifest.xml
+++ b/feature-nft-api/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="io.novafoundation.nova.feature_nft_api">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature-nft-impl/build.gradle b/feature-nft-impl/build.gradle
index 6f414c4794..59fb423e20 100644
--- a/feature-nft-impl/build.gradle
+++ b/feature-nft-impl/build.gradle
@@ -31,6 +31,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_nft_impl'
 }
 
 dependencies {
diff --git a/feature-nft-impl/src/main/AndroidManifest.xml b/feature-nft-impl/src/main/AndroidManifest.xml
index 74e118324a..a5918e68ab 100644
--- a/feature-nft-impl/src/main/AndroidManifest.xml
+++ b/feature-nft-impl/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="io.novafoundation.nova.feature_nft_impl">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature-onboarding-api/build.gradle b/feature-onboarding-api/build.gradle
index ee6ab3571a..2f88c1a7d3 100644
--- a/feature-onboarding-api/build.gradle
+++ b/feature-onboarding-api/build.gradle
@@ -21,6 +21,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_onboarding_api'
 }
 
 dependencies {
diff --git a/feature-onboarding-api/src/main/AndroidManifest.xml b/feature-onboarding-api/src/main/AndroidManifest.xml
index a2658188e4..44008a4332 100644
--- a/feature-onboarding-api/src/main/AndroidManifest.xml
+++ b/feature-onboarding-api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_onboarding_api">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-onboarding-impl/build.gradle b/feature-onboarding-impl/build.gradle
index 4ec60caa7e..352a2402c2 100644
--- a/feature-onboarding-impl/build.gradle
+++ b/feature-onboarding-impl/build.gradle
@@ -31,6 +31,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_onboarding_impl'
 }
 
 dependencies {
diff --git a/feature-onboarding-impl/src/main/AndroidManifest.xml b/feature-onboarding-impl/src/main/AndroidManifest.xml
index 45d831c607..227314eeb7 100644
--- a/feature-onboarding-impl/src/main/AndroidManifest.xml
+++ b/feature-onboarding-impl/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.novafoundation.nova.feature_onboarding_impl" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-proxy-api/build.gradle b/feature-proxy-api/build.gradle
index 7cdec80b58..11c26ceba2 100644
--- a/feature-proxy-api/build.gradle
+++ b/feature-proxy-api/build.gradle
@@ -21,6 +21,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_proxy_api'
 }
 
 dependencies {
diff --git a/feature-proxy-api/src/main/AndroidManifest.xml b/feature-proxy-api/src/main/AndroidManifest.xml
index 10c74f4bde..de749acb75 100644
--- a/feature-proxy-api/src/main/AndroidManifest.xml
+++ b/feature-proxy-api/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.novafoundation.nova.feature_proxy_api"/>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/feature-push-notifications/build.gradle b/feature-push-notifications/build.gradle
index d865f1174a..7d19bc3fee 100644
--- a/feature-push-notifications/build.gradle
+++ b/feature-push-notifications/build.gradle
@@ -31,6 +31,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_push_notifications'
 }
 
 dependencies {
diff --git a/feature-push-notifications/src/main/AndroidManifest.xml b/feature-push-notifications/src/main/AndroidManifest.xml
index e0fb6b996a..de749acb75 100644
--- a/feature-push-notifications/src/main/AndroidManifest.xml
+++ b/feature-push-notifications/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.novafoundation.nova.feature_push_notifications" />
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/feature-splash/build.gradle b/feature-splash/build.gradle
index 3dda34f147..df5360b636 100644
--- a/feature-splash/build.gradle
+++ b/feature-splash/build.gradle
@@ -30,6 +30,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.splash'
 }
 
 dependencies {
diff --git a/feature-splash/src/main/AndroidManifest.xml b/feature-splash/src/main/AndroidManifest.xml
index 03ec7ffda2..099dea4687 100644
--- a/feature-splash/src/main/AndroidManifest.xml
+++ b/feature-splash/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<manifest package="io.novafoundation.nova.splash">
+<manifest>
 </manifest>
\ No newline at end of file
diff --git a/feature-staking-api/build.gradle b/feature-staking-api/build.gradle
index 3a792a9240..9e35549bc4 100644
--- a/feature-staking-api/build.gradle
+++ b/feature-staking-api/build.gradle
@@ -21,6 +21,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_staking_api'
 }
 
 dependencies {
diff --git a/feature-staking-api/src/main/AndroidManifest.xml b/feature-staking-api/src/main/AndroidManifest.xml
index e0f595a2d4..44008a4332 100644
--- a/feature-staking-api/src/main/AndroidManifest.xml
+++ b/feature-staking-api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_staking_api">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-staking-impl/build.gradle b/feature-staking-impl/build.gradle
index 4ae0c91a04..f99344b2cb 100644
--- a/feature-staking-impl/build.gradle
+++ b/feature-staking-impl/build.gradle
@@ -37,6 +37,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_staking_impl'
 }
 
 dependencies {
diff --git a/feature-staking-impl/src/main/AndroidManifest.xml b/feature-staking-impl/src/main/AndroidManifest.xml
index f0d014b7c8..44008a4332 100644
--- a/feature-staking-impl/src/main/AndroidManifest.xml
+++ b/feature-staking-impl/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_staking_impl">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-versions-api/build.gradle b/feature-versions-api/build.gradle
index 608bcfbce7..d1bb5f88bc 100644
--- a/feature-versions-api/build.gradle
+++ b/feature-versions-api/build.gradle
@@ -31,6 +31,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_versions_api'
 }
 
 dependencies {
diff --git a/feature-versions-api/src/main/AndroidManifest.xml b/feature-versions-api/src/main/AndroidManifest.xml
index 51276bdbaf..568741e54f 100644
--- a/feature-versions-api/src/main/AndroidManifest.xml
+++ b/feature-versions-api/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_versions_api"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-versions-impl/build.gradle b/feature-versions-impl/build.gradle
index 2b303c55fe..329c253a80 100644
--- a/feature-versions-impl/build.gradle
+++ b/feature-versions-impl/build.gradle
@@ -37,6 +37,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    namespace 'io.novafoundation.nova.feature_versions_impl'
 }
 
 dependencies {
diff --git a/feature-versions-impl/src/main/AndroidManifest.xml b/feature-versions-impl/src/main/AndroidManifest.xml
index bf11887343..568741e54f 100644
--- a/feature-versions-impl/src/main/AndroidManifest.xml
+++ b/feature-versions-impl/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_versions_impl"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/feature-wallet-api/build.gradle b/feature-wallet-api/build.gradle
index e69ea3fe70..c09a61be8d 100644
--- a/feature-wallet-api/build.gradle
+++ b/feature-wallet-api/build.gradle
@@ -18,6 +18,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_wallet_api'
 }
 
 dependencies {
diff --git a/feature-wallet-api/src/main/AndroidManifest.xml b/feature-wallet-api/src/main/AndroidManifest.xml
index 97ad0b8714..44008a4332 100644
--- a/feature-wallet-api/src/main/AndroidManifest.xml
+++ b/feature-wallet-api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.feature_wallet_api">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature-wallet-impl/build.gradle b/feature-wallet-impl/build.gradle
index 4741de3aed..ec6d064789 100644
--- a/feature-wallet-impl/build.gradle
+++ b/feature-wallet-impl/build.gradle
@@ -39,6 +39,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.feature_wallet_impl'
 }
 
 dependencies {
diff --git a/feature-wallet-impl/src/main/AndroidManifest.xml b/feature-wallet-impl/src/main/AndroidManifest.xml
index 2225a63503..099dea4687 100644
--- a/feature-wallet-impl/src/main/AndroidManifest.xml
+++ b/feature-wallet-impl/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<manifest package="io.novafoundation.nova.feature_wallet_impl">
+<manifest>
 </manifest>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 65c2df377a..b3b3205391 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,6 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d8d79827c6..1f2d3058ae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/jacoco.gradle b/jacoco.gradle
index 4a62d20e45..e7d9f25d5d 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -37,8 +37,6 @@ afterEvaluate {
         if (!file.exists()) file.mkdirs()
 
         reports {
-            xml.enabled = true
-            html.enabled = true
             html.setDestination(new File(outputFileNameHtml))
             xml.setDestination(new File(outputFileName))
         }
diff --git a/runtime/build.gradle b/runtime/build.gradle
index 06886b75fe..4a54aada69 100644
--- a/runtime/build.gradle
+++ b/runtime/build.gradle
@@ -44,6 +44,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.runtime'
 }
 
 dependencies {
diff --git a/runtime/src/main/AndroidManifest.xml b/runtime/src/main/AndroidManifest.xml
index 9fdd9a3504..44008a4332 100644
--- a/runtime/src/main/AndroidManifest.xml
+++ b/runtime/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.novafoundation.nova.runtime">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/test-shared/build.gradle b/test-shared/build.gradle
index c1b8e89005..4cd6448655 100644
--- a/test-shared/build.gradle
+++ b/test-shared/build.gradle
@@ -23,6 +23,7 @@ android {
         jvmTarget = '1.8'
         freeCompilerArgs = ["-Xcontext-receivers"]
     }
+    namespace 'io.novafoundation.nova.test_shared'
 }
 
 
diff --git a/test-shared/src/main/AndroidManifest.xml b/test-shared/src/main/AndroidManifest.xml
index b36dd6ce49..227314eeb7 100644
--- a/test-shared/src/main/AndroidManifest.xml
+++ b/test-shared/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.novafoundation.nova.test_shared" />
\ No newline at end of file
+<manifest />
\ No newline at end of file