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/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 />
