Migrate from AndroidManifest to build.gradle for namespace
AGP has deprecated use of packageName in AndroidManifest and
instead wants everyone to use `android { namespace = "foo" }`
in build.gradle files.
Test: ./gradlew tasks -> still passes
Change-Id: I4fa03cacc7214011f3797c36dcb76c2984c7bf52
diff --git a/compose/animation/animation-core/benchmark/build.gradle b/compose/animation/animation-core/benchmark/build.gradle
index 2fd2831..9dced2d 100644
--- a/compose/animation/animation-core/benchmark/build.gradle
+++ b/compose/animation/animation-core/benchmark/build.gradle
@@ -34,3 +34,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.junit)
}
+
+android {
+ namespace "androidx.compose.animation.core.benchmark"
+}
diff --git a/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml b/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml
index 930962e..56a1d89 100644
--- a/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.animation.core.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/animation/animation-core/benchmark/src/main/AndroidManifest.xml b/compose/animation/animation-core/benchmark/src/main/AndroidManifest.xml
index e2b118f..32ad9c9 100644
--- a/compose/animation/animation-core/benchmark/src/main/AndroidManifest.xml
+++ b/compose/animation/animation-core/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.animation.core.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 465cb92..ab541e4 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -143,6 +143,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.compose.animation.core"
+}
+
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += [
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle
index 1c7baf1..3cf714c 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -45,3 +45,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Animation Core Classes"
}
+
+android {
+ namespace "androidx.compose.animation.core.samples"
+}
diff --git a/compose/animation/animation-core/samples/src/main/AndroidManifest.xml b/compose/animation/animation-core/samples/src/main/AndroidManifest.xml
index 9a6228d..dc2f180 100644
--- a/compose/animation/animation-core/samples/src/main/AndroidManifest.xml
+++ b/compose/animation/animation-core/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.animation.core.samples" />
+<manifest />
diff --git a/compose/animation/animation-core/src/androidAndroidTest/AndroidManifest.xml b/compose/animation/animation-core/src/androidAndroidTest/AndroidManifest.xml
index 61f91c5..127ad73 100644
--- a/compose/animation/animation-core/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/animation/animation-core/src/androidAndroidTest/AndroidManifest.xml
@@ -13,4 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.animation.core"/>
+<manifest />
diff --git a/compose/animation/animation-core/src/androidMain/AndroidManifest.xml b/compose/animation/animation-core/src/androidMain/AndroidManifest.xml
index ce6ecb4..34d825b 100644
--- a/compose/animation/animation-core/src/androidMain/AndroidManifest.xml
+++ b/compose/animation/animation-core/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.animation.core" />
+<manifest />
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index be32c0d..e6cbec0 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -127,3 +127,7 @@
inceptionYear = "2021"
description = "Compose Animation Graphics Library for using animated-vector resources in Compose"
}
+
+android {
+ namespace "androidx.compose.animation.graphics"
+}
diff --git a/compose/animation/animation-graphics/samples/build.gradle b/compose/animation/animation-graphics/samples/build.gradle
index 91c8fb0..e51a309 100644
--- a/compose/animation/animation-graphics/samples/build.gradle
+++ b/compose/animation/animation-graphics/samples/build.gradle
@@ -45,3 +45,7 @@
inceptionYear = "2021"
description = "Contains the sample code for the Androidx Compose UI Animation Graphics Library"
}
+
+android {
+ namespace "androidx.compose.animation.graphics.samples"
+}
diff --git a/compose/animation/animation-graphics/samples/src/main/AndroidManifest.xml b/compose/animation/animation-graphics/samples/src/main/AndroidManifest.xml
index 3ea924a..3063116 100644
--- a/compose/animation/animation-graphics/samples/src/main/AndroidManifest.xml
+++ b/compose/animation/animation-graphics/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.animation.graphics.samples" />
+<manifest />
diff --git a/compose/animation/animation-graphics/src/androidAndroidTest/AndroidManifest.xml b/compose/animation/animation-graphics/src/androidAndroidTest/AndroidManifest.xml
index efb54b0..3c3c224 100644
--- a/compose/animation/animation-graphics/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/animation/animation-graphics/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.animation.graphics" />
+<manifest />
diff --git a/compose/animation/animation-graphics/src/androidMain/AndroidManifest.xml b/compose/animation/animation-graphics/src/androidMain/AndroidManifest.xml
index 91a8747..3063116 100644
--- a/compose/animation/animation-graphics/src/androidMain/AndroidManifest.xml
+++ b/compose/animation/animation-graphics/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.animation.graphics" />
+<manifest />
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index e11bc5b..39b20be 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -127,3 +127,7 @@
description = "Compose animation library"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.animation"
+}
diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle
index b03a158..6f74089 100644
--- a/compose/animation/animation/integration-tests/animation-demos/build.gradle
+++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle
@@ -22,3 +22,7 @@
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:material:material"))
}
+
+android {
+ namespace "androidx.compose.animation.demos"
+}
diff --git a/compose/animation/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml b/compose/animation/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml
index 8873649..dc2f180 100644
--- a/compose/animation/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml
+++ b/compose/animation/animation/integration-tests/animation-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.animation.demos"/>
+<manifest />
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle
index 9de1ab1..f360b1a 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -45,3 +45,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Animation Library"
}
+
+android {
+ namespace "androidx.compose.animation.samples"
+}
diff --git a/compose/animation/animation/samples/src/main/AndroidManifest.xml b/compose/animation/animation/samples/src/main/AndroidManifest.xml
index 5f64e72..dc2f180 100644
--- a/compose/animation/animation/samples/src/main/AndroidManifest.xml
+++ b/compose/animation/animation/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.animation.samples" />
+<manifest />
diff --git a/compose/animation/animation/src/androidAndroidTest/AndroidManifest.xml b/compose/animation/animation/src/androidAndroidTest/AndroidManifest.xml
index c6da2f1..9cd4123 100644
--- a/compose/animation/animation/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/animation/animation/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.animation" />
+<manifest />
diff --git a/compose/animation/animation/src/androidMain/AndroidManifest.xml b/compose/animation/animation/src/androidMain/AndroidManifest.xml
index 41243e0..34d825b 100644
--- a/compose/animation/animation/src/androidMain/AndroidManifest.xml
+++ b/compose/animation/animation/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.animation" />
+<manifest />
diff --git a/compose/benchmark-utils/benchmark/build.gradle b/compose/benchmark-utils/benchmark/build.gradle
index 26c147d..e1aba8e 100644
--- a/compose/benchmark-utils/benchmark/build.gradle
+++ b/compose/benchmark-utils/benchmark/build.gradle
@@ -34,3 +34,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.junit)
}
+
+android {
+ namespace "androidx.compose.benchmarkutils.benchmark"
+}
diff --git a/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml b/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml
index 79f2534..56a1d89 100644
--- a/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.benchmarkutils.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/benchmark-utils/benchmark/src/main/AndroidManifest.xml b/compose/benchmark-utils/benchmark/src/main/AndroidManifest.xml
index 2157585..32ad9c9 100644
--- a/compose/benchmark-utils/benchmark/src/main/AndroidManifest.xml
+++ b/compose/benchmark-utils/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.benchmarkutils.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/benchmark-utils/build.gradle b/compose/benchmark-utils/build.gradle
index 474cc27..a79fec1 100644
--- a/compose/benchmark-utils/build.gradle
+++ b/compose/benchmark-utils/build.gradle
@@ -36,4 +36,8 @@
// This has stub APIs for access to legacy Android APIs, so we don't want
// any dependency on this module.
compileOnly(project(":compose:ui:ui-android-stubs"))
+}
+
+android {
+ namespace "androidx.compose.benchmarkutils"
}
\ No newline at end of file
diff --git a/compose/benchmark-utils/src/androidTest/AndroidManifest.xml b/compose/benchmark-utils/src/androidTest/AndroidManifest.xml
index ce8f343..e865f27 100644
--- a/compose/benchmark-utils/src/androidTest/AndroidManifest.xml
+++ b/compose/benchmark-utils/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.benchmarkutils"/>
+<manifest />
diff --git a/compose/benchmark-utils/src/main/AndroidManifest.xml b/compose/benchmark-utils/src/main/AndroidManifest.xml
index 19f27c9..e3de392 100644
--- a/compose/benchmark-utils/src/main/AndroidManifest.xml
+++ b/compose/benchmark-utils/src/main/AndroidManifest.xml
@@ -13,5 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.benchmarkutils"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/compose/compiler/compiler-hosted/integration-tests/build.gradle b/compose/compiler/compiler-hosted/integration-tests/build.gradle
index 18448df..072af6a 100644
--- a/compose/compiler/compiler-hosted/integration-tests/build.gradle
+++ b/compose/compiler/compiler-hosted/integration-tests/build.gradle
@@ -72,6 +72,7 @@
lintOptions {
disable("SyntheticAccessor")
}
+ namespace "androidx.compose.runtime.tests"
}
tasks.withType(KotlinCompile).configureEach {
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/main/AndroidManifest.xml b/compose/compiler/compiler-hosted/integration-tests/src/main/AndroidManifest.xml
index eb4d05a..7250e4f 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/main/AndroidManifest.xml
+++ b/compose/compiler/compiler-hosted/integration-tests/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.tests" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
diff --git a/compose/foundation/foundation-layout/benchmark/build.gradle b/compose/foundation/foundation-layout/benchmark/build.gradle
index 5505ba1..af32431 100644
--- a/compose/foundation/foundation-layout/benchmark/build.gradle
+++ b/compose/foundation/foundation-layout/benchmark/build.gradle
@@ -37,3 +37,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.truth)
}
+
+android {
+ namespace "androidx.compose.foundation.layout.benchmark"
+}
diff --git a/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml b/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml
index 30a2807..56a1d89 100644
--- a/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.foundation.layout.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/foundation/foundation-layout/benchmark/src/main/AndroidManifest.xml b/compose/foundation/foundation-layout/benchmark/src/main/AndroidManifest.xml
index 7312ea2..32ad9c9 100644
--- a/compose/foundation/foundation-layout/benchmark/src/main/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.foundation.layout.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index c92c558..3920493 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -133,3 +133,7 @@
description = "Compose layout implementations"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.foundation.layout"
+}
diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
index fe24ef9..4af954d 100644
--- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
+++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle
@@ -35,3 +35,7 @@
implementation(project(":compose:ui:ui"))
implementation(project(":compose:ui:ui-text"))
}
+
+android {
+ namespace "androidx.compose.foundation.layout.demos"
+}
diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/src/main/AndroidManifest.xml b/compose/foundation/foundation-layout/integration-tests/layout-demos/src/main/AndroidManifest.xml
index 0d68fba..d04f9bb 100644
--- a/compose/foundation/foundation-layout/integration-tests/layout-demos/src/main/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.foundation.layout.demos"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle
index 6afa31e..b61e019 100644
--- a/compose/foundation/foundation-layout/samples/build.gradle
+++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -46,3 +46,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Core Layout Classes"
}
+
+android {
+ namespace "androidx.compose.foundation.layout.samples"
+}
diff --git a/compose/foundation/foundation-layout/samples/src/main/AndroidManifest.xml b/compose/foundation/foundation-layout/samples/src/main/AndroidManifest.xml
index 4f8cca0..b962196 100644
--- a/compose/foundation/foundation-layout/samples/src/main/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.foundation.layout.samples" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml b/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml
index 26b9764..2f531ed 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.compose.foundation.layout">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<activity
android:name="androidx.compose.foundation.layout.TestActivity"
diff --git a/compose/foundation/foundation-layout/src/androidMain/AndroidManifest.xml b/compose/foundation/foundation-layout/src/androidMain/AndroidManifest.xml
index 195d65f..b47339d 100644
--- a/compose/foundation/foundation-layout/src/androidMain/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.foundation.layout" />
+<manifest />
diff --git a/compose/foundation/foundation/benchmark/build.gradle b/compose/foundation/foundation/benchmark/build.gradle
index a8d0f64..ceb374c 100644
--- a/compose/foundation/foundation/benchmark/build.gradle
+++ b/compose/foundation/foundation/benchmark/build.gradle
@@ -39,3 +39,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.truth)
}
+
+android {
+ namespace "androidx.compose.foundation.benchmark"
+}
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml b/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml
index e0847ac..56a1d89 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.foundation.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/foundation/foundation/benchmark/src/main/AndroidManifest.xml b/compose/foundation/foundation/benchmark/src/main/AndroidManifest.xml
index bec11fb..32ad9c9 100644
--- a/compose/foundation/foundation/benchmark/src/main/AndroidManifest.xml
+++ b/compose/foundation/foundation/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.foundation.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 8ec234f..18e0195 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -158,6 +158,7 @@
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/foundation/foundation"
+ namespace "androidx.compose.foundation"
}
androidx {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
index 9d2b72e..32f2c396 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle
@@ -38,3 +38,7 @@
implementation(project(":compose:ui:ui-text:ui-text-samples"))
implementation(project(":paging:paging-compose:integration-tests:paging-demos"))
}
+
+android {
+ namespace "androidx.compose.foundation.demos"
+}
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/AndroidManifest.xml b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/AndroidManifest.xml
index 43d9455..6a69672 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/AndroidManifest.xml
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.foundation.demos"/>
+<manifest />
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle
index 33cff0b..25040a6 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -46,3 +46,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Foundational Components"
}
+
+android {
+ namespace "androidx.compose.foundation.samples"
+}
diff --git a/compose/foundation/foundation/samples/src/main/AndroidManifest.xml b/compose/foundation/foundation/samples/src/main/AndroidManifest.xml
index 47518c3..6a69672 100644
--- a/compose/foundation/foundation/samples/src/main/AndroidManifest.xml
+++ b/compose/foundation/foundation/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.foundation.samples" />
+<manifest />
diff --git a/compose/foundation/foundation/src/androidAndroidTest/AndroidManifest.xml b/compose/foundation/foundation/src/androidAndroidTest/AndroidManifest.xml
index 56e43ad..a439d4a 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation/src/androidAndroidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.foundation" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.compose.foundation.TestActivity"
diff --git a/compose/foundation/foundation/src/androidMain/AndroidManifest.xml b/compose/foundation/foundation/src/androidMain/AndroidManifest.xml
index 45ad1d9..7535bfb 100644
--- a/compose/foundation/foundation/src/androidMain/AndroidManifest.xml
+++ b/compose/foundation/foundation/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.foundation" />
+<manifest />
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index 927e92c..63a74b0 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -45,4 +45,5 @@
// part of CI.
archivesBaseName = "compose-demos-testapp"
}
+ namespace "androidx.compose.integration.demos"
}
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle
index dc41c9f..116ae64 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -29,3 +29,7 @@
api("androidx.fragment:fragment-ktx:1.3.6")
implementation(projectOrArtifact(":compose:runtime:runtime"))
}
+
+android {
+ namespace "androidx.compose.integration.demos.common"
+}
diff --git a/compose/integration-tests/demos/common/src/main/AndroidManifest.xml b/compose/integration-tests/demos/common/src/main/AndroidManifest.xml
index 0223ba7..deac81d 100644
--- a/compose/integration-tests/demos/common/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/demos/common/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.integration.demos.common"/>
+<manifest />
diff --git a/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml b/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml
index 1195f30..7535bfb 100644
--- a/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml
+++ b/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.integration.demos" />
+<manifest />
diff --git a/compose/integration-tests/demos/src/main/AndroidManifest.xml b/compose/integration-tests/demos/src/main/AndroidManifest.xml
index 1d86efa..8ce6972 100644
--- a/compose/integration-tests/demos/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/demos/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools" package="androidx.compose.integration.demos">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Jetpack Compose Demos"
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle
index b6c04ee..66c3c5b 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -68,6 +68,10 @@
description = "Compose Documentation Snippets on developer.android.com"
}
+android {
+ namespace "androidx.compose.integration.docs"
+}
+
android.defaultConfig.minSdkVersion 21
android.buildFeatures.viewBinding true
diff --git a/compose/integration-tests/docs-snippets/src/main/AndroidManifest.xml b/compose/integration-tests/docs-snippets/src/main/AndroidManifest.xml
index db5bed8..ae0be49 100644
--- a/compose/integration-tests/docs-snippets/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/docs-snippets/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.integration.docs" />
+<manifest />
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 59af757..37eacb5 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -6,6 +6,8 @@
}
android {
+
+ namespace "androidx.compose.integration.macrobenchmark.target"
buildTypes {
release {
minifyEnabled true
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index 040787d..f8cbb57 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.compose.integration.macrobenchmark.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Jetpack Compose Macrobenchmark Target"
diff --git a/compose/integration-tests/macrobenchmark/build.gradle b/compose/integration-tests/macrobenchmark/build.gradle
index 68054a9..60103b8 100644
--- a/compose/integration-tests/macrobenchmark/build.gradle
+++ b/compose/integration-tests/macrobenchmark/build.gradle
@@ -20,6 +20,10 @@
id("kotlin-android")
}
+android {
+ namespace "androidx.compose.integration.macrobenchmark"
+}
+
android.defaultConfig {
minSdkVersion 23
}
diff --git a/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml b/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
index 0718de4..5b41847 100644
--- a/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.integration.macrobenchmark.test"/>
+<manifest />
diff --git a/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml b/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
index 34af7ba..5b41847 100644
--- a/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.integration.macrobenchmark" />
+<manifest />
diff --git a/compose/integration-tests/material-catalog/build.gradle b/compose/integration-tests/material-catalog/build.gradle
index feb57b5..b755b7e 100644
--- a/compose/integration-tests/material-catalog/build.gradle
+++ b/compose/integration-tests/material-catalog/build.gradle
@@ -39,6 +39,7 @@
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
}
}
+ namespace "androidx.compose.material.catalog"
}
dependencies {
diff --git a/compose/integration-tests/material-catalog/src/main/AndroidManifest.xml b/compose/integration-tests/material-catalog/src/main/AndroidManifest.xml
index 4034da7..eb40d79 100644
--- a/compose/integration-tests/material-catalog/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/material-catalog/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.material.catalog">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="@string/compose_material_catalog"
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle
index 03fc50f..31d3491 100644
--- a/compose/material/material-icons-core/build.gradle
+++ b/compose/material/material-icons-core/build.gradle
@@ -85,3 +85,7 @@
description = "Compose Material Design core icons. This module contains the most commonly used set of Material icons."
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.material.icons"
+}
diff --git a/compose/material/material-icons-core/samples/build.gradle b/compose/material/material-icons-core/samples/build.gradle
index 6895554..bae3717 100644
--- a/compose/material/material-icons-core/samples/build.gradle
+++ b/compose/material/material-icons-core/samples/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Core Material Icons"
}
+
+android {
+ namespace "androidx.compose.material.icons.samples"
+}
diff --git a/compose/material/material-icons-core/samples/src/main/AndroidManifest.xml b/compose/material/material-icons-core/samples/src/main/AndroidManifest.xml
index 0e5e3a1..820b02a 100644
--- a/compose/material/material-icons-core/samples/src/main/AndroidManifest.xml
+++ b/compose/material/material-icons-core/samples/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<manifest package="androidx.compose.material.icons.samples" />
+<manifest />
diff --git a/compose/material/material-icons-core/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-core/src/androidMain/AndroidManifest.xml
index e87376e77..9cd4123 100644
--- a/compose/material/material-icons-core/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-core/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons" />
+<manifest />
diff --git a/compose/material/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-filled/build.gradle
index 95df6bf..8a29bef 100644
--- a/compose/material/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-filled/build.gradle
@@ -15,3 +15,7 @@
*/
apply from: "../material-icons-extended/generate.gradle"
+
+android {
+ namespace "androidx.compose.material.icons.extended"
+}
\ No newline at end of file
diff --git a/compose/material/material-icons-extended-filled/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-filled/src/androidMain/AndroidManifest.xml
index 4e728ed..9cd4123 100644
--- a/compose/material/material-icons-extended-filled/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-extended-filled/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons.extended" />
+<manifest />
diff --git a/compose/material/material-icons-extended-outlined/build.gradle b/compose/material/material-icons-extended-outlined/build.gradle
index 95df6bf..8a29bef 100644
--- a/compose/material/material-icons-extended-outlined/build.gradle
+++ b/compose/material/material-icons-extended-outlined/build.gradle
@@ -15,3 +15,7 @@
*/
apply from: "../material-icons-extended/generate.gradle"
+
+android {
+ namespace "androidx.compose.material.icons.extended"
+}
\ No newline at end of file
diff --git a/compose/material/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml
index 4e728ed..9cd4123 100644
--- a/compose/material/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-extended-outlined/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons.extended" />
+<manifest />
diff --git a/compose/material/material-icons-extended-rounded/build.gradle b/compose/material/material-icons-extended-rounded/build.gradle
index 95df6bf..8a29bef 100644
--- a/compose/material/material-icons-extended-rounded/build.gradle
+++ b/compose/material/material-icons-extended-rounded/build.gradle
@@ -15,3 +15,7 @@
*/
apply from: "../material-icons-extended/generate.gradle"
+
+android {
+ namespace "androidx.compose.material.icons.extended"
+}
\ No newline at end of file
diff --git a/compose/material/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml
index 4e728ed..9cd4123 100644
--- a/compose/material/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-extended-rounded/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons.extended" />
+<manifest />
diff --git a/compose/material/material-icons-extended-sharp/build.gradle b/compose/material/material-icons-extended-sharp/build.gradle
index 95df6bf..8a29bef 100644
--- a/compose/material/material-icons-extended-sharp/build.gradle
+++ b/compose/material/material-icons-extended-sharp/build.gradle
@@ -15,3 +15,7 @@
*/
apply from: "../material-icons-extended/generate.gradle"
+
+android {
+ namespace "androidx.compose.material.icons.extended"
+}
\ No newline at end of file
diff --git a/compose/material/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml
index 4e728ed..9cd4123 100644
--- a/compose/material/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-extended-sharp/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons.extended" />
+<manifest />
diff --git a/compose/material/material-icons-extended-twotone/build.gradle b/compose/material/material-icons-extended-twotone/build.gradle
index 95df6bf..8a29bef 100644
--- a/compose/material/material-icons-extended-twotone/build.gradle
+++ b/compose/material/material-icons-extended-twotone/build.gradle
@@ -15,3 +15,7 @@
*/
apply from: "../material-icons-extended/generate.gradle"
+
+android {
+ namespace "androidx.compose.material.icons.extended"
+}
\ No newline at end of file
diff --git a/compose/material/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml
index 4e728ed..9cd4123 100644
--- a/compose/material/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-extended-twotone/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons.extended" />
+<manifest />
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle
index fbf2edb..4379019 100644
--- a/compose/material/material-icons-extended/build.gradle
+++ b/compose/material/material-icons-extended/build.gradle
@@ -146,3 +146,7 @@
inceptionYear = "2020"
description = "Compose Material Design extended icons. This module contains all Material icons. It is a very large dependency and should not be included directly."
}
+
+android {
+ namespace "androidx.compose.material.icons.extended"
+}
diff --git a/compose/material/material-icons-extended/src/androidAndroidTest/AndroidManifest.xml b/compose/material/material-icons-extended/src/androidAndroidTest/AndroidManifest.xml
index e87376e77..9cd4123 100644
--- a/compose/material/material-icons-extended/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/material/material-icons-extended/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons" />
+<manifest />
diff --git a/compose/material/material-icons-extended/src/androidMain/AndroidManifest.xml b/compose/material/material-icons-extended/src/androidMain/AndroidManifest.xml
index 4e728ed..9cd4123 100644
--- a/compose/material/material-icons-extended/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-icons-extended/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.material.icons.extended" />
+<manifest />
diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle
index fd08d30..233719b 100644
--- a/compose/material/material-ripple/build.gradle
+++ b/compose/material/material-ripple/build.gradle
@@ -108,3 +108,7 @@
// visibility
legacyDisableKotlinStrictApiMode = AndroidXComposePlugin.isMultiplatformEnabled(project)
}
+
+android {
+ namespace "androidx.compose.material.ripple"
+}
diff --git a/compose/material/material-ripple/src/androidAndroidTest/AndroidManifest.xml b/compose/material/material-ripple/src/androidAndroidTest/AndroidManifest.xml
index 2b2c8e8..e865f27 100644
--- a/compose/material/material-ripple/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/material/material-ripple/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.material.ripple" />
+<manifest />
diff --git a/compose/material/material-ripple/src/androidMain/AndroidManifest.xml b/compose/material/material-ripple/src/androidMain/AndroidManifest.xml
index 0c2bb3c..7535bfb 100644
--- a/compose/material/material-ripple/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-ripple/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.material.ripple" />
+<manifest />
diff --git a/compose/material/material-window/build.gradle b/compose/material/material-window/build.gradle
index 9345d78..5700dd6 100644
--- a/compose/material/material-window/build.gradle
+++ b/compose/material/material-window/build.gradle
@@ -104,4 +104,8 @@
mavenGroup = LibraryGroups.COMPOSE_MATERIAL
inceptionYear = "2022"
description = "Provides window size classes for building responsive UI"
+}
+
+android {
+ namespace "androidx.compose.material.window"
}
\ No newline at end of file
diff --git a/compose/material/material-window/src/androidAndroidTest/AndroidManifest.xml b/compose/material/material-window/src/androidAndroidTest/AndroidManifest.xml
index d4234d3..a9ad70f 100644
--- a/compose/material/material-window/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/material/material-window/src/androidAndroidTest/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.material.window" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/material/material-window/src/androidMain/AndroidManifest.xml b/compose/material/material-window/src/androidMain/AndroidManifest.xml
index d4234d3..a9ad70f 100644
--- a/compose/material/material-window/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material-window/src/androidMain/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.material.window" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/material/material/benchmark/build.gradle b/compose/material/material/benchmark/build.gradle
index d4ecbd0..38cb333 100644
--- a/compose/material/material/benchmark/build.gradle
+++ b/compose/material/material/benchmark/build.gradle
@@ -39,3 +39,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.truth)
}
+
+android {
+ namespace "androidx.compose.material.benchmark"
+}
diff --git a/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml b/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml
index e473cdc..56a1d89 100644
--- a/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.material.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/material/material/benchmark/src/main/AndroidManifest.xml b/compose/material/material/benchmark/src/main/AndroidManifest.xml
index 743643e..32ad9c9 100644
--- a/compose/material/material/benchmark/src/main/AndroidManifest.xml
+++ b/compose/material/material/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.material.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 87ef5e9..ad7caa1 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -167,4 +167,5 @@
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/material/material"
+ namespace "androidx.compose.material"
}
diff --git a/compose/material/material/integration-tests/material-catalog/build.gradle b/compose/material/material/integration-tests/material-catalog/build.gradle
index c7aa189..0d2aede 100644
--- a/compose/material/material/integration-tests/material-catalog/build.gradle
+++ b/compose/material/material/integration-tests/material-catalog/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2021"
description = "This is a project for the Compose Material Catalog."
}
+
+android {
+ namespace "androidx.compose.material.catalog.library"
+}
diff --git a/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml b/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml
index a3ef31f..ccc91d4 100644
--- a/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml
+++ b/compose/material/material/integration-tests/material-catalog/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.material.catalog.library" />
+<manifest />
diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle
index 153cf9b..e24f00e 100644
--- a/compose/material/material/integration-tests/material-demos/build.gradle
+++ b/compose/material/material/integration-tests/material-demos/build.gradle
@@ -28,3 +28,7 @@
inceptionYear = "2019"
description = "This is a project for Material demos."
}
+
+android {
+ namespace "androidx.compose.material.demos"
+}
diff --git a/compose/material/material/integration-tests/material-demos/src/main/AndroidManifest.xml b/compose/material/material/integration-tests/material-demos/src/main/AndroidManifest.xml
index c841066..e65381b 100644
--- a/compose/material/material/integration-tests/material-demos/src/main/AndroidManifest.xml
+++ b/compose/material/material/integration-tests/material-demos/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.material.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle
index e679c01..4aefe60 100644
--- a/compose/material/material/samples/build.gradle
+++ b/compose/material/material/samples/build.gradle
@@ -47,3 +47,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the AndroidX Compose Material components."
}
+
+android {
+ namespace "androidx.compose.material.samples"
+}
diff --git a/compose/material/material/samples/src/main/AndroidManifest.xml b/compose/material/material/samples/src/main/AndroidManifest.xml
index 63efeb9..dc2f180 100644
--- a/compose/material/material/samples/src/main/AndroidManifest.xml
+++ b/compose/material/material/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.material.samples" />
+<manifest />
diff --git a/compose/material/material/src/androidAndroidTest/AndroidManifest.xml b/compose/material/material/src/androidAndroidTest/AndroidManifest.xml
index 93f5779..7535bfb 100644
--- a/compose/material/material/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/material/material/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.material" />
+<manifest />
diff --git a/compose/material/material/src/androidMain/AndroidManifest.xml b/compose/material/material/src/androidMain/AndroidManifest.xml
index 93f5779..7535bfb 100644
--- a/compose/material/material/src/androidMain/AndroidManifest.xml
+++ b/compose/material/material/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.material" />
+<manifest />
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index e19f071..1e71dee 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -140,4 +140,5 @@
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/material3/material3"
+ namespace "androidx.compose.material3"
}
diff --git a/compose/material3/material3/integration-tests/material3-catalog/build.gradle b/compose/material3/material3/integration-tests/material3-catalog/build.gradle
index 77f1d0b..331e30f 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/build.gradle
+++ b/compose/material3/material3/integration-tests/material3-catalog/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2021"
description = "This is a project for the Compose Material You Catalog."
}
+
+android {
+ namespace "androidx.compose.material3.catalog.library"
+}
diff --git a/compose/material3/material3/integration-tests/material3-catalog/src/main/AndroidManifest.xml b/compose/material3/material3/integration-tests/material3-catalog/src/main/AndroidManifest.xml
index 44b4ff8..ccc91d4 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/src/main/AndroidManifest.xml
+++ b/compose/material3/material3/integration-tests/material3-catalog/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.material3.catalog.library" />
+<manifest />
diff --git a/compose/material3/material3/integration-tests/material3-demos/build.gradle b/compose/material3/material3/integration-tests/material3-demos/build.gradle
index 1d38f2c..c2a235f 100644
--- a/compose/material3/material3/integration-tests/material3-demos/build.gradle
+++ b/compose/material3/material3/integration-tests/material3-demos/build.gradle
@@ -45,3 +45,7 @@
inceptionYear = "2022"
description = "Contains the demo code for the AndroidX Compose Material 3 components."
}
+
+android {
+ namespace "androidx.compose.material3.demos"
+}
diff --git a/compose/material3/material3/integration-tests/material3-demos/src/main/AndroidManifest.xml b/compose/material3/material3/integration-tests/material3-demos/src/main/AndroidManifest.xml
index a17d995..a7cd314 100644
--- a/compose/material3/material3/integration-tests/material3-demos/src/main/AndroidManifest.xml
+++ b/compose/material3/material3/integration-tests/material3-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.material3.demos" />
+<manifest />
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index 5ddcfd9..1f1f1ac 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -48,3 +48,7 @@
inceptionYear = "2021"
description = "Contains the sample code for the AndroidX Compose Material You components."
}
+
+android {
+ namespace "androidx.compose.material3.samples"
+}
diff --git a/compose/material3/material3/samples/src/main/AndroidManifest.xml b/compose/material3/material3/samples/src/main/AndroidManifest.xml
index ed44259..dc2f180 100644
--- a/compose/material3/material3/samples/src/main/AndroidManifest.xml
+++ b/compose/material3/material3/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.material3.samples" />
+<manifest />
diff --git a/compose/material3/material3/src/androidAndroidTest/AndroidManifest.xml b/compose/material3/material3/src/androidAndroidTest/AndroidManifest.xml
index 7c25504..e865f27 100644
--- a/compose/material3/material3/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/material3/material3/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.material3" />
+<manifest />
diff --git a/compose/material3/material3/src/androidMain/AndroidManifest.xml b/compose/material3/material3/src/androidMain/AndroidManifest.xml
index 61de4ac..037bd65 100644
--- a/compose/material3/material3/src/androidMain/AndroidManifest.xml
+++ b/compose/material3/material3/src/androidMain/AndroidManifest.xml
@@ -14,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.material3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/compose/material3/material3/src/androidTest/AndroidManifest.xml b/compose/material3/material3/src/androidTest/AndroidManifest.xml
index d27abc9..4d68dc2 100644
--- a/compose/material3/material3/src/androidTest/AndroidManifest.xml
+++ b/compose/material3/material3/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.material3.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index 2c7402d..58b919b 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -50,3 +50,7 @@
description = "Compose integration with LiveData"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.runtime.livedata"
+}
diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle
index 517166f..ab013ee 100644
--- a/compose/runtime/runtime-livedata/samples/build.gradle
+++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Livedata Interop System"
}
+
+android {
+ namespace "androidx.compose.runtime.livedata.samples"
+}
diff --git a/compose/runtime/runtime-livedata/samples/src/main/AndroidManifest.xml b/compose/runtime/runtime-livedata/samples/src/main/AndroidManifest.xml
index b96ca48..deac81d 100644
--- a/compose/runtime/runtime-livedata/samples/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-livedata/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.livedata.samples" />
+<manifest />
diff --git a/compose/runtime/runtime-livedata/src/androidTest/AndroidManifest.xml b/compose/runtime/runtime-livedata/src/androidTest/AndroidManifest.xml
index 0ac4959..9cd4123 100644
--- a/compose/runtime/runtime-livedata/src/androidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime-livedata/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.livedata" />
+<manifest />
diff --git a/compose/runtime/runtime-livedata/src/main/AndroidManifest.xml b/compose/runtime/runtime-livedata/src/main/AndroidManifest.xml
index 0ac4959..9cd4123 100644
--- a/compose/runtime/runtime-livedata/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-livedata/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.livedata" />
+<manifest />
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 0c229d2..7e86970 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -49,3 +49,7 @@
description = "Compose integration with RxJava 2"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.runtime.rxjava2"
+}
diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle
index d91ce71..1c84da2 100644
--- a/compose/runtime/runtime-rxjava2/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose RxJava 2 Integration System"
}
+
+android {
+ namespace "androidx.compose.runtime.rxjava2.samples"
+}
diff --git a/compose/runtime/runtime-rxjava2/samples/src/main/AndroidManifest.xml b/compose/runtime/runtime-rxjava2/samples/src/main/AndroidManifest.xml
index 0d9b80cd..deac81d 100644
--- a/compose/runtime/runtime-rxjava2/samples/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-rxjava2/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.rxjava2.samples" />
+<manifest />
diff --git a/compose/runtime/runtime-rxjava2/src/androidTest/AndroidManifest.xml b/compose/runtime/runtime-rxjava2/src/androidTest/AndroidManifest.xml
index dce0a7b..9cd4123 100644
--- a/compose/runtime/runtime-rxjava2/src/androidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime-rxjava2/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.rxjava2" />
+<manifest />
diff --git a/compose/runtime/runtime-rxjava2/src/main/AndroidManifest.xml b/compose/runtime/runtime-rxjava2/src/main/AndroidManifest.xml
index dce0a7b..9cd4123 100644
--- a/compose/runtime/runtime-rxjava2/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-rxjava2/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.rxjava2" />
+<manifest />
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle
index 55ec904..3922ff8 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -49,3 +49,7 @@
description = "Compose integration with RxJava 3"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.runtime.rxjava3"
+}
diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle
index a591854..76438f1 100644
--- a/compose/runtime/runtime-rxjava3/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2020"
description = "Contains the sample code for the Androidx Compose RxJava 3 Integration System"
}
+
+android {
+ namespace "androidx.compose.runtime.rxjava3.samples"
+}
diff --git a/compose/runtime/runtime-rxjava3/samples/src/main/AndroidManifest.xml b/compose/runtime/runtime-rxjava3/samples/src/main/AndroidManifest.xml
index 2956d09..deac81d 100644
--- a/compose/runtime/runtime-rxjava3/samples/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-rxjava3/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.rxjava3.samples" />
+<manifest />
diff --git a/compose/runtime/runtime-rxjava3/src/androidTest/AndroidManifest.xml b/compose/runtime/runtime-rxjava3/src/androidTest/AndroidManifest.xml
index abf82d0..9cd4123 100644
--- a/compose/runtime/runtime-rxjava3/src/androidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime-rxjava3/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.rxjava3" />
+<manifest />
diff --git a/compose/runtime/runtime-rxjava3/src/main/AndroidManifest.xml b/compose/runtime/runtime-rxjava3/src/main/AndroidManifest.xml
index abf82d0..9cd4123 100644
--- a/compose/runtime/runtime-rxjava3/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-rxjava3/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.rxjava3" />
+<manifest />
diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle
index a68c13b..426d65a 100644
--- a/compose/runtime/runtime-saveable/build.gradle
+++ b/compose/runtime/runtime-saveable/build.gradle
@@ -126,3 +126,7 @@
description = "Compose components that allow saving and restoring the local ui state"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.runtime.saveable"
+}
diff --git a/compose/runtime/runtime-saveable/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle
index 8b4aa56..d111a53 100644
--- a/compose/runtime/runtime-saveable/samples/build.gradle
+++ b/compose/runtime/runtime-saveable/samples/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose Saved Instance State System"
}
+
+android {
+ namespace "androidx.compose.runtime.saveable.samples"
+}
diff --git a/compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml b/compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml
index a96970a..deac81d 100644
--- a/compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.saveable.samples" />
+<manifest />
diff --git a/compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml b/compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml
index 82a937f..0d4d7c7 100644
--- a/compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.compose.runtime.saveable">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:requestLegacyExternalStorage="true"
android:debuggable="false"
diff --git a/compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml b/compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml
index 255b88b..9cd4123 100644
--- a/compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml
+++ b/compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.saveable" />
+<manifest />
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index 76e22e8..172ce12 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -111,6 +111,7 @@
defaultConfig {
consumerProguardFiles 'proguard-rules.pro'
}
+ namespace "androidx.compose.runtime"
}
androidx {
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
index 9e7d155b..97bddfc 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
+++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
@@ -28,6 +28,7 @@
lintOptions {
disable("SyntheticAccessor")
}
+ namespace "androidx.compose.runtime.benchmark"
}
dependencies {
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml b/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
index 7883dfb..cacb1d4 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.runtime.benchmark.test">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/src/main/AndroidManifest.xml b/compose/runtime/runtime/compose-runtime-benchmark/src/main/AndroidManifest.xml
index 1a38660..df93a1a 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime/compose-runtime-benchmark/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.benchmark"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/runtime/runtime/integration-tests/build.gradle b/compose/runtime/runtime/integration-tests/build.gradle
index be1a19f..b0c6e7d 100644
--- a/compose/runtime/runtime/integration-tests/build.gradle
+++ b/compose/runtime/runtime/integration-tests/build.gradle
@@ -49,6 +49,10 @@
}
}
+android {
+ namespace "androidx.compose.runtime.integrationtests"
+}
+
if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
androidXComposeMultiplatform {
android()
diff --git a/compose/runtime/runtime/integration-tests/src/androidAndroidTest/AndroidManifest.xml b/compose/runtime/runtime/integration-tests/src/androidAndroidTest/AndroidManifest.xml
index 26c9c95..ebd55412 100644
--- a/compose/runtime/runtime/integration-tests/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime/integration-tests/src/androidAndroidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.runtime.integrationtests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.compose.runtime.TestActivity"/>
diff --git a/compose/runtime/runtime/integration-tests/src/androidMain/AndroidManifest.xml b/compose/runtime/runtime/integration-tests/src/androidMain/AndroidManifest.xml
index 77d8f1e..9cd4123 100644
--- a/compose/runtime/runtime/integration-tests/src/androidMain/AndroidManifest.xml
+++ b/compose/runtime/runtime/integration-tests/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime.integrationtests"/>
+<manifest />
diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle
index a362008..16bddd4 100644
--- a/compose/runtime/runtime/samples/build.gradle
+++ b/compose/runtime/runtime/samples/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Compose runtime"
}
+
+android {
+ namespace "androidx.compose.runtime.samples"
+}
diff --git a/compose/runtime/runtime/samples/src/main/AndroidManifest.xml b/compose/runtime/runtime/samples/src/main/AndroidManifest.xml
index f0b7797..67aa632 100644
--- a/compose/runtime/runtime/samples/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime/samples/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<manifest package="androidx.compose.runtime.samples" />
+<manifest />
diff --git a/compose/runtime/runtime/src/androidAndroidTest/AndroidManifest.xml b/compose/runtime/runtime/src/androidAndroidTest/AndroidManifest.xml
index 5bf13bc..6612156 100644
--- a/compose/runtime/runtime/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime/src/androidAndroidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.runtime">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.compose.runtime.TestActivity"/>
diff --git a/compose/runtime/runtime/src/androidMain/AndroidManifest.xml b/compose/runtime/runtime/src/androidMain/AndroidManifest.xml
index ddf4182b..b47339d 100644
--- a/compose/runtime/runtime/src/androidMain/AndroidManifest.xml
+++ b/compose/runtime/runtime/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.runtime"/>
+<manifest />
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle
index ab72b1f..e2ee2cc 100644
--- a/compose/test-utils/build.gradle
+++ b/compose/test-utils/build.gradle
@@ -118,3 +118,7 @@
inceptionYear = "2020"
description = "Compose internal test utils."
}
+
+android {
+ namespace "androidx.compose.testutils"
+}
diff --git a/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml b/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml
index 9b4eef6..512ddee 100644
--- a/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.testutils"/>
\ 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/compose/test-utils/src/androidMain/AndroidManifest.xml b/compose/test-utils/src/androidMain/AndroidManifest.xml
index 33068f3..fdb3520 100644
--- a/compose/test-utils/src/androidMain/AndroidManifest.xml
+++ b/compose/test-utils/src/androidMain/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.testutils">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.activity.ComponentActivity"
diff --git a/compose/ui/ui-android-stubs/build.gradle b/compose/ui/ui-android-stubs/build.gradle
index f73d8f6..ed0f8cd 100644
--- a/compose/ui/ui-android-stubs/build.gradle
+++ b/compose/ui/ui-android-stubs/build.gradle
@@ -32,3 +32,7 @@
inceptionYear = "2020"
description = "Stubs for classes in older Android APIs"
}
+
+android {
+ namespace "androidx.compose.ui.androidstubs"
+}
diff --git a/compose/ui/ui-android-stubs/src/main/AndroidManifest.xml b/compose/ui/ui-android-stubs/src/main/AndroidManifest.xml
index 0abab77..ee19b21 100644
--- a/compose/ui/ui-android-stubs/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-android-stubs/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.androidstubs"/>
+<manifest />
diff --git a/compose/ui/ui-geometry/build.gradle b/compose/ui/ui-geometry/build.gradle
index 56003a0..86705d2 100644
--- a/compose/ui/ui-geometry/build.gradle
+++ b/compose/ui/ui-geometry/build.gradle
@@ -85,6 +85,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.compose.ui.geometry"
+}
+
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
diff --git a/compose/ui/ui-geometry/src/androidMain/AndroidManifest.xml b/compose/ui/ui-geometry/src/androidMain/AndroidManifest.xml
index 7cba91e..ee19b21 100644
--- a/compose/ui/ui-geometry/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-geometry/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.geometry" />
+<manifest />
diff --git a/compose/ui/ui-graphics/benchmark/build.gradle b/compose/ui/ui-graphics/benchmark/build.gradle
index 90bdbca..663dea2 100644
--- a/compose/ui/ui-graphics/benchmark/build.gradle
+++ b/compose/ui/ui-graphics/benchmark/build.gradle
@@ -34,3 +34,7 @@
androidTestImplementation project(":benchmark:benchmark-junit4")
androidTestImplementation(libs.testRules)
}
+
+android {
+ namespace "androidx.compose.ui.graphics.benchmark"
+}
diff --git a/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml b/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml
index 33d38e6..56a1d89 100644
--- a/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.graphics.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/ui/ui-graphics/benchmark/src/main/AndroidManifest.xml b/compose/ui/ui-graphics/benchmark/src/main/AndroidManifest.xml
index c628c53..32ad9c9 100644
--- a/compose/ui/ui-graphics/benchmark/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.graphics.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/ui/ui-graphics/benchmark/test/build.gradle b/compose/ui/ui-graphics/benchmark/test/build.gradle
index 1b2c21da..f0c4f1c 100644
--- a/compose/ui/ui-graphics/benchmark/test/build.gradle
+++ b/compose/ui/ui-graphics/benchmark/test/build.gradle
@@ -34,3 +34,7 @@
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.truth)
}
+
+android {
+ namespace "androidx.compose.ui.graphics.benchmark.test"
+}
diff --git a/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml b/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml
index 784abb9..e865f27 100644
--- a/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.ui.graphics.benchmark.test"/>
+<manifest />
diff --git a/compose/ui/ui-graphics/benchmark/test/src/main/AndroidManifest.xml b/compose/ui/ui-graphics/benchmark/test/src/main/AndroidManifest.xml
index a4a839c..32ad9c9 100644
--- a/compose/ui/ui-graphics/benchmark/test/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/benchmark/test/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.graphics.benchmark.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 48994c5..c01d1da 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -154,6 +154,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.compose.ui.graphics"
+}
+
if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
tasks.findByName("desktopTest").configure {
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden"
diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle
index bd6b56c..94d945b 100644
--- a/compose/ui/ui-graphics/samples/build.gradle
+++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Graphics Components"
}
+
+android {
+ namespace "androidx.compose.ui.graphics.samples"
+}
diff --git a/compose/ui/ui-graphics/samples/src/main/AndroidManifest.xml b/compose/ui/ui-graphics/samples/src/main/AndroidManifest.xml
index 43e9804..deac81d 100644
--- a/compose/ui/ui-graphics/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.ui.graphics.samples" />
+<manifest />
diff --git a/compose/ui/ui-graphics/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui-graphics/src/androidAndroidTest/AndroidManifest.xml
index 1d017c3..a929c54 100644
--- a/compose/ui/ui-graphics/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/src/androidAndroidTest/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.graphics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.compose.ui.graphics.TestActivity"
diff --git a/compose/ui/ui-graphics/src/androidMain/AndroidManifest.xml b/compose/ui/ui-graphics/src/androidMain/AndroidManifest.xml
index 3e5e117..ee19b21 100644
--- a/compose/ui/ui-graphics/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.graphics" />
+<manifest />
diff --git a/compose/ui/ui-inspection/build.gradle b/compose/ui/ui-inspection/build.gradle
index 629b8ea..48fd9d7 100644
--- a/compose/ui/ui-inspection/build.gradle
+++ b/compose/ui/ui-inspection/build.gradle
@@ -90,6 +90,7 @@
// Restriction not important for inspectors, which only runs at dev-time
disable("SyntheticAccessor")
}
+ namespace "androidx.compose.ui.inspection"
}
tasks.withType(KotlinCompile).configureEach {
diff --git a/compose/ui/ui-inspection/src/androidTest/AndroidManifest.xml b/compose/ui/ui-inspection/src/androidTest/AndroidManifest.xml
index a4f86b5..63c0b01c 100644
--- a/compose/ui/ui-inspection/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-inspection/src/androidTest/AndroidManifest.xml
@@ -12,8 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.inspection.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.compose.ui.inspection.testdata.AndroidViewTestActivity" />
diff --git a/compose/ui/ui-inspection/src/main/AndroidManifest.xml b/compose/ui/ui-inspection/src/main/AndroidManifest.xml
index 5f27d96..f3ba9c7 100644
--- a/compose/ui/ui-inspection/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-inspection/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.inspection" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/ui/ui-test-font/build.gradle b/compose/ui/ui-test-font/build.gradle
index 08e0dcb..219ea9c 100644
--- a/compose/ui/ui-test-font/build.gradle
+++ b/compose/ui/ui-test-font/build.gradle
@@ -53,3 +53,7 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.ui.text.font.test"
+}
diff --git a/compose/ui/ui-test-font/src/androidMain/AndroidManifest.xml b/compose/ui/ui-test-font/src/androidMain/AndroidManifest.xml
index 29db706..ee19b21 100644
--- a/compose/ui/ui-test-font/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-test-font/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.text.font.test"/>
+<manifest />
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index f0ee239..4c1fe66 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -29,6 +29,7 @@
lintOptions {
disable("InvalidPackage")
}
+ namespace "androidx.compose.ui.test.junit4"
}
dependencies {
diff --git a/compose/ui/ui-test-junit4/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui-test-junit4/src/androidAndroidTest/AndroidManifest.xml
index b5891be..2cc9c44 100644
--- a/compose/ui/ui-test-junit4/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui-test-junit4/src/androidAndroidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.test.junit4.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.compose.ui.test.junit4.CustomActivity"
android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
diff --git a/compose/ui/ui-test-junit4/src/androidMain/AndroidManifest.xml b/compose/ui/ui-test-junit4/src/androidMain/AndroidManifest.xml
index deb7139..dd3d3a3 100644
--- a/compose/ui/ui-test-junit4/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-test-junit4/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.test.junit4" />
+<manifest />
diff --git a/compose/ui/ui-test-manifest/build.gradle b/compose/ui/ui-test-manifest/build.gradle
index 6e55f9e..7f8bafa 100644
--- a/compose/ui/ui-test-manifest/build.gradle
+++ b/compose/ui/ui-test-manifest/build.gradle
@@ -33,3 +33,7 @@
inceptionYear = "2021"
description = "Compose testing library that should be added as a debugImplementation dependency to add properties to the debug manifest necessary for testing an application"
}
+
+android {
+ namespace "androidx.compose.ui.test.manifest"
+}
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
index 0da3410..d052e50 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
@@ -36,4 +36,5 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "androidx.compose.ui.test.manifest.integration.testapp"
}
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/src/main/AndroidManifest.xml b/compose/ui/ui-test-manifest/integration-tests/testapp/src/main/AndroidManifest.xml
index 8f6a9da..28d5d66 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.test.manifest.integration.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:label="ui-test-manifest test app" />
diff --git a/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml b/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml
index c694ed4..d96a063 100644
--- a/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-test-manifest/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.test.manifest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.activity.ComponentActivity" android:exported="true" />
</application>
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
index faab7dc..22fc954 100644
--- a/compose/ui/ui-test/build.gradle
+++ b/compose/ui/ui-test/build.gradle
@@ -36,6 +36,7 @@
lintOptions {
disable("InvalidPackage")
}
+ namespace "androidx.compose.ui.test"
}
dependencies {
diff --git a/compose/ui/ui-test/samples/build.gradle b/compose/ui/ui-test/samples/build.gradle
index 7904092..2dc4b822 100644
--- a/compose/ui/ui-test/samples/build.gradle
+++ b/compose/ui/ui-test/samples/build.gradle
@@ -46,3 +46,7 @@
inceptionYear = "2022"
description = "Contains samples for AndroidX Compose Testing."
}
+
+android {
+ namespace "androidx.compose.ui.test.samples"
+}
diff --git a/compose/ui/ui-test/samples/src/main/AndroidManifest.xml b/compose/ui/ui-test/samples/src/main/AndroidManifest.xml
index 9d1d69f..a7cd314 100644
--- a/compose/ui/ui-test/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-test/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License
-->
-<manifest package="androidx.compose.ui.test.samples" />
+<manifest />
diff --git a/compose/ui/ui-test/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui-test/src/androidAndroidTest/AndroidManifest.xml
index 40c2ea8..63f7324 100644
--- a/compose/ui/ui-test/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui-test/src/androidAndroidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.compose.ui.test.ActivityWithActionBar" />
<activity android:name="androidx.compose.ui.test.ClickCounterActivity" />
diff --git a/compose/ui/ui-test/src/androidMain/AndroidManifest.xml b/compose/ui/ui-test/src/androidMain/AndroidManifest.xml
index 0d3bc8e..dd3d3a3 100644
--- a/compose/ui/ui-test/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-test/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.test" />
+<manifest />
diff --git a/compose/ui/ui-text-google-fonts/build.gradle b/compose/ui/ui-text-google-fonts/build.gradle
index a70217c..a24251a 100644
--- a/compose/ui/ui-text-google-fonts/build.gradle
+++ b/compose/ui/ui-text-google-fonts/build.gradle
@@ -48,3 +48,7 @@
inceptionYear = "2022"
description = "Compose Downloadable Fonts integration for Google Fonts"
}
+
+android {
+ namespace "androidx.compose.ui.text.googlefonts"
+}
diff --git a/compose/ui/ui-text-google-fonts/src/androidTest/AndroidManifest.xml b/compose/ui/ui-text-google-fonts/src/androidTest/AndroidManifest.xml
index f8bb6461..e865f27 100644
--- a/compose/ui/ui-text-google-fonts/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-text-google-fonts/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.compose.ui.text.googlefonts" />
+<manifest />
diff --git a/compose/ui/ui-text-google-fonts/src/main/AndroidManifest.xml b/compose/ui/ui-text-google-fonts/src/main/AndroidManifest.xml
index 5597ebf..6a69672 100644
--- a/compose/ui/ui-text-google-fonts/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-text-google-fonts/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.ui.text.googlefonts" />
+<manifest />
diff --git a/compose/ui/ui-text/benchmark/build.gradle b/compose/ui/ui-text/benchmark/build.gradle
index 3de164b..14b4844 100644
--- a/compose/ui/ui-text/benchmark/build.gradle
+++ b/compose/ui/ui-text/benchmark/build.gradle
@@ -38,3 +38,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.truth)
}
+
+android {
+ namespace "androidx.compose.ui.text.benchmark"
+}
diff --git a/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml b/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml
index e342247..56a1d89 100644
--- a/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.text.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/ui/ui-text/benchmark/src/main/AndroidManifest.xml b/compose/ui/ui-text/benchmark/src/main/AndroidManifest.xml
index 7cbea72..32ad9c9 100644
--- a/compose/ui/ui-text/benchmark/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-text/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.text.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index 518deeb..67353d8 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -179,6 +179,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.compose.ui.text"
+}
+
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle
index 30a69f4..4e45de8 100644
--- a/compose/ui/ui-text/samples/build.gradle
+++ b/compose/ui/ui-text/samples/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2019"
description = "Contains sample code for the Androidx Compose UI Text Core APIs and Utilities"
}
+
+android {
+ namespace "androidx.compose.ui.text.samples"
+}
diff --git a/compose/ui/ui-text/samples/src/main/AndroidManifest.xml b/compose/ui/ui-text/samples/src/main/AndroidManifest.xml
index 88c8279..6a69672 100644
--- a/compose/ui/ui-text/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-text/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.ui.text.samples" />
+<manifest />
diff --git a/compose/ui/ui-text/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui-text/src/androidAndroidTest/AndroidManifest.xml
index 39e91c6..61b6811 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui-text/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.text" />
+<manifest />
diff --git a/compose/ui/ui-text/src/androidMain/AndroidManifest.xml b/compose/ui/ui-text/src/androidMain/AndroidManifest.xml
index 39e91c6..61b6811 100644
--- a/compose/ui/ui-text/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-text/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.text" />
+<manifest />
diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle
index dd6b897..8ff87e1 100644
--- a/compose/ui/ui-tooling-data/build.gradle
+++ b/compose/ui/ui-tooling-data/build.gradle
@@ -56,3 +56,7 @@
" for different tooling purposes."
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.ui.tooling.data"
+}
diff --git a/compose/ui/ui-tooling-data/src/androidTest/AndroidManifest.xml b/compose/ui/ui-tooling-data/src/androidTest/AndroidManifest.xml
index dbe9365..d7022d2d 100644
--- a/compose/ui/ui-tooling-data/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-tooling-data/src/androidTest/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.tooling.data.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.compose.ui.tooling.data.TestActivity" android:exported="true"/>
</application>
diff --git a/compose/ui/ui-tooling-data/src/main/AndroidManifest.xml b/compose/ui/ui-tooling-data/src/main/AndroidManifest.xml
index 95bc4c1..0648ec7 100644
--- a/compose/ui/ui-tooling-data/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-tooling-data/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.tooling.data" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/compose/ui/ui-tooling-preview/build.gradle b/compose/ui/ui-tooling-preview/build.gradle
index 058ad78..f0c5f69 100644
--- a/compose/ui/ui-tooling-preview/build.gradle
+++ b/compose/ui/ui-tooling-preview/build.gradle
@@ -74,3 +74,7 @@
" @Preview composables in user apps."
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.ui.tooling.preview"
+}
diff --git a/compose/ui/ui-tooling-preview/src/androidMain/AndroidManifest.xml b/compose/ui/ui-tooling-preview/src/androidMain/AndroidManifest.xml
index 347442f..d6cee8f 100644
--- a/compose/ui/ui-tooling-preview/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-tooling-preview/src/androidMain/AndroidManifest.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.tooling.preview">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index af0065e..8a3b8bb 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -133,3 +133,7 @@
description = "Compose tooling library. This library exposes information to our tools for better IDE support."
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.ui.tooling"
+}
diff --git a/compose/ui/ui-tooling/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui-tooling/src/androidAndroidTest/AndroidManifest.xml
index 7216778..be0df5e 100644
--- a/compose/ui/ui-tooling/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui-tooling/src/androidAndroidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.compose.ui.tooling">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:debuggable="true"
tools:ignore="HardcodedDebugMode"
diff --git a/compose/ui/ui-tooling/src/androidMain/AndroidManifest.xml b/compose/ui/ui-tooling/src/androidMain/AndroidManifest.xml
index aef36de..081b86a 100644
--- a/compose/ui/ui-tooling/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-tooling/src/androidMain/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.tooling">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle
index bc85d2c..bdcb149 100644
--- a/compose/ui/ui-unit/build.gradle
+++ b/compose/ui/ui-unit/build.gradle
@@ -114,6 +114,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.compose.ui.unit"
+}
+
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle
index f403312..8bb04d5 100644
--- a/compose/ui/ui-unit/samples/build.gradle
+++ b/compose/ui/ui-unit/samples/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Simple Unit Classes"
}
+
+android {
+ namespace "androidx.compose.ui.unit.samples"
+}
diff --git a/compose/ui/ui-unit/samples/src/main/AndroidManifest.xml b/compose/ui/ui-unit/samples/src/main/AndroidManifest.xml
index 5b694ab65..deac81d 100644
--- a/compose/ui/ui-unit/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-unit/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.ui.unit.samples" />
+<manifest />
diff --git a/compose/ui/ui-unit/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui-unit/src/androidAndroidTest/AndroidManifest.xml
index 9cd6820..072d7ab 100644
--- a/compose/ui/ui-unit/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui-unit/src/androidAndroidTest/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.unit">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.compose.ui.unit.DpDeviceTest$Companion$TestActivity"
android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen"/>
diff --git a/compose/ui/ui-unit/src/androidMain/AndroidManifest.xml b/compose/ui/ui-unit/src/androidMain/AndroidManifest.xml
index 5dece17..ee19b21 100644
--- a/compose/ui/ui-unit/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-unit/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.unit" />
+<manifest />
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle
index a9cf13c..374215c 100644
--- a/compose/ui/ui-util/build.gradle
+++ b/compose/ui/ui-util/build.gradle
@@ -89,6 +89,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.compose.ui.util"
+}
+
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += ["-XXLanguage:+InlineClasses"]
diff --git a/compose/ui/ui-util/src/androidMain/AndroidManifest.xml b/compose/ui/ui-util/src/androidMain/AndroidManifest.xml
index a62c9f5..b47339d 100644
--- a/compose/ui/ui-util/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui-util/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.util" />
+<manifest />
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index f18aca2..ebf274f 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -51,3 +51,7 @@
description = "Compose integration with ViewBinding"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.ui.viewbinding"
+}
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index e3df57b..64a65d0 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -55,4 +55,5 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.compose.ui.viewbinding.samples"
}
diff --git a/compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml b/compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml
index d6b8107..cc8347b 100644
--- a/compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-viewbinding/samples/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.viewbinding.samples">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.compose.ui.samples.InflatedFragmentActivity"/>
<activity android:name="androidx.compose.ui.samples.ChildInflatedFragmentActivity"/>
diff --git a/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml b/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml
index f27fc71..deac81d 100644
--- a/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-viewbinding/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.ui.viewbinding.samples" />
+<manifest />
diff --git a/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml b/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml
index 4cfbcc0..9cd4123 100644
--- a/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml
+++ b/compose/ui/ui-viewbinding/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui.viewbinding" />
+<manifest />
diff --git a/compose/ui/ui/benchmark/build.gradle b/compose/ui/ui/benchmark/build.gradle
index da52648..08d303f 100644
--- a/compose/ui/ui/benchmark/build.gradle
+++ b/compose/ui/ui/benchmark/build.gradle
@@ -38,3 +38,7 @@
androidTestImplementation(libs.kotlinTestCommon)
androidTestImplementation(libs.truth)
}
+
+android {
+ namespace "androidx.compose.ui.benchmark"
+}
diff --git a/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml b/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml
index d7acb11..03ce0b9 100644
--- a/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
diff --git a/compose/ui/ui/benchmark/src/main/AndroidManifest.xml b/compose/ui/ui/benchmark/src/main/AndroidManifest.xml
index d1cfaab..32ad9c9 100644
--- a/compose/ui/ui/benchmark/src/main/AndroidManifest.xml
+++ b/compose/ui/ui/benchmark/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 48c3b29..5baebfd 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -269,6 +269,7 @@
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/ui/ui"
+ namespace "androidx.compose.ui"
}
// Diagnostics for b/188565660
diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle
index c77bc3a6..b511edb 100644
--- a/compose/ui/ui/integration-tests/ui-demos/build.gradle
+++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle
@@ -32,4 +32,5 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.compose.ui.demos"
}
diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/AndroidManifest.xml b/compose/ui/ui/integration-tests/ui-demos/src/main/AndroidManifest.xml
index 0d309a8..6ba4d4a 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/AndroidManifest.xml
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".viewinterop.ComposeNothingInAndroidTap"
diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle
index de16c5f..9d9f573 100644
--- a/compose/ui/ui/samples/build.gradle
+++ b/compose/ui/ui/samples/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2019"
description = "Contains the sample code for the Androidx Compose UI Core Classes"
}
+
+android {
+ namespace "androidx.compose.ui.samples"
+}
diff --git a/compose/ui/ui/samples/src/main/AndroidManifest.xml b/compose/ui/ui/samples/src/main/AndroidManifest.xml
index 85dbf4a..6a69672 100644
--- a/compose/ui/ui/samples/src/main/AndroidManifest.xml
+++ b/compose/ui/ui/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.compose.ui.samples" />
+<manifest />
diff --git a/compose/ui/ui/src/androidAndroidTest/AndroidManifest.xml b/compose/ui/ui/src/androidAndroidTest/AndroidManifest.xml
index d62742c..fb3637b 100644
--- a/compose/ui/ui/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/ui/ui/src/androidAndroidTest/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true"
>
diff --git a/compose/ui/ui/src/androidMain/AndroidManifest.xml b/compose/ui/ui/src/androidMain/AndroidManifest.xml
index e9788a7..b47339d 100644
--- a/compose/ui/ui/src/androidMain/AndroidManifest.xml
+++ b/compose/ui/ui/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.ui" />
+<manifest />
