declare namespace in build.gradle.kts instead of AndroidManifest.xml

Author: RBusarow

benchmarks/dungeon-benchmark/build.gradle.kts

@@ -35,6 +35,7 @@ android {
   }
 
   targetProjectPath = ":samples:dungeon:app"
+  namespace = "com.squareup.sample.dungeon.benchmark"
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 

benchmarks/dungeon-benchmark/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="com.squareup.sample.dungeon.benchmark">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <queries>
     <package android:name="com.squareup.sample.dungeon" />

benchmarks/performance-poetry/complex-benchmark/build.gradle.kts

@@ -44,6 +44,7 @@ android {
   }
 
   targetProjectPath = ":benchmarks:performance-poetry:complex-poetry"
+  namespace = "com.squareup.benchmarks.performance.poetry.complex.benchmark"
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 

benchmarks/performance-poetry/complex-benchmark/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="com.squareup.benchmarks.performance.poetry.complex.benchmark">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <queries>
     <package android:name="com.squareup.benchmarks.performance.complex.poetry" />

benchmarks/performance-poetry/complex-poetry/build.gradle.kts

@@ -43,6 +43,7 @@ android {
     resources.excludes.add("META-INF/AL2.0")
     resources.excludes.add("META-INF/LGPL2.1")
   }
+  namespace = "com.squareup.benchmarks.performance.complex.poetry"
 }
 
 dependencies {

benchmarks/performance-poetry/complex-poetry/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="com.squareup.benchmarks.performance.complex.poetry">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission
       android:name="android.permission.WRITE_EXTERNAL_STORAGE"

samples/compose-samples/build.gradle.kts

@@ -16,6 +16,7 @@ android {
   composeOptions {
     kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
   }
+  namespace = "com.squareup.sample.compose"
 }
 
 dependencies {

samples/compose-samples/src/main/AndroidManifest.xml

@@ -1,8 +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="com.squareup.sample.compose"
-    >
+    xmlns:tools="http://schemas.android.com/tools">
 
   <application
       android:allowBackup="false"

samples/containers/android/build.gradle.kts

@@ -8,6 +8,7 @@ android {
   defaultConfig {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+  namespace = "com.squareup.sample.container"
 }
 
 dependencies {