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/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle
index 50e59c2..b89c2b2 100644
--- a/activity/activity-compose/build.gradle
+++ b/activity/activity-compose/build.gradle
@@ -62,3 +62,7 @@
description = "Compose integration with Activity"
runApiTasks = new RunApiTasks.Yes()
}
+
+android {
+ namespace "androidx.activity.compose"
+}
diff --git a/activity/activity-compose/integration-tests/activity-demos/build.gradle b/activity/activity-compose/integration-tests/activity-demos/build.gradle
index ccec086..c731d6b 100644
--- a/activity/activity-compose/integration-tests/activity-demos/build.gradle
+++ b/activity/activity-compose/integration-tests/activity-demos/build.gradle
@@ -36,3 +36,7 @@
inceptionYear = "2020"
description = "This is a project for Activity demos."
}
+
+android {
+ namespace "androidx.activity.compose.demos"
+}
diff --git a/activity/activity-compose/integration-tests/activity-demos/src/main/AndroidManifest.xml b/activity/activity-compose/integration-tests/activity-demos/src/main/AndroidManifest.xml
index eb518a2..deac81d 100644
--- a/activity/activity-compose/integration-tests/activity-demos/src/main/AndroidManifest.xml
+++ b/activity/activity-compose/integration-tests/activity-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.activity.compose.demos" />
+<manifest />
diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle
index 612a5cc..5103f66 100644
--- a/activity/activity-compose/samples/build.gradle
+++ b/activity/activity-compose/samples/build.gradle
@@ -47,3 +47,7 @@
inceptionYear = "2020"
description = "Samples for Compose integration with Activity"
}
+
+android {
+ namespace "androidx.activity.compose.samples"
+}
diff --git a/activity/activity-compose/samples/src/main/AndroidManifest.xml b/activity/activity-compose/samples/src/main/AndroidManifest.xml
index e2cd3e9..deac81d 100644
--- a/activity/activity-compose/samples/src/main/AndroidManifest.xml
+++ b/activity/activity-compose/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.activity.compose.samples" />
+<manifest />
diff --git a/activity/activity-compose/src/androidTest/AndroidManifest.xml b/activity/activity-compose/src/androidTest/AndroidManifest.xml
index 7e7c436..9cd4123 100644
--- a/activity/activity-compose/src/androidTest/AndroidManifest.xml
+++ b/activity/activity-compose/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.activity.compose" />
+<manifest />
diff --git a/activity/activity-compose/src/main/AndroidManifest.xml b/activity/activity-compose/src/main/AndroidManifest.xml
index 7e7c436..9cd4123 100644
--- a/activity/activity-compose/src/main/AndroidManifest.xml
+++ b/activity/activity-compose/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.activity.compose" />
+<manifest />
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index 32ef139..1bcc284 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -57,6 +57,10 @@
description = "Kotlin extensions for 'activity' artifact"
}
+android {
+ namespace "androidx.activity.ktx"
+}
+
// needed only while https://youtrack.jetbrains.com/issue/KT-47000 isn't resolved which is
// targeted to 1.6
tasks.withType(KotlinCompile).configureEach {
diff --git a/activity/activity-ktx/src/androidTest/AndroidManifest.xml b/activity/activity-ktx/src/androidTest/AndroidManifest.xml
index 1bee49c..98ff42d 100644
--- a/activity/activity-ktx/src/androidTest/AndroidManifest.xml
+++ b/activity/activity-ktx/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.activity.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.activity.ActivityViewModelLazyTest$TestActivity"
diff --git a/activity/activity-ktx/src/main/AndroidManifest.xml b/activity/activity-ktx/src/main/AndroidManifest.xml
index 82083dd..dd3d3a3 100644
--- a/activity/activity-ktx/src/main/AndroidManifest.xml
+++ b/activity/activity-ktx/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.activity.ktx"/>
+<manifest />
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index a82a812..1ce6c58 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -11,6 +11,7 @@
multiDexEnabled true
testInstrumentationRunnerArgument "listener", "leakcanary.FailTestOnLeakRunListener"
}
+ namespace "androidx.activity"
}
dependencies {
diff --git a/activity/activity/src/androidTest/AndroidManifest.xml b/activity/activity/src/androidTest/AndroidManifest.xml
index d7e4d08..9ab3727 100644
--- a/activity/activity/src/androidTest/AndroidManifest.xml
+++ b/activity/activity/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.activity.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:name="androidx.activity.LeakCanaryApp">
<activity
diff --git a/activity/activity/src/main/AndroidManifest.xml b/activity/activity/src/main/AndroidManifest.xml
index 7086b5c..36c2546 100644
--- a/activity/activity/src/main/AndroidManifest.xml
+++ b/activity/activity/src/main/AndroidManifest.xml
@@ -13,5 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.activity">
+<manifest>
</manifest>
diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index 780dd7f..733b7e4 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle
@@ -26,6 +26,7 @@
applicationId "androidx.activity.integration.testapp"
}
+ namespace "androidx.activity.integration.testapp"
}
dependencies {
diff --git a/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml b/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml
index 79d9365..4f028b7 100644
--- a/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml
+++ b/activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml
@@ -14,5 +14,5 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.activity.integration.testapp.test">
+<manifest>
</manifest>
diff --git a/activity/integration-tests/testapp/src/main/AndroidManifest.xml b/activity/integration-tests/testapp/src/main/AndroidManifest.xml
index 118cd0e..8a6e622 100644
--- a/activity/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/activity/integration-tests/testapp/src/main/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.activity.integration.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">
<activity
diff --git a/ads/ads-identifier-benchmark/build.gradle b/ads/ads-identifier-benchmark/build.gradle
index 7a6988b..e07b659 100644
--- a/ads/ads-identifier-benchmark/build.gradle
+++ b/ads/ads-identifier-benchmark/build.gradle
@@ -35,3 +35,7 @@
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
}
+
+android {
+ namespace "androidx.ads.identifier.benchmark"
+}
diff --git a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
index 066d67e..fc0c987 100644
--- a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
+++ b/ads/ads-identifier-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.ads.identifier.benchmark.test">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.ads.identifier.benchmark.AdsIdentifierBenchmarkApplication">
<!-- enable profiling by shell for non-intrusive profiling tools -->
diff --git a/ads/ads-identifier-benchmark/src/main/AndroidManifest.xml b/ads/ads-identifier-benchmark/src/main/AndroidManifest.xml
index c0d1940..cc0959e 100644
--- a/ads/ads-identifier-benchmark/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier-benchmark/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.ads.identifier.benchmark" />
+<manifest />
diff --git a/ads/ads-identifier-common/build.gradle b/ads/ads-identifier-common/build.gradle
index d7d8dd0..3dc9ae3 100644
--- a/ads/ads-identifier-common/build.gradle
+++ b/ads/ads-identifier-common/build.gradle
@@ -37,6 +37,7 @@
aidl = true
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.ads.identifier.common"
}
androidx {
diff --git a/ads/ads-identifier-common/src/main/AndroidManifest.xml b/ads/ads-identifier-common/src/main/AndroidManifest.xml
index 0d3cb05..d2c9474 100644
--- a/ads/ads-identifier-common/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier-common/src/main/AndroidManifest.xml
@@ -13,6 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.ads.identifier.common"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/ads/ads-identifier-provider/build.gradle b/ads/ads-identifier-provider/build.gradle
index d4fa1ad..97fa0b6 100644
--- a/ads/ads-identifier-provider/build.gradle
+++ b/ads/ads-identifier-provider/build.gradle
@@ -47,3 +47,7 @@
inceptionYear = "2019"
description = "AndroidX Ads Identifier Provider"
}
+
+android {
+ namespace "androidx.ads.identifier.provider"
+}
diff --git a/ads/ads-identifier-provider/integration-tests/testapp/build.gradle b/ads/ads-identifier-provider/integration-tests/testapp/build.gradle
index 892d230..a03737b 100644
--- a/ads/ads-identifier-provider/integration-tests/testapp/build.gradle
+++ b/ads/ads-identifier-provider/integration-tests/testapp/build.gradle
@@ -23,6 +23,7 @@
applicationId "androidx.ads.identifier.provider.testapp"
minSdkVersion 14
}
+ namespace "androidx.ads.identifier.provider.testapp"
}
dependencies {
diff --git a/ads/ads-identifier-provider/integration-tests/testapp/src/main/AndroidManifest.xml b/ads/ads-identifier-provider/integration-tests/testapp/src/main/AndroidManifest.xml
index a4a7d73..ac86787 100644
--- a/ads/ads-identifier-provider/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier-provider/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.ads.identifier.provider.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:name=".AdsIdentifierProviderApplication"
diff --git a/ads/ads-identifier-provider/src/androidTest/AndroidManifest.xml b/ads/ads-identifier-provider/src/androidTest/AndroidManifest.xml
index 237644a..7c37821 100644
--- a/ads/ads-identifier-provider/src/androidTest/AndroidManifest.xml
+++ b/ads/ads-identifier-provider/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.ads.identifier.provider.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/ads/ads-identifier-provider/src/main/AndroidManifest.xml b/ads/ads-identifier-provider/src/main/AndroidManifest.xml
index 3a7221b4..da35f1a 100644
--- a/ads/ads-identifier-provider/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier-provider/src/main/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.ads.identifier.provider">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/ads/ads-identifier-testing/build.gradle b/ads/ads-identifier-testing/build.gradle
index e7d05c0..efffcf2 100644
--- a/ads/ads-identifier-testing/build.gradle
+++ b/ads/ads-identifier-testing/build.gradle
@@ -31,6 +31,7 @@
lintOptions {
disable "InvalidPackage" // Lint is unhappy about mockito package
}
+ namespace "androidx.ads.identifier.testing"
}
androidx {
diff --git a/ads/ads-identifier-testing/src/main/AndroidManifest.xml b/ads/ads-identifier-testing/src/main/AndroidManifest.xml
index 6d62a4e..cc0959e 100644
--- a/ads/ads-identifier-testing/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier-testing/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.ads.identifier.testing" />
+<manifest />
diff --git a/ads/ads-identifier/build.gradle b/ads/ads-identifier/build.gradle
index c207684..1c6ec54 100644
--- a/ads/ads-identifier/build.gradle
+++ b/ads/ads-identifier/build.gradle
@@ -49,3 +49,7 @@
inceptionYear = "2019"
description = "AndroidX Ads Identifier"
}
+
+android {
+ namespace "androidx.ads.identifier"
+}
diff --git a/ads/ads-identifier/integration-tests/testapp/build.gradle b/ads/ads-identifier/integration-tests/testapp/build.gradle
index 0424562..6a99797 100644
--- a/ads/ads-identifier/integration-tests/testapp/build.gradle
+++ b/ads/ads-identifier/integration-tests/testapp/build.gradle
@@ -24,6 +24,7 @@
applicationId "androidx.ads.identifier.testapp"
minSdkVersion 14
}
+ namespace "androidx.ads.identifier.testapp"
}
dependencies {
diff --git a/ads/ads-identifier/integration-tests/testapp/src/main/AndroidManifest.xml b/ads/ads-identifier/integration-tests/testapp/src/main/AndroidManifest.xml
index d46213b..6e3275e 100644
--- a/ads/ads-identifier/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.ads.identifier.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="false"
diff --git a/ads/ads-identifier/src/androidTest/AndroidManifest.xml b/ads/ads-identifier/src/androidTest/AndroidManifest.xml
index b4a88ac..453fdfb 100644
--- a/ads/ads-identifier/src/androidTest/AndroidManifest.xml
+++ b/ads/ads-identifier/src/androidTest/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.ads.identifier.test">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/ads/ads-identifier/src/main/AndroidManifest.xml b/ads/ads-identifier/src/main/AndroidManifest.xml
index fad58df..0d0975d 100644
--- a/ads/ads-identifier/src/main/AndroidManifest.xml
+++ b/ads/ads-identifier/src/main/AndroidManifest.xml
@@ -13,6 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.ads.identifier"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/annotation/annotation-experimental/build.gradle b/annotation/annotation-experimental/build.gradle
index 8ad0847..c1179d8 100644
--- a/annotation/annotation-experimental/build.gradle
+++ b/annotation/annotation-experimental/build.gradle
@@ -37,3 +37,7 @@
"conjunction with the Experimental annotation lint checks, this annotation provides " +
"functional parity with Kotlin's Experimental annotation."
}
+
+android {
+ namespace "androidx.annotation.experimental"
+}
diff --git a/annotation/annotation-experimental/src/main/AndroidManifest.xml b/annotation/annotation-experimental/src/main/AndroidManifest.xml
index 0294c29..b303288 100644
--- a/annotation/annotation-experimental/src/main/AndroidManifest.xml
+++ b/annotation/annotation-experimental/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.annotation.experimental" />
+<manifest />
diff --git a/appcompat/appcompat-benchmark/build.gradle b/appcompat/appcompat-benchmark/build.gradle
index 341c82a..511ed67 100644
--- a/appcompat/appcompat-benchmark/build.gradle
+++ b/appcompat/appcompat-benchmark/build.gradle
@@ -30,3 +30,7 @@
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.kotlinStdlib)
}
+
+android {
+ namespace "androidx.appcompat.benchmark"
+}
diff --git a/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml b/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
index 295021a..732b4fa 100644
--- a/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
+++ b/appcompat/appcompat-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.appcompat.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/appcompat/appcompat-benchmark/src/main/AndroidManifest.xml b/appcompat/appcompat-benchmark/src/main/AndroidManifest.xml
index 70f780e..b5f2d5b 100644
--- a/appcompat/appcompat-benchmark/src/main/AndroidManifest.xml
+++ b/appcompat/appcompat-benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appcompat.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle
index 91ae92f..e1eb29e 100644
--- a/appcompat/appcompat-resources/build.gradle
+++ b/appcompat/appcompat-resources/build.gradle
@@ -51,6 +51,7 @@
additionalParameters "--no-version-vectors"
noCompress "ttf"
}
+ namespace "androidx.appcompat.resources"
}
androidx {
diff --git a/appcompat/appcompat-resources/src/androidTest/AndroidManifest.xml b/appcompat/appcompat-resources/src/androidTest/AndroidManifest.xml
index 17fa06f..3454972 100644
--- a/appcompat/appcompat-resources/src/androidTest/AndroidManifest.xml
+++ b/appcompat/appcompat-resources/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.appcompat.resources.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:theme="@android:style/Theme">
diff --git a/appcompat/appcompat-resources/src/main/AndroidManifest.xml b/appcompat/appcompat-resources/src/main/AndroidManifest.xml
index a9d8443..2766785 100644
--- a/appcompat/appcompat-resources/src/main/AndroidManifest.xml
+++ b/appcompat/appcompat-resources/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.appcompat.resources"/>
+<manifest />
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle
index 2bd155e..ca45019 100644
--- a/appcompat/appcompat/build.gradle
+++ b/appcompat/appcompat/build.gradle
@@ -85,6 +85,7 @@
useLibrary "android.test.runner"
useLibrary "android.test.base"
useLibrary "android.test.mock"
+ namespace "androidx.appcompat"
}
androidx {
diff --git a/appcompat/appcompat/src/androidTest/AndroidManifest.xml b/appcompat/appcompat/src/androidTest/AndroidManifest.xml
index 5c3a07c..e0e8ec3 100644
--- a/appcompat/appcompat/src/androidTest/AndroidManifest.xml
+++ b/appcompat/appcompat/src/androidTest/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.appcompat.test">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk
android:minSdkVersion="14"
diff --git a/appcompat/appcompat/src/main/AndroidManifest.xml b/appcompat/appcompat/src/main/AndroidManifest.xml
index 203901b..2766785 100644
--- a/appcompat/appcompat/src/main/AndroidManifest.xml
+++ b/appcompat/appcompat/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.appcompat"/>
+<manifest />
diff --git a/appcompat/integration-tests/receive-content-testapp/build.gradle b/appcompat/integration-tests/receive-content-testapp/build.gradle
index 0bb03a7..7bfc63a 100644
--- a/appcompat/integration-tests/receive-content-testapp/build.gradle
+++ b/appcompat/integration-tests/receive-content-testapp/build.gradle
@@ -23,6 +23,7 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "androidx.appcompat.demo.receivecontent"
}
dependencies {
diff --git a/appcompat/integration-tests/receive-content-testapp/src/main/AndroidManifest.xml b/appcompat/integration-tests/receive-content-testapp/src/main/AndroidManifest.xml
index fba2308..7030480 100644
--- a/appcompat/integration-tests/receive-content-testapp/src/main/AndroidManifest.xml
+++ b/appcompat/integration-tests/receive-content-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.appcompat.demo.receivecontent">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/appsearch/appsearch-builtin-types/build.gradle b/appsearch/appsearch-builtin-types/build.gradle
index ebd69e3..c079357 100644
--- a/appsearch/appsearch-builtin-types/build.gradle
+++ b/appsearch/appsearch-builtin-types/build.gradle
@@ -46,3 +46,7 @@
'apps, as well as structured parameters for semantic intents should use these ' +
'built-in types as appropriate.'
}
+
+android {
+ namespace "androidx.appsearch.builtintypes"
+}
diff --git a/appsearch/appsearch-builtin-types/src/androidTest/AndroidManifest.xml b/appsearch/appsearch-builtin-types/src/androidTest/AndroidManifest.xml
index 0230fdc..d76aa4e 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/AndroidManifest.xml
+++ b/appsearch/appsearch-builtin-types/src/androidTest/AndroidManifest.xml
@@ -14,5 +14,4 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appsearch.builtintypes.test"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/appsearch/appsearch-builtin-types/src/main/AndroidManifest.xml b/appsearch/appsearch-builtin-types/src/main/AndroidManifest.xml
index 4ad2812..a270226 100644
--- a/appsearch/appsearch-builtin-types/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-builtin-types/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.appsearch.builtintypes"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/appsearch/appsearch-debug-view/build.gradle b/appsearch/appsearch-debug-view/build.gradle
index a2588fb..eeaec52 100644
--- a/appsearch/appsearch-debug-view/build.gradle
+++ b/appsearch/appsearch-debug-view/build.gradle
@@ -25,6 +25,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.appsearch.debugview"
}
dependencies {
diff --git a/appsearch/appsearch-debug-view/samples/build.gradle b/appsearch/appsearch-debug-view/samples/build.gradle
index 3855d70..bba17b9 100644
--- a/appsearch/appsearch-debug-view/samples/build.gradle
+++ b/appsearch/appsearch-debug-view/samples/build.gradle
@@ -25,6 +25,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.appsearch.debugview.samples"
}
dependencies {
diff --git a/appsearch/appsearch-debug-view/samples/src/main/AndroidManifest.xml b/appsearch/appsearch-debug-view/samples/src/main/AndroidManifest.xml
index 66ce4b5..f59bec1 100644
--- a/appsearch/appsearch-debug-view/samples/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-debug-view/samples/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appsearch.debugview.samples">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/appsearch/appsearch-debug-view/src/main/AndroidManifest.xml b/appsearch/appsearch-debug-view/src/main/AndroidManifest.xml
index 043ccbf..3c3c224 100644
--- a/appsearch/appsearch-debug-view/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-debug-view/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.appsearch.debugview" />
+<manifest />
diff --git a/appsearch/appsearch-ktx/build.gradle b/appsearch/appsearch-ktx/build.gradle
index 2f0df51..0e72fdf 100644
--- a/appsearch/appsearch-ktx/build.gradle
+++ b/appsearch/appsearch-ktx/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = '2021'
description = 'AndroidX AppSearch - Kotlin Extensions'
}
+
+android {
+ namespace "androidx.appsearch.ktx"
+}
diff --git a/appsearch/appsearch-ktx/src/main/AndroidManifest.xml b/appsearch/appsearch-ktx/src/main/AndroidManifest.xml
index 1c35209..adbf0a8 100644
--- a/appsearch/appsearch-ktx/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-ktx/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.appsearch.ktx"/>
+<manifest />
diff --git a/appsearch/appsearch-local-storage/build.gradle b/appsearch/appsearch-local-storage/build.gradle
index 1646e4e..268af48 100644
--- a/appsearch/appsearch-local-storage/build.gradle
+++ b/appsearch/appsearch-local-storage/build.gradle
@@ -57,6 +57,7 @@
path "../../../../external/icing/CMakeLists.txt"
}
}
+ namespace "androidx.appsearch.localstorage"
}
BundleInsideHelper.forInsideAar(
diff --git a/appsearch/appsearch-local-storage/src/androidTest/AndroidManifest.xml b/appsearch/appsearch-local-storage/src/androidTest/AndroidManifest.xml
index 014f4a2..4ff0608 100644
--- a/appsearch/appsearch-local-storage/src/androidTest/AndroidManifest.xml
+++ b/appsearch/appsearch-local-storage/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appsearch.localstorage.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Required for junit TemporaryFolder rule on older API levels -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</manifest>
diff --git a/appsearch/appsearch-local-storage/src/main/AndroidManifest.xml b/appsearch/appsearch-local-storage/src/main/AndroidManifest.xml
index 4b6989c..e95a361 100644
--- a/appsearch/appsearch-local-storage/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-local-storage/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.appsearch.localstorage"/>
+<manifest />
diff --git a/appsearch/appsearch-platform-storage/build.gradle b/appsearch/appsearch-platform-storage/build.gradle
index 12271a1..73bb4b7 100644
--- a/appsearch/appsearch-platform-storage/build.gradle
+++ b/appsearch/appsearch-platform-storage/build.gradle
@@ -42,3 +42,7 @@
description =
"An implementation of AppSearchSession which uses the AppSearch service on Android S+"
}
+
+android {
+ namespace "androidx.appsearch.platformstorage"
+}
diff --git a/appsearch/appsearch-platform-storage/src/androidTest/AndroidManifest.xml b/appsearch/appsearch-platform-storage/src/androidTest/AndroidManifest.xml
index 06cf077..7c37821 100644
--- a/appsearch/appsearch-platform-storage/src/androidTest/AndroidManifest.xml
+++ b/appsearch/appsearch-platform-storage/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appsearch.platformstorage.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/appsearch/appsearch-platform-storage/src/main/AndroidManifest.xml b/appsearch/appsearch-platform-storage/src/main/AndroidManifest.xml
index 3cd15c8..adbf0a8 100644
--- a/appsearch/appsearch-platform-storage/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-platform-storage/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.appsearch.platformstorage"/>
+<manifest />
diff --git a/appsearch/appsearch-test-util/build.gradle b/appsearch/appsearch-test-util/build.gradle
index f4fd46f..34ac12c 100644
--- a/appsearch/appsearch-test-util/build.gradle
+++ b/appsearch/appsearch-test-util/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = '2021'
description = 'Test Utilities to be used by any test module for AppSearch'
}
+
+android {
+ namespace "androidx.appsearch.testutil"
+}
diff --git a/appsearch/appsearch-test-util/src/androidTest/AndroidManifest.xml b/appsearch/appsearch-test-util/src/androidTest/AndroidManifest.xml
index 36fe911c..601e33d 100644
--- a/appsearch/appsearch-test-util/src/androidTest/AndroidManifest.xml
+++ b/appsearch/appsearch-test-util/src/androidTest/AndroidManifest.xml
@@ -14,5 +14,4 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appsearch.testutil.test"></manifest>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>
\ No newline at end of file
diff --git a/appsearch/appsearch-test-util/src/main/AndroidManifest.xml b/appsearch/appsearch-test-util/src/main/AndroidManifest.xml
index 0c68288..e0788d6 100644
--- a/appsearch/appsearch-test-util/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch-test-util/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.appsearch.testutil"/>
+<manifest />
diff --git a/appsearch/appsearch/build.gradle b/appsearch/appsearch/build.gradle
index df8adc0..c536467 100644
--- a/appsearch/appsearch/build.gradle
+++ b/appsearch/appsearch/build.gradle
@@ -25,6 +25,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.appsearch"
}
dependencies {
diff --git a/appsearch/appsearch/src/androidTest/AndroidManifest.xml b/appsearch/appsearch/src/androidTest/AndroidManifest.xml
index c2e7297..4ff0608 100644
--- a/appsearch/appsearch/src/androidTest/AndroidManifest.xml
+++ b/appsearch/appsearch/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.appsearch.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Required for junit TemporaryFolder rule on older API levels -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</manifest>
diff --git a/appsearch/appsearch/src/main/AndroidManifest.xml b/appsearch/appsearch/src/main/AndroidManifest.xml
index 5e938a9..19e768b 100644
--- a/appsearch/appsearch/src/main/AndroidManifest.xml
+++ b/appsearch/appsearch/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.appsearch"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/arch/core/core-runtime/build.gradle b/arch/core/core-runtime/build.gradle
index ce1fb77..f8ec338 100644
--- a/arch/core/core-runtime/build.gradle
+++ b/arch/core/core-runtime/build.gradle
@@ -33,3 +33,7 @@
inceptionYear = "2017"
description = "Android Arch-Runtime"
}
+
+android {
+ namespace "androidx.arch.core"
+}
diff --git a/arch/core/core-runtime/src/main/AndroidManifest.xml b/arch/core/core-runtime/src/main/AndroidManifest.xml
index e56fa1a..da23b80 100644
--- a/arch/core/core-runtime/src/main/AndroidManifest.xml
+++ b/arch/core/core-runtime/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.arch.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/arch/core/core-testing/build.gradle b/arch/core/core-testing/build.gradle
index 99bf611..060c70c 100644
--- a/arch/core/core-testing/build.gradle
+++ b/arch/core/core-testing/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = "2017"
description = "Android Core-Testing"
}
+
+android {
+ namespace "androidx.arch.core.testing"
+}
diff --git a/arch/core/core-testing/src/main/AndroidManifest.xml b/arch/core/core-testing/src/main/AndroidManifest.xml
index f5cee7e..da23b80 100644
--- a/arch/core/core-testing/src/main/AndroidManifest.xml
+++ b/arch/core/core-testing/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.arch.core.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/asynclayoutinflater/asynclayoutinflater/build.gradle b/asynclayoutinflater/asynclayoutinflater/build.gradle
index 1103ae3..fa0b610 100644
--- a/asynclayoutinflater/asynclayoutinflater/build.gradle
+++ b/asynclayoutinflater/asynclayoutinflater/build.gradle
@@ -17,3 +17,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.asynclayoutinflater"
+}
diff --git a/asynclayoutinflater/asynclayoutinflater/src/main/AndroidManifest.xml b/asynclayoutinflater/asynclayoutinflater/src/main/AndroidManifest.xml
index a2ae00de..6f49e23 100644
--- a/asynclayoutinflater/asynclayoutinflater/src/main/AndroidManifest.xml
+++ b/asynclayoutinflater/asynclayoutinflater/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.asynclayoutinflater"/>
+<manifest />
diff --git a/autofill/autofill/build.gradle b/autofill/autofill/build.gradle
index 6eb7a69..a7b34bb 100644
--- a/autofill/autofill/build.gradle
+++ b/autofill/autofill/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2019"
description = "AndroidX Autofill"
}
+
+android {
+ namespace "androidx.autofill"
+}
diff --git a/autofill/autofill/src/androidTest/AndroidManifest.xml b/autofill/autofill/src/androidTest/AndroidManifest.xml
index a7bf090..5fceddb 100644
--- a/autofill/autofill/src/androidTest/AndroidManifest.xml
+++ b/autofill/autofill/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.autofill.tests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true">
<activity xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/autofill/autofill/src/main/AndroidManifest.xml b/autofill/autofill/src/main/AndroidManifest.xml
index 77e9b2f..19e768b 100644
--- a/autofill/autofill/src/main/AndroidManifest.xml
+++ b/autofill/autofill/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.autofill"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/benchmark/benchmark-common/build.gradle b/benchmark/benchmark-common/build.gradle
index 5fbee5b..d298309 100644
--- a/benchmark/benchmark-common/build.gradle
+++ b/benchmark/benchmark-common/build.gradle
@@ -36,6 +36,7 @@
"androidx/traceprocessor/testdata"
)
}
+ namespace "androidx.benchmark"
}
wire {
diff --git a/benchmark/benchmark-common/src/androidTest/AndroidManifest.xml b/benchmark/benchmark-common/src/androidTest/AndroidManifest.xml
index bcc3cf4..ad651b2 100644
--- a/benchmark/benchmark-common/src/androidTest/AndroidManifest.xml
+++ b/benchmark/benchmark-common/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.benchmark.test">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.benchmark.ArgumentInjectingApplication"/>
diff --git a/benchmark/benchmark-common/src/main/AndroidManifest.xml b/benchmark/benchmark-common/src/main/AndroidManifest.xml
index 4f7502e..816bb5d 100644
--- a/benchmark/benchmark-common/src/main/AndroidManifest.xml
+++ b/benchmark/benchmark-common/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.benchmark"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- This is needed to write benchmark report data to an external directory during instrumented
tests to allow the accompanying androidx.benchmark gradle plugin to pull the reports onto host
diff --git a/benchmark/benchmark-junit4/build.gradle b/benchmark/benchmark-junit4/build.gradle
index 81f1e29..3ee2141 100644
--- a/benchmark/benchmark-junit4/build.gradle
+++ b/benchmark/benchmark-junit4/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
}
+ namespace "androidx.benchmark.junit4"
}
dependencies {
diff --git a/benchmark/benchmark-junit4/src/androidTest/AndroidManifest.xml b/benchmark/benchmark-junit4/src/androidTest/AndroidManifest.xml
index 7398a5f..ec0893fc 100644
--- a/benchmark/benchmark-junit4/src/androidTest/AndroidManifest.xml
+++ b/benchmark/benchmark-junit4/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.benchmark.junit4.test">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.benchmark.junit4.ArgumentInjectingApplication">
diff --git a/benchmark/benchmark-junit4/src/main/AndroidManifest.xml b/benchmark/benchmark-junit4/src/main/AndroidManifest.xml
index ee4f8b9..cf0d807 100644
--- a/benchmark/benchmark-junit4/src/main/AndroidManifest.xml
+++ b/benchmark/benchmark-junit4/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.benchmark.junit4"/>
+<manifest />
diff --git a/benchmark/benchmark-macro-junit4/build.gradle b/benchmark/benchmark-macro-junit4/build.gradle
index 94a62dc..7e462d5 100644
--- a/benchmark/benchmark-macro-junit4/build.gradle
+++ b/benchmark/benchmark-macro-junit4/build.gradle
@@ -28,6 +28,7 @@
minSdkVersion 23
multiDexEnabled true
}
+ namespace "androidx.benchmark.macro.junit4"
}
dependencies {
diff --git a/benchmark/benchmark-macro-junit4/src/main/AndroidManifest.xml b/benchmark/benchmark-macro-junit4/src/main/AndroidManifest.xml
index ed2a844..5b41847 100644
--- a/benchmark/benchmark-macro-junit4/src/main/AndroidManifest.xml
+++ b/benchmark/benchmark-macro-junit4/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.benchmark.macro.junit4" />
+<manifest />
diff --git a/benchmark/benchmark-macro/build.gradle b/benchmark/benchmark-macro/build.gradle
index 88684d1..38c72be 100644
--- a/benchmark/benchmark-macro/build.gradle
+++ b/benchmark/benchmark-macro/build.gradle
@@ -38,6 +38,7 @@
"androidx/traceprocessor/testdata"
)
}
+ namespace "androidx.benchmark.macro"
}
dependencies {
diff --git a/benchmark/benchmark-macro/src/androidTest/AndroidManifest.xml b/benchmark/benchmark-macro/src/androidTest/AndroidManifest.xml
index acd7e21..68145ab 100644
--- a/benchmark/benchmark-macro/src/androidTest/AndroidManifest.xml
+++ b/benchmark/benchmark-macro/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.benchmark.macro.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!--
The Macro Benchmark Sample needs to launch activities in
`androidx.benchmark.integration.macrobenchmark.target` APK.
diff --git a/benchmark/benchmark-macro/src/main/AndroidManifest.xml b/benchmark/benchmark-macro/src/main/AndroidManifest.xml
index bf2756d..e71c620 100644
--- a/benchmark/benchmark-macro/src/main/AndroidManifest.xml
+++ b/benchmark/benchmark-macro/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
~ limitations under the License.
-->
<manifest xmlns:tools="http://schemas.android.com/tools"
- package="androidx.benchmark.macro"
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- QUERY_ALL_PACKAGES is used to enable macrobenchmarks to read package information from
diff --git a/benchmark/benchmark/build.gradle b/benchmark/benchmark/build.gradle
index a69a0a3..000ccb7 100644
--- a/benchmark/benchmark/build.gradle
+++ b/benchmark/benchmark/build.gradle
@@ -30,3 +30,7 @@
androidTestImplementation(libs.junit)
androidTestImplementation(libs.kotlinStdlib)
}
+
+android {
+ namespace "androidx.benchmark.benchmark"
+}
diff --git a/benchmark/benchmark/src/androidTest/AndroidManifest.xml b/benchmark/benchmark/src/androidTest/AndroidManifest.xml
index 573a5bd..097b102 100644
--- a/benchmark/benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/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.benchmark.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/benchmark/benchmark/src/main/AndroidManifest.xml b/benchmark/benchmark/src/main/AndroidManifest.xml
index f290972..37aba03 100644
--- a/benchmark/benchmark/src/main/AndroidManifest.xml
+++ b/benchmark/benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.benchmark.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/benchmark/integration-tests/dry-run-benchmark/build.gradle b/benchmark/integration-tests/dry-run-benchmark/build.gradle
index 37da74aa..3326e14 100644
--- a/benchmark/integration-tests/dry-run-benchmark/build.gradle
+++ b/benchmark/integration-tests/dry-run-benchmark/build.gradle
@@ -28,3 +28,7 @@
androidTestImplementation(libs.junit)
androidTestImplementation(libs.kotlinStdlib)
}
+
+android {
+ namespace "androidx.benchmark.integration.dryrun.benchmark"
+}
diff --git a/benchmark/integration-tests/dry-run-benchmark/src/androidTest/AndroidManifest.xml b/benchmark/integration-tests/dry-run-benchmark/src/androidTest/AndroidManifest.xml
index bfb5851..6abf22c 100644
--- a/benchmark/integration-tests/dry-run-benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/integration-tests/dry-run-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,8 +16,7 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.benchmark.integration.dryrun.benchmark.test">
+ xmlns:tools="http://schemas.android.com/tools">
<!-- NOTE: set debuggable=true below to verify that's not an error in dryRun mode -->
<application
android:name="androidx.benchmark.integration.dryrun.benchmark.ArgumentInjectingApplication"
diff --git a/benchmark/integration-tests/dry-run-benchmark/src/main/AndroidManifest.xml b/benchmark/integration-tests/dry-run-benchmark/src/main/AndroidManifest.xml
index 22daa1a..aeca043 100644
--- a/benchmark/integration-tests/dry-run-benchmark/src/main/AndroidManifest.xml
+++ b/benchmark/integration-tests/dry-run-benchmark/src/main/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.benchmark.integration.dryrun.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/benchmark/integration-tests/macrobenchmark-target/build.gradle b/benchmark/integration-tests/macrobenchmark-target/build.gradle
index 20dd547..eeca3ad 100644
--- a/benchmark/integration-tests/macrobenchmark-target/build.gradle
+++ b/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -28,6 +28,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ namespace "androidx.benchmark.integration.macrobenchmark.target"
}
dependencies {
diff --git a/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index b742f04..da19fa4 100644
--- a/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/benchmark/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.benchmark.integration.macrobenchmark.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Jetpack Benchmark Macrobenchmark Target"
diff --git a/benchmark/integration-tests/macrobenchmark/build.gradle b/benchmark/integration-tests/macrobenchmark/build.gradle
index bf5d2a1..0aee23f 100644
--- a/benchmark/integration-tests/macrobenchmark/build.gradle
+++ b/benchmark/integration-tests/macrobenchmark/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.benchmark.integration.macrobenchmark"
}
dependencies {
diff --git a/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml b/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
index d0f8ec9..5b41847 100644
--- a/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/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.benchmark.integration.macrobenchmark.test"/>
+<manifest />
diff --git a/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml b/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
index f2de133..ed173d5 100644
--- a/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
+++ b/benchmark/integration-tests/macrobenchmark/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.benchmark.integration.macrobenchmark" />
+<manifest />
diff --git a/benchmark/integration-tests/startup-benchmark/build.gradle b/benchmark/integration-tests/startup-benchmark/build.gradle
index 37da74aa..52e6b41 100644
--- a/benchmark/integration-tests/startup-benchmark/build.gradle
+++ b/benchmark/integration-tests/startup-benchmark/build.gradle
@@ -28,3 +28,7 @@
androidTestImplementation(libs.junit)
androidTestImplementation(libs.kotlinStdlib)
}
+
+android {
+ namespace "androidx.benchmark.integration.startup.benchmark"
+}
diff --git a/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml b/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
index ffa7768..a88799f 100644
--- a/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/integration-tests/startup-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.benchmark.integration.startup.benchmark.test">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.benchmark.integration.startup.benchmark.ArgumentInjectingApplication">
<!-- enable profiling by shell for non-intrusive profiling tools -->
diff --git a/benchmark/integration-tests/startup-benchmark/src/main/AndroidManifest.xml b/benchmark/integration-tests/startup-benchmark/src/main/AndroidManifest.xml
index 9ca25c1..aeca043 100644
--- a/benchmark/integration-tests/startup-benchmark/src/main/AndroidManifest.xml
+++ b/benchmark/integration-tests/startup-benchmark/src/main/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.benchmark.integration.startup.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/benchmark/integration-tests/test-module-sample/build.gradle b/benchmark/integration-tests/test-module-sample/build.gradle
index f828b34..5351938 100644
--- a/benchmark/integration-tests/test-module-sample/build.gradle
+++ b/benchmark/integration-tests/test-module-sample/build.gradle
@@ -34,6 +34,7 @@
defaultConfig {
minSdkVersion 28
}
+ namespace "androidx.benchmark.integration.testmodulesample"
}
// note: below is optional, mimicing eventual benchmark module setup
diff --git a/benchmark/integration-tests/test-module-sample/src/main/AndroidManifest.xml b/benchmark/integration-tests/test-module-sample/src/main/AndroidManifest.xml
index 7cf14c3..37fa920 100644
--- a/benchmark/integration-tests/test-module-sample/src/main/AndroidManifest.xml
+++ b/benchmark/integration-tests/test-module-sample/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.benchmark.integration.testmodulesample"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<!--
Enables querying application info with packageManager.getApplicationInfo, to verify
diff --git a/biometric/biometric-ktx/build.gradle b/biometric/biometric-ktx/build.gradle
index 845a946..ec70a1c 100755
--- a/biometric/biometric-ktx/build.gradle
+++ b/biometric/biometric-ktx/build.gradle
@@ -37,3 +37,7 @@
inceptionYear = "2020"
description = "Kotlin extensions for the Biometric Library."
}
+
+android {
+ namespace "androidx.biometric.ktx"
+}
diff --git a/biometric/biometric-ktx/samples/build.gradle b/biometric/biometric-ktx/samples/build.gradle
index 6200fab..bb28ef6 100644
--- a/biometric/biometric-ktx/samples/build.gradle
+++ b/biometric/biometric-ktx/samples/build.gradle
@@ -34,3 +34,7 @@
inceptionYear = "2021"
description = "Contains the sample code for the AndroidX Biometric library"
}
+
+android {
+ namespace "androidx.biometric.samples"
+}
diff --git a/biometric/biometric-ktx/samples/src/main/AndroidManifest.xml b/biometric/biometric-ktx/samples/src/main/AndroidManifest.xml
index 1dacecc..eda0e80 100644
--- a/biometric/biometric-ktx/samples/src/main/AndroidManifest.xml
+++ b/biometric/biometric-ktx/samples/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.biometric.samples"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/biometric/biometric-ktx/src/main/AndroidManifest.xml b/biometric/biometric-ktx/src/main/AndroidManifest.xml
index acf678a..227314e 100644
--- a/biometric/biometric-ktx/src/main/AndroidManifest.xml
+++ b/biometric/biometric-ktx/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="androidx.biometric.ktx"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
index d09f8d7..f4bc888 100644
--- a/biometric/biometric/build.gradle
+++ b/biometric/biometric/build.gradle
@@ -66,6 +66,7 @@
consumerProguardFiles "proguard-rules.pro"
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.biometric"
}
androidx {
diff --git a/biometric/biometric/src/main/AndroidManifest.xml b/biometric/biometric/src/main/AndroidManifest.xml
index bdcd6bd..a7d1248 100644
--- a/biometric/biometric/src/main/AndroidManifest.xml
+++ b/biometric/biometric/src/main/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.biometric">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
diff --git a/biometric/integration-tests/testapp/build.gradle b/biometric/integration-tests/testapp/build.gradle
index 5cb19c4..c0813f9 100755
--- a/biometric/integration-tests/testapp/build.gradle
+++ b/biometric/integration-tests/testapp/build.gradle
@@ -46,6 +46,7 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.biometric.integration.testapp"
}
dependencies {
diff --git a/biometric/integration-tests/testapp/src/main/AndroidManifest.xml b/biometric/integration-tests/testapp/src/main/AndroidManifest.xml
index ca5ff9c..18e63d8 100644
--- a/biometric/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/biometric/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.biometric.integration.testapp">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle
index d424a7a..70e78d7 100644
--- a/browser/browser/build.gradle
+++ b/browser/browser/build.gradle
@@ -13,6 +13,7 @@
aidl = true
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.browser"
}
dependencies {
diff --git a/browser/browser/src/androidTest/AndroidManifest.xml b/browser/browser/src/androidTest/AndroidManifest.xml
index da0b286..7ca9246 100644
--- a/browser/browser/src/androidTest/AndroidManifest.xml
+++ b/browser/browser/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="android.support.customtabs.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/browser/browser/src/main/AndroidManifest.xml b/browser/browser/src/main/AndroidManifest.xml
index a6738f5..3e475b2 100644
--- a/browser/browser/src/main/AndroidManifest.xml
+++ b/browser/browser/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.browser"/>
+<manifest />
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index 7e99bea..77a356c 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -85,6 +85,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.camera.camera2.pipe.integration"
}
kapt {
diff --git a/camera/camera-camera2-pipe-integration/src/main/AndroidManifest.xml b/camera/camera-camera2-pipe-integration/src/main/AndroidManifest.xml
index 40091dd..9cd4123 100644
--- a/camera/camera-camera2-pipe-integration/src/main/AndroidManifest.xml
+++ b/camera/camera-camera2-pipe-integration/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.camera.camera2.pipe.integration" />
+<manifest />
diff --git a/camera/camera-camera2-pipe-testing/build.gradle b/camera/camera-camera2-pipe-testing/build.gradle
index b0414b7..ceea393 100644
--- a/camera/camera-camera2-pipe-testing/build.gradle
+++ b/camera/camera-camera2-pipe-testing/build.gradle
@@ -45,6 +45,7 @@
android {
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.camera2.pipe.testing"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/camera/camera-camera2-pipe-testing/src/main/AndroidManifest.xml b/camera/camera-camera2-pipe-testing/src/main/AndroidManifest.xml
index 513505d7..9cd4123 100644
--- a/camera/camera-camera2-pipe-testing/src/main/AndroidManifest.xml
+++ b/camera/camera-camera2-pipe-testing/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.camera.camera2.pipe.testing" />
+<manifest />
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle
index 5c701c5..c918d81 100644
--- a/camera/camera-camera2-pipe/build.gradle
+++ b/camera/camera-camera2-pipe/build.gradle
@@ -56,6 +56,7 @@
android {
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.camera2.pipe"
}
kapt {
diff --git a/camera/camera-camera2-pipe/src/main/AndroidManifest.xml b/camera/camera-camera2-pipe/src/main/AndroidManifest.xml
index 001a870..9cd4123 100644
--- a/camera/camera-camera2-pipe/src/main/AndroidManifest.xml
+++ b/camera/camera-camera2-pipe/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.camera.camera2.pipe" />
+<manifest />
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index 262e084..c994081 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -79,6 +79,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.camera2"
}
androidx {
diff --git a/camera/camera-camera2/src/androidTest/AndroidManifest.xml b/camera/camera-camera2/src/androidTest/AndroidManifest.xml
index 103df6d..9abb32e 100644
--- a/camera/camera-camera2/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-camera2/src/androidTest/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.camera.camera2.test">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/camera/camera-camera2/src/main/AndroidManifest.xml b/camera/camera-camera2/src/main/AndroidManifest.xml
index ff5826d..73b5aa5 100644
--- a/camera/camera-camera2/src/main/AndroidManifest.xml
+++ b/camera/camera-camera2/src/main/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.camera.camera2">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 98ac40f..589bff7 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -95,6 +95,7 @@
packagingOptions {
pickFirst "META-INF/support.camera_camera-core.version"
}
+ namespace "androidx.camera.core"
}
androidx {
diff --git a/camera/camera-core/src/androidTest/AndroidManifest.xml b/camera/camera-core/src/androidTest/AndroidManifest.xml
index fb0e2cf..edf2125 100644
--- a/camera/camera-core/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-core/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.camera.core.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/camera/camera-core/src/main/AndroidManifest.xml b/camera/camera-core/src/main/AndroidManifest.xml
index 1656645..497c995 100644
--- a/camera/camera-core/src/main/AndroidManifest.xml
+++ b/camera/camera-core/src/main/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.camera.core">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<!-- Service for holding metadata. Cannot be instantiated.
Metadata will be merged from other manifests.
diff --git a/camera/camera-extensions-stub/build.gradle b/camera/camera-extensions-stub/build.gradle
index f60ea33..04ab4be 100644
--- a/camera/camera-extensions-stub/build.gradle
+++ b/camera/camera-extensions-stub/build.gradle
@@ -34,3 +34,7 @@
" to integrate with OEM specific camera features."
}
+ android {
+ namespace "androidx.camera.extensions.impl"
+ }
+
diff --git a/camera/camera-extensions-stub/src/main/AndroidManifest.xml b/camera/camera-extensions-stub/src/main/AndroidManifest.xml
index 24ec9a7..9517533 100644
--- a/camera/camera-extensions-stub/src/main/AndroidManifest.xml
+++ b/camera/camera-extensions-stub/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.camera.extensions.impl"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index 6a26e25..ee2869a 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -71,6 +71,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.extensions"
}
androidx {
diff --git a/camera/camera-extensions/src/androidTest/AndroidManifest.xml b/camera/camera-extensions/src/androidTest/AndroidManifest.xml
index 19bd088..89c010d 100644
--- a/camera/camera-extensions/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-extensions/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.camera.extensions.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
</manifest>
diff --git a/camera/camera-extensions/src/main/AndroidManifest.xml b/camera/camera-extensions/src/main/AndroidManifest.xml
index d4c42f7..908913e 100644
--- a/camera/camera-extensions/src/main/AndroidManifest.xml
+++ b/camera/camera-extensions/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.camera.extensions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<intent>
diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle
index 8167324..1a926c7 100644
--- a/camera/camera-lifecycle/build.gradle
+++ b/camera/camera-lifecycle/build.gradle
@@ -54,6 +54,7 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.lifecycle"
}
androidx {
diff --git a/camera/camera-lifecycle/src/androidTest/AndroidManifest.xml b/camera/camera-lifecycle/src/androidTest/AndroidManifest.xml
index ab899aa..074e762 100644
--- a/camera/camera-lifecycle/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-lifecycle/src/androidTest/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.camera.lifecycle.test">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service android:name="androidx.camera.core.impl.MetadataHolderService"
tools:node="merge">
diff --git a/camera/camera-lifecycle/src/main/AndroidManifest.xml b/camera/camera-lifecycle/src/main/AndroidManifest.xml
index 0a2e4c0..39dd6cb 100644
--- a/camera/camera-lifecycle/src/main/AndroidManifest.xml
+++ b/camera/camera-lifecycle/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.camera.lifecycle"/>
+<manifest />
diff --git a/camera/camera-mlkit-vision/build.gradle b/camera/camera-mlkit-vision/build.gradle
index e229ba7..78fd71c 100644
--- a/camera/camera-mlkit-vision/build.gradle
+++ b/camera/camera-mlkit-vision/build.gradle
@@ -49,6 +49,7 @@
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.mlkit.vision"
}
androidx {
diff --git a/camera/camera-mlkit-vision/src/main/AndroidManifest.xml b/camera/camera-mlkit-vision/src/main/AndroidManifest.xml
index 831ddef..32c2039 100644
--- a/camera/camera-mlkit-vision/src/main/AndroidManifest.xml
+++ b/camera/camera-mlkit-vision/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:tools="http://schemas.android.com/tools"
- package="androidx.camera.mlkit.vision">
+<manifest xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="com.google.mlkit.vision.interfaces" />
</manifest>
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index 766f2f2..418b5cc 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -68,6 +68,7 @@
version libs.versions.cmake.get()
}
}
+ namespace "androidx.camera.testing"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/camera/camera-testing/src/main/AndroidManifest.xml b/camera/camera-testing/src/main/AndroidManifest.xml
index c06343f..ad9f820 100644
--- a/camera/camera-testing/src/main/AndroidManifest.xml
+++ b/camera/camera-testing/src/main/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.camera.testing">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
diff --git a/camera/camera-testlib-extensions/build.gradle b/camera/camera-testlib-extensions/build.gradle
index 32df81a..7744cff 100644
--- a/camera/camera-testlib-extensions/build.gradle
+++ b/camera/camera-testlib-extensions/build.gradle
@@ -28,9 +28,9 @@
android {
defaultConfig {
- versionCode 1
multiDexEnabled true
}
+ namespace "androidx.camera.extensions.impl"
}
androidx {
diff --git a/camera/camera-testlib-extensions/src/main/AndroidManifest.xml b/camera/camera-testlib-extensions/src/main/AndroidManifest.xml
index 24ec9a7..9517533 100644
--- a/camera/camera-testlib-extensions/src/main/AndroidManifest.xml
+++ b/camera/camera-testlib-extensions/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.camera.extensions.impl"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle
index ed9dfad..4b71a53 100644
--- a/camera/camera-video/build.gradle
+++ b/camera/camera-video/build.gradle
@@ -76,6 +76,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.video"
}
androidx {
diff --git a/camera/camera-video/src/androidTest/AndroidManifest.xml b/camera/camera-video/src/androidTest/AndroidManifest.xml
index 4e99ab6..11dec50 100644
--- a/camera/camera-video/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-video/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.camera.video.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/camera/camera-video/src/main/AndroidManifest.xml b/camera/camera-video/src/main/AndroidManifest.xml
index 551d001..9a5f4d9 100644
--- a/camera/camera-video/src/main/AndroidManifest.xml
+++ b/camera/camera-video/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.camera.video"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle
index 2e0b429..128207a 100644
--- a/camera/camera-view/build.gradle
+++ b/camera/camera-view/build.gradle
@@ -70,6 +70,7 @@
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.camera.view"
}
androidx {
name = "Jetpack Camera View Library"
diff --git a/camera/camera-view/src/androidTest/AndroidManifest.xml b/camera/camera-view/src/androidTest/AndroidManifest.xml
index fdee0d6..d636405 100644
--- a/camera/camera-view/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-view/src/androidTest/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.camera.camera2.view">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
<application>
<activity
diff --git a/camera/camera-view/src/main/AndroidManifest.xml b/camera/camera-view/src/main/AndroidManifest.xml
index 94f4612..39dd6cb 100644
--- a/camera/camera-view/src/main/AndroidManifest.xml
+++ b/camera/camera-view/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.camera.view" />
+<manifest />
diff --git a/camera/camera-viewfinder/build.gradle b/camera/camera-viewfinder/build.gradle
index 1b827b9..20d530a 100644
--- a/camera/camera-viewfinder/build.gradle
+++ b/camera/camera-viewfinder/build.gradle
@@ -66,7 +66,7 @@
}
testOptions.unitTests.includeAndroidResources = true
-
+ namespace "androidx.camera.viewfinder"
lintOptions {
enable 'CameraXQuirksClassDetector'
}
diff --git a/camera/camera-viewfinder/src/androidTest/AndroidManifest.xml b/camera/camera-viewfinder/src/androidTest/AndroidManifest.xml
index ca96d9e..c7572b1 100644
--- a/camera/camera-viewfinder/src/androidTest/AndroidManifest.xml
+++ b/camera/camera-viewfinder/src/androidTest/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.camera.viewfinder">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
<application>
diff --git a/camera/camera-viewfinder/src/main/AndroidManifest.xml b/camera/camera-viewfinder/src/main/AndroidManifest.xml
index 35bfca2..ef5bd56 100644
--- a/camera/camera-viewfinder/src/main/AndroidManifest.xml
+++ b/camera/camera-viewfinder/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.camera.viewfinder">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/camera/integration-tests/camerapipetestapp/build.gradle b/camera/integration-tests/camerapipetestapp/build.gradle
index 9fab5bd..75be17a 100644
--- a/camera/integration-tests/camerapipetestapp/build.gradle
+++ b/camera/integration-tests/camerapipetestapp/build.gradle
@@ -45,6 +45,7 @@
"proguard-rules.pro")
}
}
+ namespace "androidx.camera.integration.camera2.pipe"
}
dependencies {
diff --git a/camera/integration-tests/camerapipetestapp/src/main/AndroidManifest.xml b/camera/integration-tests/camerapipetestapp/src/main/AndroidManifest.xml
index 3d71dca..a079248 100644
--- a/camera/integration-tests/camerapipetestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/camerapipetestapp/src/main/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.camera.integration.camera2.pipe">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index c65167c..2f11477 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -57,6 +57,7 @@
version libs.versions.cmake.get()
}
}
+ namespace "androidx.camera.integration.core"
}
dependencies {
diff --git a/camera/integration-tests/coretestapp/src/main/AndroidManifest.xml b/camera/integration-tests/coretestapp/src/main/AndroidManifest.xml
index 8f480fb..1c8e0e8 100644
--- a/camera/integration-tests/coretestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/coretestapp/src/main/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.camera.integration.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle
index d0fdf6b..c6a20b0 100644
--- a/camera/integration-tests/extensionstestapp/build.gradle
+++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -37,6 +37,7 @@
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ namespace "androidx.camera.integration.extensions"
}
dependencies {
diff --git a/camera/integration-tests/extensionstestapp/src/main/AndroidManifest.xml b/camera/integration-tests/extensionstestapp/src/main/AndroidManifest.xml
index accf2cb..5aa38fc 100644
--- a/camera/integration-tests/extensionstestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/extensionstestapp/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.camera.integration.extensions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle
index 416945d..be80ef6 100644
--- a/camera/integration-tests/timingtestapp/build.gradle
+++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -48,6 +48,7 @@
kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
}
+ namespace "androidx.camera.integration.antelope"
}
dependencies {
diff --git a/camera/integration-tests/timingtestapp/src/main/AndroidManifest.xml b/camera/integration-tests/timingtestapp/src/main/AndroidManifest.xml
index 6c7e3b5..01f78dc 100644
--- a/camera/integration-tests/timingtestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/timingtestapp/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.camera.integration.antelope">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index 6044911..87fc3e1 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -45,6 +45,7 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.camera.integration.uiwidgets"
}
dependencies {
diff --git a/camera/integration-tests/uiwidgetstestapp/src/main/AndroidManifest.xml b/camera/integration-tests/uiwidgetstestapp/src/main/AndroidManifest.xml
index 17bb354..04de030 100644
--- a/camera/integration-tests/uiwidgetstestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/uiwidgetstestapp/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.camera.integration.uiwidgets">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="@string/app_name"
diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle
index 8384ccf..2a416c2 100644
--- a/camera/integration-tests/viewfindertestapp/build.gradle
+++ b/camera/integration-tests/viewfindertestapp/build.gradle
@@ -37,6 +37,7 @@
shrinkResources true
}
}
+ namespace "androidx.camera.integration.viewfinder"
}
dependencies {
diff --git a/camera/integration-tests/viewfindertestapp/src/main/AndroidManifest.xml b/camera/integration-tests/viewfindertestapp/src/main/AndroidManifest.xml
index b97ddee..7b08d74 100644
--- a/camera/integration-tests/viewfindertestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/viewfindertestapp/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.camera.integration.viewfinder">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.CAMERA" />
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index bc7ae6d..155e485 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -52,6 +52,7 @@
kotlinOptions {
jvmTarget = '1.8'
}
+ namespace "androidx.camera.integration.view"
}
dependencies {
diff --git a/camera/integration-tests/viewtestapp/src/main/AndroidManifest.xml b/camera/integration-tests/viewtestapp/src/main/AndroidManifest.xml
index 3960500..fecb0a5 100644
--- a/camera/integration-tests/viewtestapp/src/main/AndroidManifest.xml
+++ b/camera/integration-tests/viewtestapp/src/main/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.camera.integration.view">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- For using the camera -->
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index a063c8e..4314d26 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -65,6 +65,7 @@
}
useLibrary 'android.car'
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.car.app.automotive"
}
androidx {
diff --git a/car/app/app-automotive/src/androidTest/AndroidManifest.xml b/car/app/app-automotive/src/androidTest/AndroidManifest.xml
index db2ba14..4d68dc2 100644
--- a/car/app/app-automotive/src/androidTest/AndroidManifest.xml
+++ b/car/app/app-automotive/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.car.app.automotive.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/car/app/app-automotive/src/main/AndroidManifest.xml b/car/app/app-automotive/src/main/AndroidManifest.xml
index 6f5812b..1a65418 100644
--- a/car/app/app-automotive/src/main/AndroidManifest.xml
+++ b/car/app/app-automotive/src/main/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.car.app.automotive">
+ xmlns:tools="http://schemas.android.com/tools">
<queries>
<intent>
<action android:name="android.car.template.host.RendererService" />
diff --git a/car/app/app-automotive/src/test/AndroidManifest.xml b/car/app/app-automotive/src/test/AndroidManifest.xml
index 9995b59..7e76975 100644
--- a/car/app/app-automotive/src/test/AndroidManifest.xml
+++ b/car/app/app-automotive/src/test/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.car.app.automotive">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index 60576a5a..f14b678 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -55,6 +55,7 @@
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.car.app.projected"
}
androidx {
diff --git a/car/app/app-projected/src/androidTest/AndroidManifest.xml b/car/app/app-projected/src/androidTest/AndroidManifest.xml
index 67a2102..4d68dc2 100644
--- a/car/app/app-projected/src/androidTest/AndroidManifest.xml
+++ b/car/app/app-projected/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.car.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/car/app/app-projected/src/main/AndroidManifest.xml b/car/app/app-projected/src/main/AndroidManifest.xml
index 82385a2..533415c 100644
--- a/car/app/app-projected/src/main/AndroidManifest.xml
+++ b/car/app/app-projected/src/main/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.car.app.projected">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/car/app/app-projected/src/test/AndroidManifest.xml b/car/app/app-projected/src/test/AndroidManifest.xml
index ced5923..037bd65 100644
--- a/car/app/app-projected/src/test/AndroidManifest.xml
+++ b/car/app/app-projected/src/test/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.car.app.projected">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/car/app/app-samples/helloworld/automotive/build.gradle b/car/app/app-samples/helloworld/automotive/build.gradle
index 57c5447..f0ef6ea 100644
--- a/car/app/app-samples/helloworld/automotive/build.gradle
+++ b/car/app/app-samples/helloworld/automotive/build.gradle
@@ -36,6 +36,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.helloworld"
}
dependencies {
diff --git a/car/app/app-samples/helloworld/automotive/src/main/AndroidManifest.xml b/car/app/app-samples/helloworld/automotive/src/main/AndroidManifest.xml
index 126e828..de9531f 100644
--- a/car/app/app-samples/helloworld/automotive/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/helloworld/automotive/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.helloworld"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-samples/helloworld/common/build.gradle b/car/app/app-samples/helloworld/common/build.gradle
index 23e5ff6..385b8a8 100644
--- a/car/app/app-samples/helloworld/common/build.gradle
+++ b/car/app/app-samples/helloworld/common/build.gradle
@@ -23,6 +23,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.car.app.sample.helloworld.common"
}
dependencies {
diff --git a/car/app/app-samples/helloworld/common/src/main/AndroidManifest.xml b/car/app/app-samples/helloworld/common/src/main/AndroidManifest.xml
index 8f52617..81cc0685 100644
--- a/car/app/app-samples/helloworld/common/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/helloworld/common/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.car.app.sample.helloworld.common" />
+<manifest />
diff --git a/car/app/app-samples/helloworld/mobile/build.gradle b/car/app/app-samples/helloworld/mobile/build.gradle
index 8f92447..d38f816 100644
--- a/car/app/app-samples/helloworld/mobile/build.gradle
+++ b/car/app/app-samples/helloworld/mobile/build.gradle
@@ -36,6 +36,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.helloworld"
}
dependencies {
diff --git a/car/app/app-samples/helloworld/mobile/src/main/AndroidManifest.xml b/car/app/app-samples/helloworld/mobile/src/main/AndroidManifest.xml
index 78955fb..b0a124b 100644
--- a/car/app/app-samples/helloworld/mobile/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/helloworld/mobile/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.helloworld"
android:versionCode="1"
android:versionName="1.0">
<application
diff --git a/car/app/app-samples/navigation/automotive/build.gradle b/car/app/app-samples/navigation/automotive/build.gradle
index 523c000..682ac0e 100644
--- a/car/app/app-samples/navigation/automotive/build.gradle
+++ b/car/app/app-samples/navigation/automotive/build.gradle
@@ -36,6 +36,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.navigation"
}
dependencies {
diff --git a/car/app/app-samples/navigation/automotive/src/main/AndroidManifest.xml b/car/app/app-samples/navigation/automotive/src/main/AndroidManifest.xml
index 9792cca..0744891 100644
--- a/car/app/app-samples/navigation/automotive/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/navigation/automotive/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.navigation"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-samples/navigation/common/build.gradle b/car/app/app-samples/navigation/common/build.gradle
index 997d94a..3f0fbeb 100644
--- a/car/app/app-samples/navigation/common/build.gradle
+++ b/car/app/app-samples/navigation/common/build.gradle
@@ -23,6 +23,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.car.app.sample.navigation.common"
}
dependencies {
diff --git a/car/app/app-samples/navigation/common/src/main/AndroidManifest.xml b/car/app/app-samples/navigation/common/src/main/AndroidManifest.xml
index 5384c79..2f51adb 100644
--- a/car/app/app-samples/navigation/common/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/navigation/common/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.car.app.sample.navigation.common" />
+<manifest />
diff --git a/car/app/app-samples/navigation/mobile/build.gradle b/car/app/app-samples/navigation/mobile/build.gradle
index 6a0d608..96afb1e 100644
--- a/car/app/app-samples/navigation/mobile/build.gradle
+++ b/car/app/app-samples/navigation/mobile/build.gradle
@@ -36,6 +36,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.navigation"
}
dependencies {
diff --git a/car/app/app-samples/navigation/mobile/src/main/AndroidManifest.xml b/car/app/app-samples/navigation/mobile/src/main/AndroidManifest.xml
index 1f0438d..77fc340 100644
--- a/car/app/app-samples/navigation/mobile/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/navigation/mobile/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.navigation"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-samples/places/automotive/build.gradle b/car/app/app-samples/places/automotive/build.gradle
index 9e60909..f7e2df0 100644
--- a/car/app/app-samples/places/automotive/build.gradle
+++ b/car/app/app-samples/places/automotive/build.gradle
@@ -36,6 +36,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.places"
}
dependencies {
diff --git a/car/app/app-samples/places/automotive/src/main/AndroidManifest.xml b/car/app/app-samples/places/automotive/src/main/AndroidManifest.xml
index b1f25e5..9ef96bb 100644
--- a/car/app/app-samples/places/automotive/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/places/automotive/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.places"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-samples/places/common/build.gradle b/car/app/app-samples/places/common/build.gradle
index 1a6ae27..4766754 100644
--- a/car/app/app-samples/places/common/build.gradle
+++ b/car/app/app-samples/places/common/build.gradle
@@ -23,6 +23,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.car.app.sample.places.common"
}
dependencies {
diff --git a/car/app/app-samples/places/common/src/main/AndroidManifest.xml b/car/app/app-samples/places/common/src/main/AndroidManifest.xml
index e0c1d2e..2f51adb 100644
--- a/car/app/app-samples/places/common/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/places/common/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.car.app.sample.places.common" />
+<manifest />
diff --git a/car/app/app-samples/places/mobile/build.gradle b/car/app/app-samples/places/mobile/build.gradle
index 3f9361e..8e3ab39 100644
--- a/car/app/app-samples/places/mobile/build.gradle
+++ b/car/app/app-samples/places/mobile/build.gradle
@@ -36,6 +36,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.places"
}
dependencies {
diff --git a/car/app/app-samples/places/mobile/src/main/AndroidManifest.xml b/car/app/app-samples/places/mobile/src/main/AndroidManifest.xml
index 0afec2a..00f6c68 100644
--- a/car/app/app-samples/places/mobile/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/places/mobile/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.places"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-samples/showcase/automotive/build.gradle b/car/app/app-samples/showcase/automotive/build.gradle
index 5dd1a78..878e1f5 100644
--- a/car/app/app-samples/showcase/automotive/build.gradle
+++ b/car/app/app-samples/showcase/automotive/build.gradle
@@ -39,6 +39,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.showcase"
}
dependencies {
diff --git a/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml b/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml
index a9298ff..16557c9 100644
--- a/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.showcase"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-samples/showcase/common/build.gradle b/car/app/app-samples/showcase/common/build.gradle
index ac18636..4517db7 100644
--- a/car/app/app-samples/showcase/common/build.gradle
+++ b/car/app/app-samples/showcase/common/build.gradle
@@ -23,6 +23,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.car.app.sample.showcase.common"
}
dependencies {
diff --git a/car/app/app-samples/showcase/common/src/main/AndroidManifest.xml b/car/app/app-samples/showcase/common/src/main/AndroidManifest.xml
index a8907fd..1913959 100644
--- a/car/app/app-samples/showcase/common/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/showcase/common/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.sample.showcase.common">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<!-- For accessing current location in PlaceListMapTemplate -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
diff --git a/car/app/app-samples/showcase/mobile/build.gradle b/car/app/app-samples/showcase/mobile/build.gradle
index 74bf224..5df6865 100644
--- a/car/app/app-samples/showcase/mobile/build.gradle
+++ b/car/app/app-samples/showcase/mobile/build.gradle
@@ -39,6 +39,7 @@
'proguard-rules.pro'
}
}
+ namespace "androidx.car.app.sample.showcase"
}
dependencies {
diff --git a/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml b/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml
index 9972a0f..6f80a4e 100644
--- a/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app.sample.showcase"
android:versionCode="1"
android:versionName="1.0">
diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index 4ba5a953..8a484d4 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -51,6 +51,7 @@
lintOptions {
disable("InvalidPackage")
}
+ namespace "androidx.car.app.testing"
}
androidx {
diff --git a/car/app/app-testing/src/main/AndroidManifest.xml b/car/app/app-testing/src/main/AndroidManifest.xml
index bb0c15a..ed8a041 100644
--- a/car/app/app-testing/src/main/AndroidManifest.xml
+++ b/car/app/app-testing/src/main/AndroidManifest.xml
@@ -14,6 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.car.app.testing">
+<manifest>
</manifest>
\ No newline at end of file
diff --git a/car/app/app-testing/src/test/AndroidManifest.xml b/car/app/app-testing/src/test/AndroidManifest.xml
index 4756902..636274e 100644
--- a/car/app/app-testing/src/test/AndroidManifest.xml
+++ b/car/app/app-testing/src/test/AndroidManifest.xml
@@ -15,8 +15,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.car.app.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service android:name="androidx.car.app.CarAppService" >
<meta-data android:name="androidx.car.app.CAR_APP_ACTIVITY"
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index 85773f0..d39a829 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -96,6 +96,7 @@
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.car.app"
}
androidx {
diff --git a/car/app/app/src/main/AndroidManifest.xml b/car/app/app/src/main/AndroidManifest.xml
index 978d3dc..d90f7b7 100644
--- a/car/app/app/src/main/AndroidManifest.xml
+++ b/car/app/app/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.car.app">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<activity
android:name=".CarAppPermissionActivity"
diff --git a/car/app/app/src/test/AndroidManifest.xml b/car/app/app/src/test/AndroidManifest.xml
index 9b5f0a7..8922942 100644
--- a/car/app/app/src/test/AndroidManifest.xml
+++ b/car/app/app/src/test/AndroidManifest.xml
@@ -15,8 +15,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.car.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service android:name="androidx.car.app.CarAppService" >
<meta-data android:name="androidx.car.app.CAR_APP_ACTIVITY"
diff --git a/cardview/cardview/build.gradle b/cardview/cardview/build.gradle
index 3b9facf..cc2be1c 100644
--- a/cardview/cardview/build.gradle
+++ b/cardview/cardview/build.gradle
@@ -18,3 +18,7 @@
description = "Android Support CardView"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.cardview"
+}
diff --git a/cardview/cardview/src/main/AndroidManifest.xml b/cardview/cardview/src/main/AndroidManifest.xml
index e62525d..6f49e23 100644
--- a/cardview/cardview/src/main/AndroidManifest.xml
+++ b/cardview/cardview/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.cardview"/>
+<manifest />
diff --git a/collection/collection-benchmark/build.gradle b/collection/collection-benchmark/build.gradle
index 7bc08df..f2e1141 100644
--- a/collection/collection-benchmark/build.gradle
+++ b/collection/collection-benchmark/build.gradle
@@ -38,3 +38,7 @@
androidx {
publish = Publish.NONE
}
+
+android {
+ namespace "androidx.collection.benchmark"
+}
diff --git a/collection/collection-benchmark/src/androidTest/AndroidManifest.xml b/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
index 82c5e06..9126222 100644
--- a/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
+++ b/collection/collection-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.collection.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/collection/collection-benchmark/src/main/AndroidManifest.xml b/collection/collection-benchmark/src/main/AndroidManifest.xml
index 4bbc21e..deac81d 100644
--- a/collection/collection-benchmark/src/main/AndroidManifest.xml
+++ b/collection/collection-benchmark/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.collection.benchmark" />
+<manifest />
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 />
diff --git a/contentpager/contentpager/build.gradle b/contentpager/contentpager/build.gradle
index c58bc44..0a7fcb7 100644
--- a/contentpager/contentpager/build.gradle
+++ b/contentpager/contentpager/build.gradle
@@ -42,3 +42,7 @@
description = "Library providing support for paging across content exposed via a ContentProvider. Use of this library allows a client to avoid expensive interprocess \"cursor window swaps\" on the UI thread."
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.contentpager"
+}
diff --git a/contentpager/contentpager/src/androidTest/AndroidManifest.xml b/contentpager/contentpager/src/androidTest/AndroidManifest.xml
index 7f7ff2e..7d6e4ea 100644
--- a/contentpager/contentpager/src/androidTest/AndroidManifest.xml
+++ b/contentpager/contentpager/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.contentpager.content.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity android:name="androidx.contentpager.content.TestActivity" />
diff --git a/contentpager/contentpager/src/main/AndroidManifest.xml b/contentpager/contentpager/src/main/AndroidManifest.xml
index 121b857..95c4426 100644
--- a/contentpager/contentpager/src/main/AndroidManifest.xml
+++ b/contentpager/contentpager/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.contentpager"/>
+<manifest />
diff --git a/coordinatorlayout/coordinatorlayout/build.gradle b/coordinatorlayout/coordinatorlayout/build.gradle
index 1eb0b66..d0a5f0b 100644
--- a/coordinatorlayout/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/coordinatorlayout/build.gradle
@@ -34,6 +34,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.coordinatorlayout"
}
androidx {
diff --git a/coordinatorlayout/coordinatorlayout/src/androidTest/AndroidManifest.xml b/coordinatorlayout/coordinatorlayout/src/androidTest/AndroidManifest.xml
index efaadb7..b183770 100644
--- a/coordinatorlayout/coordinatorlayout/src/androidTest/AndroidManifest.xml
+++ b/coordinatorlayout/coordinatorlayout/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="android.support.coordinatorlayout.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true"
diff --git a/coordinatorlayout/coordinatorlayout/src/main/AndroidManifest.xml b/coordinatorlayout/coordinatorlayout/src/main/AndroidManifest.xml
index 8e3f621..dd3d3a3 100644
--- a/coordinatorlayout/coordinatorlayout/src/main/AndroidManifest.xml
+++ b/coordinatorlayout/coordinatorlayout/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.coordinatorlayout" />
+<manifest />
diff --git a/core/core-animation-integration-tests/testapp/build.gradle b/core/core-animation-integration-tests/testapp/build.gradle
index 47cab8d..6d99f5a 100644
--- a/core/core-animation-integration-tests/testapp/build.gradle
+++ b/core/core-animation-integration-tests/testapp/build.gradle
@@ -29,3 +29,7 @@
implementation(libs.testCore, excludes.espresso)
implementation(libs.testRules, excludes.espresso)
}
+
+android {
+ namespace "androidx.core.animation.testapp"
+}
diff --git a/core/core-animation-integration-tests/testapp/src/main/AndroidManifest.xml b/core/core-animation-integration-tests/testapp/src/main/AndroidManifest.xml
index 3704989..dd3d3a3 100644
--- a/core/core-animation-integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/core/core-animation-integration-tests/testapp/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.core.animation.testapp" />
+<manifest />
diff --git a/core/core-animation-testing/build.gradle b/core/core-animation-testing/build.gradle
index 0cf30b7..746fb4f 100644
--- a/core/core-animation-testing/build.gradle
+++ b/core/core-animation-testing/build.gradle
@@ -37,3 +37,7 @@
inceptionYear = "2018"
description = "This library provides functionalities for testing animations for API 14 and above."
}
+
+android {
+ namespace "androidx.core.animation.testing"
+}
diff --git a/core/core-animation-testing/src/main/AndroidManifest.xml b/core/core-animation-testing/src/main/AndroidManifest.xml
index 6f3cf86..dd3d3a3 100644
--- a/core/core-animation-testing/src/main/AndroidManifest.xml
+++ b/core/core-animation-testing/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.core.animation.testing" />
+<manifest />
diff --git a/core/core-animation/build.gradle b/core/core-animation/build.gradle
index 22a91f1..0b22cb9 100644
--- a/core/core-animation/build.gradle
+++ b/core/core-animation/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2018"
description = "This library provides functionalities for creating and manipulating animations for API 14 and above."
}
+
+android {
+ namespace "androidx.core.animation"
+}
diff --git a/core/core-animation/src/main/AndroidManifest.xml b/core/core-animation/src/main/AndroidManifest.xml
index 54c01ff..dd3d3a3 100644
--- a/core/core-animation/src/main/AndroidManifest.xml
+++ b/core/core-animation/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.core.animation" />
+<manifest />
diff --git a/core/core-appdigest/build.gradle b/core/core-appdigest/build.gradle
index 3185570..933ff4a 100644
--- a/core/core-appdigest/build.gradle
+++ b/core/core-appdigest/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2020"
description = "AndroidX AppDigest Library"
}
+
+android {
+ namespace "androidx.core.appdigest"
+}
diff --git a/core/core-appdigest/src/androidTest/AndroidManifest.xml b/core/core-appdigest/src/androidTest/AndroidManifest.xml
index 4dc7e5a..f60a1af 100644
--- a/core/core-appdigest/src/androidTest/AndroidManifest.xml
+++ b/core/core-appdigest/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.core.appdigest.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INSTALL_PACKAGES"/>
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
diff --git a/core/core-appdigest/src/main/AndroidManifest.xml b/core/core-appdigest/src/main/AndroidManifest.xml
index cd3b89a..3031a00 100644
--- a/core/core-appdigest/src/main/AndroidManifest.xml
+++ b/core/core-appdigest/src/main/AndroidManifest.xml
@@ -16,4 +16,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.core.appdigest" />
+<manifest />
diff --git a/core/core-google-shortcuts/build.gradle b/core/core-google-shortcuts/build.gradle
index 55f8b40..fab8e71 100644
--- a/core/core-google-shortcuts/build.gradle
+++ b/core/core-google-shortcuts/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.core.google.shortcuts"
}
dependencies {
diff --git a/core/core-google-shortcuts/src/androidTest/AndroidManifest.xml b/core/core-google-shortcuts/src/androidTest/AndroidManifest.xml
index f5f3686..de5ea9d 100644
--- a/core/core-google-shortcuts/src/androidTest/AndroidManifest.xml
+++ b/core/core-google-shortcuts/src/androidTest/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.core.google.shortcuts.test">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="com.google.firebase.icing"/>
<application android:name="androidx.multidex.MultiDexApplication">
<activity android:name=".TestActivity"/>
diff --git a/core/core-google-shortcuts/src/main/AndroidManifest.xml b/core/core-google-shortcuts/src/main/AndroidManifest.xml
index a775335..5850f1d 100644
--- a/core/core-google-shortcuts/src/main/AndroidManifest.xml
+++ b/core/core-google-shortcuts/src/main/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.core.google.shortcuts">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="com.google.firebase.icing"/>
<application>
<activity android:name=".TrampolineActivity"
diff --git a/core/core-graphics-integration-tests/testapp/build.gradle b/core/core-graphics-integration-tests/testapp/build.gradle
index c114e9c..ee49152 100644
--- a/core/core-graphics-integration-tests/testapp/build.gradle
+++ b/core/core-graphics-integration-tests/testapp/build.gradle
@@ -29,6 +29,7 @@
applicationId "androidx.core.graphics.sample"
minSdkVersion 17
}
+ namespace "androidx.core.graphics.sample"
}
dependencies {
diff --git a/core/core-graphics-integration-tests/testapp/src/main/AndroidManifest.xml b/core/core-graphics-integration-tests/testapp/src/main/AndroidManifest.xml
index 8479d6c..ce74895 100644
--- a/core/core-graphics-integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/core/core-graphics-integration-tests/testapp/src/main/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.core.graphics.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/ic_launcher"
diff --git a/core/core-i18n/build.gradle b/core/core-i18n/build.gradle
index 486fac0..70812f1 100644
--- a/core/core-i18n/build.gradle
+++ b/core/core-i18n/build.gradle
@@ -35,3 +35,7 @@
inceptionYear = "2022"
description = "This library provides functionality for good internationalization (messages, plurals, date / time formatting)."
}
+
+android {
+ namespace "androidx.core.i18n"
+}
diff --git a/core/core-i18n/src/androidTest/AndroidManifest.xml b/core/core-i18n/src/androidTest/AndroidManifest.xml
index c2e46aa1..280a186 100644
--- a/core/core-i18n/src/androidTest/AndroidManifest.xml
+++ b/core/core-i18n/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.core.i18n.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/core/core-i18n/src/main/AndroidManifest.xml b/core/core-i18n/src/main/AndroidManifest.xml
index ccf8549..ef5bd56 100644
--- a/core/core-i18n/src/main/AndroidManifest.xml
+++ b/core/core-i18n/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.core.i18n">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle
index 968ea4b..3905f13 100644
--- a/core/core-ktx/build.gradle
+++ b/core/core-ktx/build.gradle
@@ -28,3 +28,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'core' artifact"
}
+
+android {
+ namespace "androidx.core.ktx"
+}
diff --git a/core/core-ktx/src/androidTest/AndroidManifest.xml b/core/core-ktx/src/androidTest/AndroidManifest.xml
index 7c5e9a4..47b1c94 100644
--- a/core/core-ktx/src/androidTest/AndroidManifest.xml
+++ b/core/core-ktx/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.core.ktx.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.core.TestActivity"/>
</application>
diff --git a/core/core-ktx/src/main/AndroidManifest.xml b/core/core-ktx/src/main/AndroidManifest.xml
index 7f93e5e8..cc947c5 100644
--- a/core/core-ktx/src/main/AndroidManifest.xml
+++ b/core/core-ktx/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="androidx.core.ktx"/>
+<manifest />
diff --git a/core/core-performance/build.gradle b/core/core-performance/build.gradle
index 5d64e892..1d39483 100644
--- a/core/core-performance/build.gradle
+++ b/core/core-performance/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2021"
description = "This library makes it easy for developers to make UI and feature choices based on Android Performance Class level for GMS devices."
}
+
+android {
+ namespace "androidx.core.performance"
+}
diff --git a/core/core-performance/samples/build.gradle b/core/core-performance/samples/build.gradle
index a1905bb..f4f6e19 100644
--- a/core/core-performance/samples/build.gradle
+++ b/core/core-performance/samples/build.gradle
@@ -36,3 +36,7 @@
inceptionYear = "2021"
description = "Samples for AndroidX Core Performance Library"
}
+
+android {
+ namespace "androidx.core.performance.samples"
+}
diff --git a/core/core-performance/samples/src/androidTest/AndroidManifest.xml b/core/core-performance/samples/src/androidTest/AndroidManifest.xml
index badc86c..4d68dc2 100644
--- a/core/core-performance/samples/src/androidTest/AndroidManifest.xml
+++ b/core/core-performance/samples/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.core.performance.samples.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/core/core-performance/samples/src/main/AndroidManifest.xml b/core/core-performance/samples/src/main/AndroidManifest.xml
index de93147..037bd65 100644
--- a/core/core-performance/samples/src/main/AndroidManifest.xml
+++ b/core/core-performance/samples/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.core.performance.samples">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/core/core-performance/src/androidTest/AndroidManifest.xml b/core/core-performance/src/androidTest/AndroidManifest.xml
index 5584ebb..4d68dc2 100644
--- a/core/core-performance/src/androidTest/AndroidManifest.xml
+++ b/core/core-performance/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.core.performance.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/core/core-performance/src/main/AndroidManifest.xml b/core/core-performance/src/main/AndroidManifest.xml
index 6485e07..037bd65 100644
--- a/core/core-performance/src/main/AndroidManifest.xml
+++ b/core/core-performance/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.core.performance">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/core/core-remoteviews/build.gradle b/core/core-remoteviews/build.gradle
index 04d2fa6..269a817 100644
--- a/core/core-remoteviews/build.gradle
+++ b/core/core-remoteviews/build.gradle
@@ -56,6 +56,7 @@
includeAndroidResources = true
}
}
+ namespace "androidx.core.remoteviews"
}
androidx {
diff --git a/core/core-remoteviews/integration-tests/demos/build.gradle b/core/core-remoteviews/integration-tests/demos/build.gradle
index 66f4833..0103e3f 100644
--- a/core/core-remoteviews/integration-tests/demos/build.gradle
+++ b/core/core-remoteviews/integration-tests/demos/build.gradle
@@ -32,4 +32,5 @@
// part of CI.
archivesBaseName = "core-remoteviews-demos-testapp"
}
+ namespace "androidx.core.remoteviews.demos"
}
\ No newline at end of file
diff --git a/core/core-remoteviews/integration-tests/demos/src/main/AndroidManifest.xml b/core/core-remoteviews/integration-tests/demos/src/main/AndroidManifest.xml
index 25b3752..3007372 100644
--- a/core/core-remoteviews/integration-tests/demos/src/main/AndroidManifest.xml
+++ b/core/core-remoteviews/integration-tests/demos/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.core.remoteviews.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true"
diff --git a/core/core-remoteviews/src/androidTest/AndroidManifest.xml b/core/core-remoteviews/src/androidTest/AndroidManifest.xml
index fc5bef8..45beeba 100644
--- a/core/core-remoteviews/src/androidTest/AndroidManifest.xml
+++ b/core/core-remoteviews/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.core.remoteviews.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/core/core-remoteviews/src/main/AndroidManifest.xml b/core/core-remoteviews/src/main/AndroidManifest.xml
index 9435eb8..dfa6069 100644
--- a/core/core-remoteviews/src/main/AndroidManifest.xml
+++ b/core/core-remoteviews/src/main/AndroidManifest.xml
@@ -14,9 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest
- package="androidx.core.remoteviews"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application>
diff --git a/core/core-remoteviews/src/test/AndroidManifest.xml b/core/core-remoteviews/src/test/AndroidManifest.xml
index 830ef8e..3305ab6 100644
--- a/core/core-remoteviews/src/test/AndroidManifest.xml
+++ b/core/core-remoteviews/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-<manifest package="androidx.core.remoteviews.test">
+<manifest>
<application/>
</manifest>
diff --git a/core/core-role/build.gradle b/core/core-role/build.gradle
index 55b225a..0434c0f 100644
--- a/core/core-role/build.gradle
+++ b/core/core-role/build.gradle
@@ -21,3 +21,7 @@
inceptionYear = "2019"
description = "This Support Library provides names and documentation for roles."
}
+
+android {
+ namespace "androidx.core.role"
+}
diff --git a/core/core-role/src/main/AndroidManifest.xml b/core/core-role/src/main/AndroidManifest.xml
index 5587826..5e016ed 100644
--- a/core/core-role/src/main/AndroidManifest.xml
+++ b/core/core-role/src/main/AndroidManifest.xml
@@ -16,4 +16,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.core.role" />
+<manifest />
diff --git a/core/core-splashscreen/build.gradle b/core/core-splashscreen/build.gradle
index 799bc8b..bdaf21f 100644
--- a/core/core-splashscreen/build.gradle
+++ b/core/core-splashscreen/build.gradle
@@ -27,6 +27,7 @@
minSdkVersion 21
testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
}
+ namespace "androidx.core.splashscreen"
}
dependencies {
diff --git a/core/core-splashscreen/samples/build.gradle b/core/core-splashscreen/samples/build.gradle
index 4cf20fd..08b5b61 100644
--- a/core/core-splashscreen/samples/build.gradle
+++ b/core/core-splashscreen/samples/build.gradle
@@ -29,6 +29,7 @@
applicationId "androidx.core.splashscreen.samples"
minSdkVersion 21
}
+ namespace "androidx.core.splashscreen.sample"
}
dependencies {
diff --git a/core/core-splashscreen/samples/src/main/AndroidManifest.xml b/core/core-splashscreen/samples/src/main/AndroidManifest.xml
index d3d7463..f4322f0 100644
--- a/core/core-splashscreen/samples/src/main/AndroidManifest.xml
+++ b/core/core-splashscreen/samples/src/main/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.core.splashscreen.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/ic_launcher"
diff --git a/core/core-splashscreen/src/androidTest/AndroidManifest.xml b/core/core-splashscreen/src/androidTest/AndroidManifest.xml
index 8414ca5..2eefc02 100644
--- a/core/core-splashscreen/src/androidTest/AndroidManifest.xml
+++ b/core/core-splashscreen/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.core.splashscreen.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/core/core-splashscreen/src/main/AndroidManifest.xml b/core/core-splashscreen/src/main/AndroidManifest.xml
index df15dd4..a487c0d 100644
--- a/core/core-splashscreen/src/main/AndroidManifest.xml
+++ b/core/core-splashscreen/src/main/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.core.splashscreen"/>
\ 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/core/core/build.gradle b/core/core/build.gradle
index 47b5fe2..0381465 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -75,6 +75,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.core"
}
androidx {
diff --git a/core/core/src/androidTest/AndroidManifest.xml b/core/core/src/androidTest/AndroidManifest.xml
index 6981570..223a2a9 100644
--- a/core/core/src/androidTest/AndroidManifest.xml
+++ b/core/core/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="android.support.compat.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.multidex.MultiDexApplication"
diff --git a/core/core/src/main/AndroidManifest.xml b/core/core/src/main/AndroidManifest.xml
index 6c4338d..8481017 100644
--- a/core/core/src/main/AndroidManifest.xml
+++ b/core/core/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.core" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
</manifest>
diff --git a/core/uwb/uwb/build.gradle b/core/uwb/uwb/build.gradle
index 243a1eb..3793f28 100644
--- a/core/uwb/uwb/build.gradle
+++ b/core/uwb/uwb/build.gradle
@@ -34,3 +34,7 @@
inceptionYear = "2022"
description = "Public API surface for apps to use UWB (ultra-wideband) on supported devices."
}
+
+android {
+ namespace "androidx.core.uwb"
+}
diff --git a/core/uwb/uwb/src/androidTest/AndroidManifest.xml b/core/uwb/uwb/src/androidTest/AndroidManifest.xml
index a780163..280a186 100644
--- a/core/uwb/uwb/src/androidTest/AndroidManifest.xml
+++ b/core/uwb/uwb/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.core.uwb.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/core/uwb/uwb/src/main/AndroidManifest.xml b/core/uwb/uwb/src/main/AndroidManifest.xml
index b178397..ef5bd56 100644
--- a/core/uwb/uwb/src/main/AndroidManifest.xml
+++ b/core/uwb/uwb/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.core.uwb">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/cursoradapter/cursoradapter/build.gradle b/cursoradapter/cursoradapter/build.gradle
index fa5f2f2..1cecdf4 100644
--- a/cursoradapter/cursoradapter/build.gradle
+++ b/cursoradapter/cursoradapter/build.gradle
@@ -16,3 +16,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.cursoradapter"
+}
diff --git a/cursoradapter/cursoradapter/src/main/AndroidManifest.xml b/cursoradapter/cursoradapter/src/main/AndroidManifest.xml
index 396eeb6..6f49e23 100644
--- a/cursoradapter/cursoradapter/src/main/AndroidManifest.xml
+++ b/cursoradapter/cursoradapter/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.cursoradapter"/>
+<manifest />
diff --git a/customview/customview-poolingcontainer/build.gradle b/customview/customview-poolingcontainer/build.gradle
index ca3a359..c7ee78c 100644
--- a/customview/customview-poolingcontainer/build.gradle
+++ b/customview/customview-poolingcontainer/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = "2021"
description = "Utilities for listening to the lifecycle of containers that manage their child Views' lifecycle, such as RecyclerView"
}
+
+android {
+ namespace "androidx.customview.poolingcontainer"
+}
diff --git a/customview/customview-poolingcontainer/src/androidTest/AndroidManifest.xml b/customview/customview-poolingcontainer/src/androidTest/AndroidManifest.xml
index fe5e0c4..4d68dc2 100644
--- a/customview/customview-poolingcontainer/src/androidTest/AndroidManifest.xml
+++ b/customview/customview-poolingcontainer/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.customview.poolingcontainer.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/customview/customview-poolingcontainer/src/main/AndroidManifest.xml b/customview/customview-poolingcontainer/src/main/AndroidManifest.xml
index f2833fb..037bd65 100644
--- a/customview/customview-poolingcontainer/src/main/AndroidManifest.xml
+++ b/customview/customview-poolingcontainer/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.customview.poolingcontainer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/customview/customview/build.gradle b/customview/customview/build.gradle
index 153a44e..4f91368 100644
--- a/customview/customview/build.gradle
+++ b/customview/customview/build.gradle
@@ -28,3 +28,7 @@
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.customview"
+}
diff --git a/customview/customview/src/androidTest/AndroidManifest.xml b/customview/customview/src/androidTest/AndroidManifest.xml
index 4e5bad6..b5f4eb7 100644
--- a/customview/customview/src/androidTest/AndroidManifest.xml
+++ b/customview/customview/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.customview.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity android:name="androidx.customview.widget.ExploreByTouchHelperTestActivity" />
diff --git a/customview/customview/src/main/AndroidManifest.xml b/customview/customview/src/main/AndroidManifest.xml
index 0d5de0f..6f49e23 100644
--- a/customview/customview/src/main/AndroidManifest.xml
+++ b/customview/customview/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.customview"/>
+<manifest />
diff --git a/datastore/datastore-preferences-rxjava2/build.gradle b/datastore/datastore-preferences-rxjava2/build.gradle
index 7d4b7d1..e6b0f01 100644
--- a/datastore/datastore-preferences-rxjava2/build.gradle
+++ b/datastore/datastore-preferences-rxjava2/build.gradle
@@ -27,6 +27,7 @@
test.java.srcDirs += "src/test-common/java"
androidTest.java.srcDirs += "src/test-common/java"
}
+ namespace "androidx.datastore.preferences.rxjava2"
}
dependencies {
diff --git a/datastore/datastore-preferences-rxjava2/src/androidTest/AndroidManifest.xml b/datastore/datastore-preferences-rxjava2/src/androidTest/AndroidManifest.xml
index d9d7d76..57d1288 100644
--- a/datastore/datastore-preferences-rxjava2/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore-preferences-rxjava2/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.datastore.preferences.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
</manifest>
diff --git a/datastore/datastore-preferences-rxjava2/src/main/AndroidManifest.xml b/datastore/datastore-preferences-rxjava2/src/main/AndroidManifest.xml
index a3c8250..44beb7b 100644
--- a/datastore/datastore-preferences-rxjava2/src/main/AndroidManifest.xml
+++ b/datastore/datastore-preferences-rxjava2/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.datastore.preferences.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-preferences-rxjava3/build.gradle b/datastore/datastore-preferences-rxjava3/build.gradle
index 10f73d0..e77dd8f 100644
--- a/datastore/datastore-preferences-rxjava3/build.gradle
+++ b/datastore/datastore-preferences-rxjava3/build.gradle
@@ -27,6 +27,7 @@
test.java.srcDirs += "src/test-common/java"
androidTest.java.srcDirs += "src/test-common/java"
}
+ namespace "androidx.datastore.preferences.rxjava3"
}
dependencies {
diff --git a/datastore/datastore-preferences-rxjava3/src/androidTest/AndroidManifest.xml b/datastore/datastore-preferences-rxjava3/src/androidTest/AndroidManifest.xml
index 254f4b9..57d1288 100644
--- a/datastore/datastore-preferences-rxjava3/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore-preferences-rxjava3/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.datastore.preferences.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
</manifest>
diff --git a/datastore/datastore-preferences-rxjava3/src/main/AndroidManifest.xml b/datastore/datastore-preferences-rxjava3/src/main/AndroidManifest.xml
index 13f23ea..44beb7b 100644
--- a/datastore/datastore-preferences-rxjava3/src/main/AndroidManifest.xml
+++ b/datastore/datastore-preferences-rxjava3/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.datastore.preferences.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-preferences/build.gradle b/datastore/datastore-preferences/build.gradle
index d2f08eb..85d3156 100644
--- a/datastore/datastore-preferences/build.gradle
+++ b/datastore/datastore-preferences/build.gradle
@@ -26,6 +26,7 @@
buildTypes.all{
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.datastore.preferences"
}
dependencies {
diff --git a/datastore/datastore-preferences/src/androidTest/AndroidManifest.xml b/datastore/datastore-preferences/src/androidTest/AndroidManifest.xml
index cba85e7..8d40317 100644
--- a/datastore/datastore-preferences/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore-preferences/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.datastore.preferences">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
</manifest>
diff --git a/datastore/datastore-preferences/src/main/AndroidManifest.xml b/datastore/datastore-preferences/src/main/AndroidManifest.xml
index 699a6dd..44beb7b 100644
--- a/datastore/datastore-preferences/src/main/AndroidManifest.xml
+++ b/datastore/datastore-preferences/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.datastore.preferences">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-proto/build.gradle b/datastore/datastore-proto/build.gradle
index 4d3218f..7341958 100644
--- a/datastore/datastore-proto/build.gradle
+++ b/datastore/datastore-proto/build.gradle
@@ -62,3 +62,7 @@
description = "Android Proto DataStore"
runApiTasks = new RunApiTasks.No("Unreleased library.")
}
+
+android {
+ namespace "androidx.datastore.protodatastore"
+}
diff --git a/datastore/datastore-proto/src/androidTest/AndroidManifest.xml b/datastore/datastore-proto/src/androidTest/AndroidManifest.xml
index 22b935f..f519ad2 100644
--- a/datastore/datastore-proto/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore-proto/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.datastore.protodatastore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-proto/src/main/AndroidManifest.xml b/datastore/datastore-proto/src/main/AndroidManifest.xml
index 5dbbc87..44beb7b 100644
--- a/datastore/datastore-proto/src/main/AndroidManifest.xml
+++ b/datastore/datastore-proto/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.datastore.protodatastore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-rxjava2/build.gradle b/datastore/datastore-rxjava2/build.gradle
index a092ec0..3404275 100644
--- a/datastore/datastore-rxjava2/build.gradle
+++ b/datastore/datastore-rxjava2/build.gradle
@@ -27,6 +27,7 @@
test.java.srcDirs += "src/test-common/java"
androidTest.java.srcDirs += "src/test-common/java"
}
+ namespace "androidx.datastore.rxjava2"
}
dependencies {
diff --git a/datastore/datastore-rxjava2/src/androidTest/AndroidManifest.xml b/datastore/datastore-rxjava2/src/androidTest/AndroidManifest.xml
index a3f719a..6d8fd54 100644
--- a/datastore/datastore-rxjava2/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore-rxjava2/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.datastore.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
</manifest>
diff --git a/datastore/datastore-rxjava2/src/main/AndroidManifest.xml b/datastore/datastore-rxjava2/src/main/AndroidManifest.xml
index bf9d5c2..44beb7b 100644
--- a/datastore/datastore-rxjava2/src/main/AndroidManifest.xml
+++ b/datastore/datastore-rxjava2/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.datastore.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-rxjava3/build.gradle b/datastore/datastore-rxjava3/build.gradle
index 6474e84..86edf2b 100644
--- a/datastore/datastore-rxjava3/build.gradle
+++ b/datastore/datastore-rxjava3/build.gradle
@@ -27,6 +27,7 @@
test.java.srcDirs += "src/test-common/java"
androidTest.java.srcDirs += "src/test-common/java"
}
+ namespace "androidx.datastore.rxjava3"
}
dependencies {
diff --git a/datastore/datastore-rxjava3/src/androidTest/AndroidManifest.xml b/datastore/datastore-rxjava3/src/androidTest/AndroidManifest.xml
index 6142afe..6d8fd54 100644
--- a/datastore/datastore-rxjava3/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore-rxjava3/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.datastore.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
</manifest>
diff --git a/datastore/datastore-rxjava3/src/main/AndroidManifest.xml b/datastore/datastore-rxjava3/src/main/AndroidManifest.xml
index 3369992..44beb7b 100644
--- a/datastore/datastore-rxjava3/src/main/AndroidManifest.xml
+++ b/datastore/datastore-rxjava3/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.datastore.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/datastore/datastore-sampleapp/build.gradle b/datastore/datastore-sampleapp/build.gradle
index fde2a42..8541e0f 100644
--- a/datastore/datastore-sampleapp/build.gradle
+++ b/datastore/datastore-sampleapp/build.gradle
@@ -66,6 +66,10 @@
}
}
+android {
+ namespace "com.example.datastoresampleapp"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/datastore/datastore-sampleapp/src/main/AndroidManifest.xml b/datastore/datastore-sampleapp/src/main/AndroidManifest.xml
index 2aebdbb..f1d0bd7 100644
--- a/datastore/datastore-sampleapp/src/main/AndroidManifest.xml
+++ b/datastore/datastore-sampleapp/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.datastoresampleapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/datastore/datastore/build.gradle b/datastore/datastore/build.gradle
index 14fe4bd0..6979e48 100644
--- a/datastore/datastore/build.gradle
+++ b/datastore/datastore/build.gradle
@@ -30,6 +30,7 @@
kotlin.srcDirs += test.kotlin.srcDirs
}
}
+ namespace "androidx.datastore.datastore"
}
dependencies {
diff --git a/datastore/datastore/src/androidTest/AndroidManifest.xml b/datastore/datastore/src/androidTest/AndroidManifest.xml
index 5929169..6d8fd54 100644
--- a/datastore/datastore/src/androidTest/AndroidManifest.xml
+++ b/datastore/datastore/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.datastore.datastore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
</manifest>
diff --git a/datastore/datastore/src/main/AndroidManifest.xml b/datastore/datastore/src/main/AndroidManifest.xml
index 5e89612..44beb7b 100644
--- a/datastore/datastore/src/main/AndroidManifest.xml
+++ b/datastore/datastore/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.datastore.datastore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/documentfile/documentfile/build.gradle b/documentfile/documentfile/build.gradle
index 3ca4df3..c8f0ff5 100644
--- a/documentfile/documentfile/build.gradle
+++ b/documentfile/documentfile/build.gradle
@@ -23,3 +23,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.documentfile"
+}
diff --git a/documentfile/documentfile/src/main/AndroidManifest.xml b/documentfile/documentfile/src/main/AndroidManifest.xml
index b59d290..6f49e23 100644
--- a/documentfile/documentfile/src/main/AndroidManifest.xml
+++ b/documentfile/documentfile/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.documentfile"/>
+<manifest />
diff --git a/draganddrop/draganddrop/build.gradle b/draganddrop/draganddrop/build.gradle
index 60066c8..9595f67 100644
--- a/draganddrop/draganddrop/build.gradle
+++ b/draganddrop/draganddrop/build.gradle
@@ -41,6 +41,7 @@
minSdkVersion 24
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.draganddrop"
}
androidx {
diff --git a/draganddrop/draganddrop/src/androidTest/AndroidManifest.xml b/draganddrop/draganddrop/src/androidTest/AndroidManifest.xml
index ba8b531..a1bc555 100644
--- a/draganddrop/draganddrop/src/androidTest/AndroidManifest.xml
+++ b/draganddrop/draganddrop/src/androidTest/AndroidManifest.xml
@@ -12,8 +12,7 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.draganddrop.test">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/draganddrop/draganddrop/src/main/AndroidManifest.xml b/draganddrop/draganddrop/src/main/AndroidManifest.xml
index eaef83d..b9b224d 100644
--- a/draganddrop/draganddrop/src/main/AndroidManifest.xml
+++ b/draganddrop/draganddrop/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
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.draganddrop">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/draganddrop/integration-tests/sampleapp/build.gradle b/draganddrop/integration-tests/sampleapp/build.gradle
index 903296d..526aaeb9 100644
--- a/draganddrop/integration-tests/sampleapp/build.gradle
+++ b/draganddrop/integration-tests/sampleapp/build.gradle
@@ -28,4 +28,5 @@
defaultConfig {
minSdkVersion 24
}
+ namespace "androidx.draganddrop.sampleapp"
}
diff --git a/draganddrop/integration-tests/sampleapp/src/main/AndroidManifest.xml b/draganddrop/integration-tests/sampleapp/src/main/AndroidManifest.xml
index d49ac61..915fc2e 100644
--- a/draganddrop/integration-tests/sampleapp/src/main/AndroidManifest.xml
+++ b/draganddrop/integration-tests/sampleapp/src/main/AndroidManifest.xml
@@ -12,8 +12,7 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.draganddrop.sampleapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
android:label="DropHelper"
diff --git a/drawerlayout/drawerlayout/build.gradle b/drawerlayout/drawerlayout/build.gradle
index 6b9aed4..4e5ebdd 100644
--- a/drawerlayout/drawerlayout/build.gradle
+++ b/drawerlayout/drawerlayout/build.gradle
@@ -24,3 +24,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.drawerlayout"
+}
diff --git a/drawerlayout/drawerlayout/src/androidTest/AndroidManifest.xml b/drawerlayout/drawerlayout/src/androidTest/AndroidManifest.xml
index 5ebe8e7..62cff76 100644
--- a/drawerlayout/drawerlayout/src/androidTest/AndroidManifest.xml
+++ b/drawerlayout/drawerlayout/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.drawerlayout.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true">
diff --git a/drawerlayout/drawerlayout/src/main/AndroidManifest.xml b/drawerlayout/drawerlayout/src/main/AndroidManifest.xml
index b739005..6f49e23 100644
--- a/drawerlayout/drawerlayout/src/main/AndroidManifest.xml
+++ b/drawerlayout/drawerlayout/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.drawerlayout"/>
+<manifest />
diff --git a/dynamicanimation/dynamicanimation-ktx/build.gradle b/dynamicanimation/dynamicanimation-ktx/build.gradle
index 62726bc..86d67a5 100644
--- a/dynamicanimation/dynamicanimation-ktx/build.gradle
+++ b/dynamicanimation/dynamicanimation-ktx/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'dynamicanimation' artifact"
}
+
+android {
+ namespace "androidx.dynamicanimation.ktx"
+}
diff --git a/dynamicanimation/dynamicanimation-ktx/src/androidTest/AndroidManifest.xml b/dynamicanimation/dynamicanimation-ktx/src/androidTest/AndroidManifest.xml
index 62f7402..bf4f004 100755
--- a/dynamicanimation/dynamicanimation-ktx/src/androidTest/AndroidManifest.xml
+++ b/dynamicanimation/dynamicanimation-ktx/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.dynamicanimation.ktx.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity android:name="androidx.dynamicanimation.tests.AnimationActivity"/>
diff --git a/dynamicanimation/dynamicanimation-ktx/src/main/AndroidManifest.xml b/dynamicanimation/dynamicanimation-ktx/src/main/AndroidManifest.xml
index 2db6f1d..9db011d 100644
--- a/dynamicanimation/dynamicanimation-ktx/src/main/AndroidManifest.xml
+++ b/dynamicanimation/dynamicanimation-ktx/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.dynamicanimation.ktx"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/dynamicanimation/dynamicanimation/build.gradle b/dynamicanimation/dynamicanimation/build.gradle
index 18ae92b..28edc21 100644
--- a/dynamicanimation/dynamicanimation/build.gradle
+++ b/dynamicanimation/dynamicanimation/build.gradle
@@ -26,3 +26,7 @@
inceptionYear = "2017"
description = "Physics-based animation in support library, where the animations are driven by physics force. You can use this Animation library to create smooth and realistic animations."
}
+
+android {
+ namespace "androidx.dynamicanimation"
+}
diff --git a/dynamicanimation/dynamicanimation/src/androidTest/AndroidManifest.xml b/dynamicanimation/dynamicanimation/src/androidTest/AndroidManifest.xml
index af02a67..6e188908 100755
--- a/dynamicanimation/dynamicanimation/src/androidTest/AndroidManifest.xml
+++ b/dynamicanimation/dynamicanimation/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.dynamicanimation.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity android:name="androidx.dynamicanimation.tests.AnimationActivity"/>
diff --git a/dynamicanimation/dynamicanimation/src/main/AndroidManifest.xml b/dynamicanimation/dynamicanimation/src/main/AndroidManifest.xml
index 7ebad0e..95c4426 100644
--- a/dynamicanimation/dynamicanimation/src/main/AndroidManifest.xml
+++ b/dynamicanimation/dynamicanimation/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.dynamicanimation"/>
+<manifest />
diff --git a/emoji/emoji-appcompat/build.gradle b/emoji/emoji-appcompat/build.gradle
index 4f96bfa..95fd6fb 100644
--- a/emoji/emoji-appcompat/build.gradle
+++ b/emoji/emoji-appcompat/build.gradle
@@ -34,3 +34,7 @@
inceptionYear = "2017"
description = "EmojiCompat Widgets for AppCompat integration"
}
+
+android {
+ namespace "androidx.emoji.appcompat"
+}
diff --git a/emoji/emoji-appcompat/src/main/AndroidManifest.xml b/emoji/emoji-appcompat/src/main/AndroidManifest.xml
index b5e734f..c7003d8 100644
--- a/emoji/emoji-appcompat/src/main/AndroidManifest.xml
+++ b/emoji/emoji-appcompat/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.emoji.appcompat"/>
+<manifest />
diff --git a/emoji/emoji-bundled/build.gradle b/emoji/emoji-bundled/build.gradle
index e4a89a9..5e925f9 100644
--- a/emoji/emoji-bundled/build.gradle
+++ b/emoji/emoji-bundled/build.gradle
@@ -13,6 +13,7 @@
sourceSets {
main.assets.srcDirs new File(fontDir, "font").getAbsolutePath()
}
+ namespace "androidx.emoji.bundled"
}
dependencies {
diff --git a/emoji/emoji-bundled/src/main/AndroidManifest.xml b/emoji/emoji-bundled/src/main/AndroidManifest.xml
index 56ac589..c50336e 100644
--- a/emoji/emoji-bundled/src/main/AndroidManifest.xml
+++ b/emoji/emoji-bundled/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.emoji.bundled"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/emoji/emoji/build.gradle b/emoji/emoji/build.gradle
index f154351..01e5f7de 100644
--- a/emoji/emoji/build.gradle
+++ b/emoji/emoji/build.gradle
@@ -36,8 +36,6 @@
android {
sourceSets {
main {
- // We use a non-standard manifest path.
- manifest.srcFile "AndroidManifest.xml"
res.srcDirs += "src/main/res-public"
resources {
srcDirs += [fontDir.getAbsolutePath()]
@@ -52,6 +50,7 @@
}
}
}
+ namespace "androidx.emoji"
}
androidx {
diff --git a/emoji/emoji/src/androidTest/AndroidManifest.xml b/emoji/emoji/src/androidTest/AndroidManifest.xml
index 1c1136d..ce96647 100644
--- a/emoji/emoji/src/androidTest/AndroidManifest.xml
+++ b/emoji/emoji/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.emoji.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.emoji.text.TestActivity"/>
diff --git a/emoji/emoji/AndroidManifest.xml b/emoji/emoji/src/main/AndroidManifest.xml
similarity index 94%
rename from emoji/emoji/AndroidManifest.xml
rename to emoji/emoji/src/main/AndroidManifest.xml
index e6d2f27..a213cdc 100644
--- a/emoji/emoji/AndroidManifest.xml
+++ b/emoji/emoji/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.emoji"/>
+<manifest/>
diff --git a/emoji2/emoji2-benchmark/build.gradle b/emoji2/emoji2-benchmark/build.gradle
index 3ac84f7..c65c7c3 100644
--- a/emoji2/emoji2-benchmark/build.gradle
+++ b/emoji2/emoji2-benchmark/build.gradle
@@ -35,6 +35,7 @@
}
}
}
+ namespace "androidx.emoji2.benchmark"
}
diff --git a/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml b/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml
index 5a4a164..097b102 100644
--- a/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml
+++ b/emoji2/emoji2-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.emoji2.benchmark">
+ 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/emoji2/emoji2-benchmark/src/main/AndroidManifest.xml b/emoji2/emoji2-benchmark/src/main/AndroidManifest.xml
index a5a978e..29b496b 100644
--- a/emoji2/emoji2-benchmark/src/main/AndroidManifest.xml
+++ b/emoji2/emoji2-benchmark/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.emoji2.benchmark" />
+<manifest />
diff --git a/emoji2/emoji2-bundled/build.gradle b/emoji2/emoji2-bundled/build.gradle
index 302e680..0ea043e 100644
--- a/emoji2/emoji2-bundled/build.gradle
+++ b/emoji2/emoji2-bundled/build.gradle
@@ -25,6 +25,7 @@
}
}
}
+ namespace "androidx.emoji2.bundled"
}
diff --git a/emoji2/emoji2-bundled/src/androidTest/AndroidManifest.xml b/emoji2/emoji2-bundled/src/androidTest/AndroidManifest.xml
index 8873b81..5a0da8e 100644
--- a/emoji2/emoji2-bundled/src/androidTest/AndroidManifest.xml
+++ b/emoji2/emoji2-bundled/src/androidTest/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.emoji2.bundled.test">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<activity android:name="androidx.emoji2.bundled.TestActivity"/>
diff --git a/emoji2/emoji2-bundled/src/main/AndroidManifest.xml b/emoji2/emoji2-bundled/src/main/AndroidManifest.xml
index 53ef478..f9bfd6e 100644
--- a/emoji2/emoji2-bundled/src/main/AndroidManifest.xml
+++ b/emoji2/emoji2-bundled/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.emoji2.bundled"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application>
<provider
diff --git a/emoji2/emoji2-views-helper/build.gradle b/emoji2/emoji2-views-helper/build.gradle
index e9e23e2..667f154 100644
--- a/emoji2/emoji2-views-helper/build.gradle
+++ b/emoji2/emoji2-views-helper/build.gradle
@@ -29,6 +29,7 @@
manifest.srcFile 'AndroidManifest.xml'
}
}
+ namespace "androidx.emoji2.viewsintegration"
}
androidx {
diff --git a/emoji2/emoji2-views-helper/src/androidTest/AndroidManifest.xml b/emoji2/emoji2-views-helper/src/androidTest/AndroidManifest.xml
index 05a087b..63f527c 100644
--- a/emoji2/emoji2-views-helper/src/androidTest/AndroidManifest.xml
+++ b/emoji2/emoji2-views-helper/src/androidTest/AndroidManifest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.emoji2.viewsintegration">
+<manifest>
<application>
</application>
diff --git a/emoji2/emoji2-views/build.gradle b/emoji2/emoji2-views/build.gradle
index c6c836f..a53c92e 100644
--- a/emoji2/emoji2-views/build.gradle
+++ b/emoji2/emoji2-views/build.gradle
@@ -29,6 +29,7 @@
res.srcDirs += 'src/main/res-public'
}
}
+ namespace "androidx.emoji2.widget"
}
androidx {
diff --git a/emoji2/emoji2-views/src/main/AndroidManifest.xml b/emoji2/emoji2-views/src/main/AndroidManifest.xml
index 523feaf..95c4426 100644
--- a/emoji2/emoji2-views/src/main/AndroidManifest.xml
+++ b/emoji2/emoji2-views/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.emoji2.widget"/>
+<manifest />
diff --git a/emoji2/emoji2/build.gradle b/emoji2/emoji2/build.gradle
index 9c5c245..888aa92 100644
--- a/emoji2/emoji2/build.gradle
+++ b/emoji2/emoji2/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = "2017"
description = "Core library to enable emoji compatibility in Kitkat and newer devices to avoid the empty emoji characters."
}
+
+android {
+ namespace "androidx.emoji2"
+}
diff --git a/emoji2/emoji2/src/main/AndroidManifest.xml b/emoji2/emoji2/src/main/AndroidManifest.xml
index fb555375..b254c48 100644
--- a/emoji2/emoji2/src/main/AndroidManifest.xml
+++ b/emoji2/emoji2/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.emoji2"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application>
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle b/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle
index 00d0464..90e2ff4 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle
+++ b/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle
@@ -28,6 +28,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ namespace "androidx.emoji2.integration.macrobenchmark.disabled.target"
}
dependencies {
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml b/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml
index 09a6be3..6b03d53 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-disabled-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.emoji2.integration.macrobenchmark.disabled.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Emoji2 Init Enabled Macrobenchmark Target"
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle b/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle
index 19bfb27..2ac639c 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle
+++ b/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle
@@ -24,6 +24,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.emoji2.integration.macrobenchmark.disabled"
}
dependencies {
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark/src/androidTest/AndroidManifest.xml b/emoji2/integration-tests/init-disabled-macrobenchmark/src/androidTest/AndroidManifest.xml
index 67818b1..5b41847 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-disabled-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.emoji2.integration.macrobenchmark.disabled.test"/>
+<manifest />
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark/src/main/AndroidManifest.xml b/emoji2/integration-tests/init-disabled-macrobenchmark/src/main/AndroidManifest.xml
index 0ca6a87..ed173d5 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark/src/main/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-disabled-macrobenchmark/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.emoji2.integration.macrobenchmark.disabled" />
+<manifest />
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle b/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle
index 8985bb8..2c83547 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle
+++ b/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle
@@ -28,6 +28,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ namespace "androidx.emoji2.integration.macrobenchmark.enabled.target"
}
dependencies {
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml b/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml
index 2dfe314..3ae30c7 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-enabled-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.emoji2.integration.macrobenchmark.enabled.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Emoji2 Init Enabled Macrobenchmark Target"
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle b/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle
index 89dc501..bdf94f1 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle
+++ b/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle
@@ -24,6 +24,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.emoji2.integration.macrobenchmark.enabled"
}
dependencies {
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark/src/androidTest/AndroidManifest.xml b/emoji2/integration-tests/init-enabled-macrobenchmark/src/androidTest/AndroidManifest.xml
index dbacc9c..5b41847 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-enabled-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.emoji2.integration.macrobenchmark.enabled.test"/>
+<manifest />
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark/src/main/AndroidManifest.xml b/emoji2/integration-tests/init-enabled-macrobenchmark/src/main/AndroidManifest.xml
index 040c742..ed173d5 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark/src/main/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-enabled-macrobenchmark/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.emoji2.integration.macrobenchmark.enabled" />
+<manifest />
diff --git a/enterprise/enterprise-feedback-testing/build.gradle b/enterprise/enterprise-feedback-testing/build.gradle
index 42405af..b416d05 100644
--- a/enterprise/enterprise-feedback-testing/build.gradle
+++ b/enterprise/enterprise-feedback-testing/build.gradle
@@ -30,6 +30,7 @@
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.enterprise.feedback.testing"
}
androidx {
name = "Enterprise Feedback Testing"
diff --git a/enterprise/enterprise-feedback-testing/src/main/AndroidManifest.xml b/enterprise/enterprise-feedback-testing/src/main/AndroidManifest.xml
index 616df61..de53569 100644
--- a/enterprise/enterprise-feedback-testing/src/main/AndroidManifest.xml
+++ b/enterprise/enterprise-feedback-testing/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.enterprise.feedback.testing" />
+<manifest />
diff --git a/enterprise/enterprise-feedback/build.gradle b/enterprise/enterprise-feedback/build.gradle
index be10f07..8b6fdad 100644
--- a/enterprise/enterprise-feedback/build.gradle
+++ b/enterprise/enterprise-feedback/build.gradle
@@ -20,6 +20,7 @@
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.enterprise.feedback"
}
androidx {
diff --git a/enterprise/enterprise-feedback/src/main/AndroidManifest.xml b/enterprise/enterprise-feedback/src/main/AndroidManifest.xml
index 3dc468a..3ea10a5 100644
--- a/enterprise/enterprise-feedback/src/main/AndroidManifest.xml
+++ b/enterprise/enterprise-feedback/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.enterprise.feedback">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<intent>
<action android:name="androidx.enterprise.feedback.action.APP_STATES" />
diff --git a/exifinterface/exifinterface/build.gradle b/exifinterface/exifinterface/build.gradle
index 8463e2e..bc3b537 100644
--- a/exifinterface/exifinterface/build.gradle
+++ b/exifinterface/exifinterface/build.gradle
@@ -21,3 +21,7 @@
inceptionYear = "2016"
description = "Android Support ExifInterface"
}
+
+android {
+ namespace "androidx.exifinterface"
+}
diff --git a/exifinterface/exifinterface/src/androidTest/AndroidManifest.xml b/exifinterface/exifinterface/src/androidTest/AndroidManifest.xml
index aae9108..4a52ffb 100644
--- a/exifinterface/exifinterface/src/androidTest/AndroidManifest.xml
+++ b/exifinterface/exifinterface/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.exifinterface.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/exifinterface/exifinterface/src/main/AndroidManifest.xml b/exifinterface/exifinterface/src/main/AndroidManifest.xml
index 9385134..5197378 100644
--- a/exifinterface/exifinterface/src/main/AndroidManifest.xml
+++ b/exifinterface/exifinterface/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.exifinterface"/>
+<manifest />
diff --git a/external/libyuv/build.gradle b/external/libyuv/build.gradle
index b5a365a..3fc8c1e 100644
--- a/external/libyuv/build.gradle
+++ b/external/libyuv/build.gradle
@@ -55,6 +55,7 @@
name "yuv"
}
}
+ namespace "com.google.libyuv"
}
androidx {
diff --git a/external/libyuv/src/main/AndroidManifest.xml b/external/libyuv/src/main/AndroidManifest.xml
index 84f2e61..95ab252 100644
--- a/external/libyuv/src/main/AndroidManifest.xml
+++ b/external/libyuv/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="com.google.libyuv" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/fragment/fragment-ktx/build.gradle b/fragment/fragment-ktx/build.gradle
index 8101c25..7885896 100644
--- a/fragment/fragment-ktx/build.gradle
+++ b/fragment/fragment-ktx/build.gradle
@@ -61,6 +61,10 @@
description = "Kotlin extensions for 'fragment' artifact"
}
+android {
+ namespace "androidx.fragment.ktx"
+}
+
// needed only while https://youtrack.jetbrains.com/issue/KT-47000 isn't resolved which is
// targeted to 1.6
tasks.withType(KotlinCompile).configureEach {
diff --git a/fragment/fragment-ktx/src/androidTest/AndroidManifest.xml b/fragment/fragment-ktx/src/androidTest/AndroidManifest.xml
index 2c7f4f7..b80e1b7 100644
--- a/fragment/fragment-ktx/src/androidTest/AndroidManifest.xml
+++ b/fragment/fragment-ktx/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.fragment.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.fragment.app.TestActivity"/>
<activity android:name="androidx.fragment.app.FragmentViewModelLazyTest$TestActivity"/>
diff --git a/fragment/fragment-ktx/src/main/AndroidManifest.xml b/fragment/fragment-ktx/src/main/AndroidManifest.xml
index cd21eb1..dd3d3a3 100644
--- a/fragment/fragment-ktx/src/main/AndroidManifest.xml
+++ b/fragment/fragment-ktx/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.fragment.ktx"/>
+<manifest />
diff --git a/fragment/fragment-lint/src/main/AndroidManifest.xml b/fragment/fragment-lint/src/main/AndroidManifest.xml
deleted file mode 100644
index c7fb82d..0000000
--- a/fragment/fragment-lint/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2019 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<manifest package="androidx.fragment.lint"/>
diff --git a/fragment/fragment-testing-lint/src/main/AndroidManifest.xml b/fragment/fragment-testing-lint/src/main/AndroidManifest.xml
deleted file mode 100644
index 7aa73d9..0000000
--- a/fragment/fragment-testing-lint/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2019 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<manifest package="androidx.fragment.testing.lint"/>
diff --git a/fragment/fragment-testing/build.gradle b/fragment/fragment-testing/build.gradle
index 363e02c..8314791 100644
--- a/fragment/fragment-testing/build.gradle
+++ b/fragment/fragment-testing/build.gradle
@@ -48,6 +48,10 @@
description = "Extensions for testing 'fragment' artifact"
}
+android {
+ namespace "androidx.fragment.testing"
+}
+
// needed only while https://youtrack.jetbrains.com/issue/KT-47000 isn't resolved which is
// targeted to 1.6
tasks.withType(KotlinCompile).configureEach {
diff --git a/fragment/fragment-testing/src/androidTest/AndroidManifest.xml b/fragment/fragment-testing/src/androidTest/AndroidManifest.xml
index 4d3baca..ebca931 100644
--- a/fragment/fragment-testing/src/androidTest/AndroidManifest.xml
+++ b/fragment/fragment-testing/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ 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.fragment.testing.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/fragment/fragment-testing/src/main/AndroidManifest.xml b/fragment/fragment-testing/src/main/AndroidManifest.xml
index 0b3eb19..9b9e0e1a 100644
--- a/fragment/fragment-testing/src/main/AndroidManifest.xml
+++ b/fragment/fragment-testing/src/main/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.fragment.testing">
+ xmlns:tools="http://schemas.android.com/tools">
<!-- TODO: Remove this override after androidx.test:core lowers the level -->
<uses-sdk tools:overrideLibrary="androidx.test.core" />
<uses-permission android:name="android.permission.REORDER_TASKS" />
diff --git a/fragment/fragment-truth/build.gradle b/fragment/fragment-truth/build.gradle
index 3cbfff9..33147bb 100644
--- a/fragment/fragment-truth/build.gradle
+++ b/fragment/fragment-truth/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2019"
description = "Truth extensions for Fragments"
}
+
+android {
+ namespace "androidx.fragment.truth"
+}
diff --git a/fragment/fragment-truth/src/androidTest/AndroidManifest.xml b/fragment/fragment-truth/src/androidTest/AndroidManifest.xml
index c31fdd4..e55d45c 100644
--- a/fragment/fragment-truth/src/androidTest/AndroidManifest.xml
+++ b/fragment/fragment-truth/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.fragment.truth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.fragment.app.truth.TestActivity"/>
</application>
diff --git a/fragment/fragment-truth/src/main/AndroidManifest.xml b/fragment/fragment-truth/src/main/AndroidManifest.xml
index 76dece2..cf0d807 100644
--- a/fragment/fragment-truth/src/main/AndroidManifest.xml
+++ b/fragment/fragment-truth/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.fragment.truth"/>
+<manifest />
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index 5a4961a..6dfaa57 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -20,6 +20,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.fragment"
}
dependencies {
diff --git a/fragment/fragment/src/androidTest/AndroidManifest.xml b/fragment/fragment/src/androidTest/AndroidManifest.xml
index e845180..7199829 100644
--- a/fragment/fragment/src/androidTest/AndroidManifest.xml
+++ b/fragment/fragment/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="android.support.fragment.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/fragment/fragment/src/main/AndroidManifest.xml b/fragment/fragment/src/main/AndroidManifest.xml
index 556bd67..6f49e23 100644
--- a/fragment/fragment/src/main/AndroidManifest.xml
+++ b/fragment/fragment/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.fragment"/>
+<manifest />
diff --git a/fragment/integration-tests/testapp/build.gradle b/fragment/integration-tests/testapp/build.gradle
index 76b4948..f49848c 100644
--- a/fragment/integration-tests/testapp/build.gradle
+++ b/fragment/integration-tests/testapp/build.gradle
@@ -29,6 +29,7 @@
]
}
}
+ namespace "androidx.fragment.testapp"
}
dependencies {
diff --git a/fragment/integration-tests/testapp/src/main/AndroidManifest.xml b/fragment/integration-tests/testapp/src/main/AndroidManifest.xml
index b6e1c847..19d7b02 100644
--- a/fragment/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/fragment/integration-tests/testapp/src/main/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.fragment.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle
index 2d6f1b2..c3d68b0 100644
--- a/glance/glance-appwidget/build.gradle
+++ b/glance/glance-appwidget/build.gradle
@@ -101,6 +101,7 @@
pseudoLocalesEnabled true
}
}
+ namespace "androidx.glance.appwidget"
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
diff --git a/glance/glance-appwidget/integration-tests/demos/build.gradle b/glance/glance-appwidget/integration-tests/demos/build.gradle
index a7b7606..3629077 100644
--- a/glance/glance-appwidget/integration-tests/demos/build.gradle
+++ b/glance/glance-appwidget/integration-tests/demos/build.gradle
@@ -44,4 +44,5 @@
// part of CI.
archivesBaseName = "glance-appwidget-demos-testapp"
}
+ namespace "androidx.glance.appwidget.demos"
}
diff --git a/glance/glance-appwidget/integration-tests/demos/src/main/AndroidManifest.xml b/glance/glance-appwidget/integration-tests/demos/src/main/AndroidManifest.xml
index 4664d0c..e296260 100644
--- a/glance/glance-appwidget/integration-tests/demos/src/main/AndroidManifest.xml
+++ b/glance/glance-appwidget/integration-tests/demos/src/main/AndroidManifest.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest
- package="androidx.glance.appwidget.demos"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application
diff --git a/glance/glance-appwidget/src/androidAndroidTest/AndroidManifest.xml b/glance/glance-appwidget/src/androidAndroidTest/AndroidManifest.xml
index 42ed3b7..a5109a5 100644
--- a/glance/glance-appwidget/src/androidAndroidTest/AndroidManifest.xml
+++ b/glance/glance-appwidget/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.glance.appwidget">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
<application
diff --git a/glance/glance-appwidget/src/androidMain/AndroidManifest.xml b/glance/glance-appwidget/src/androidMain/AndroidManifest.xml
index 864fe5a..65aedb9 100644
--- a/glance/glance-appwidget/src/androidMain/AndroidManifest.xml
+++ b/glance/glance-appwidget/src/androidMain/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.glance.appwidget" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".action.ActionTrampolineActivity"
diff --git a/glance/glance-appwidget/src/test/AndroidManifest.xml b/glance/glance-appwidget/src/test/AndroidManifest.xml
index 7a7d8bf..f512ebb 100644
--- a/glance/glance-appwidget/src/test/AndroidManifest.xml
+++ b/glance/glance-appwidget/src/test/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.glance.appwidget.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
<application>
<receiver
diff --git a/glance/glance-wear-tiles/build.gradle b/glance/glance-wear-tiles/build.gradle
index 82b0476..8d50394 100644
--- a/glance/glance-wear-tiles/build.gradle
+++ b/glance/glance-wear-tiles/build.gradle
@@ -83,6 +83,7 @@
sourceSets {
androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/glance/glance-wear-tiles"
}
+ namespace "androidx.glance.wear.tiles"
}
diff --git a/glance/glance-wear-tiles/integration-tests/demos/build.gradle b/glance/glance-wear-tiles/integration-tests/demos/build.gradle
index e5d36ea..7133006 100644
--- a/glance/glance-wear-tiles/integration-tests/demos/build.gradle
+++ b/glance/glance-wear-tiles/integration-tests/demos/build.gradle
@@ -40,4 +40,5 @@
// part of CI
archivesBaseName = "glance-wear-tiles-demos-testapp"
}
+ namespace "androidx.glance.wear.tiles.demos"
}
\ No newline at end of file
diff --git a/glance/glance-wear-tiles/integration-tests/demos/src/main/AndroidManifest.xml b/glance/glance-wear-tiles/integration-tests/demos/src/main/AndroidManifest.xml
index 134bc53..8bd21e4 100644
--- a/glance/glance-wear-tiles/integration-tests/demos/src/main/AndroidManifest.xml
+++ b/glance/glance-wear-tiles/integration-tests/demos/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.glance.wear.tiles.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.type.watch" />
<meta-data android:name="com.google.android.wearable.standalone" android:value="true" />
diff --git a/glance/glance-wear-tiles/src/androidAndroidTest/AndroidManifest.xml b/glance/glance-wear-tiles/src/androidAndroidTest/AndroidManifest.xml
index 4697719..3c3c224 100644
--- a/glance/glance-wear-tiles/src/androidAndroidTest/AndroidManifest.xml
+++ b/glance/glance-wear-tiles/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.glance.wear.tiles" />
+<manifest />
diff --git a/glance/glance-wear-tiles/src/androidMain/AndroidManifest.xml b/glance/glance-wear-tiles/src/androidMain/AndroidManifest.xml
index 4697719..3c3c224 100644
--- a/glance/glance-wear-tiles/src/androidMain/AndroidManifest.xml
+++ b/glance/glance-wear-tiles/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.glance.wear.tiles" />
+<manifest />
diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle
index 8a7e176..32c241b 100644
--- a/glance/glance/build.gradle
+++ b/glance/glance/build.gradle
@@ -60,6 +60,7 @@
android {
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.glance"
}
androidx {
diff --git a/glance/glance/src/androidMain/AndroidManifest.xml b/glance/glance/src/androidMain/AndroidManifest.xml
index 0d2ec2a..3c3c224 100644
--- a/glance/glance/src/androidMain/AndroidManifest.xml
+++ b/glance/glance/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.glance" />
+<manifest />
diff --git a/gridlayout/gridlayout/build.gradle b/gridlayout/gridlayout/build.gradle
index 6e3495b..63b8dfb 100644
--- a/gridlayout/gridlayout/build.gradle
+++ b/gridlayout/gridlayout/build.gradle
@@ -24,3 +24,7 @@
description = "Android Support Grid Layout"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.gridlayout"
+}
diff --git a/gridlayout/gridlayout/src/androidTest/AndroidManifest.xml b/gridlayout/gridlayout/src/androidTest/AndroidManifest.xml
index b12b9b2..2f52faf 100644
--- a/gridlayout/gridlayout/src/androidTest/AndroidManifest.xml
+++ b/gridlayout/gridlayout/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.gridlayout.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.gridlayout.widget.GridLayoutTestActivity"/>
diff --git a/gridlayout/gridlayout/src/main/AndroidManifest.xml b/gridlayout/gridlayout/src/main/AndroidManifest.xml
index 79729d9..bd7af07 100644
--- a/gridlayout/gridlayout/src/main/AndroidManifest.xml
+++ b/gridlayout/gridlayout/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.gridlayout"/>
+<manifest />
diff --git a/health/health-data-client/build.gradle b/health/health-data-client/build.gradle
index 36f5ba5..53aa9db 100644
--- a/health/health-data-client/build.gradle
+++ b/health/health-data-client/build.gradle
@@ -55,6 +55,7 @@
aidl = true
}
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.health.data.client"
}
protobuf {
diff --git a/health/health-data-client/src/androidTest/AndroidManifest.xml b/health/health-data-client/src/androidTest/AndroidManifest.xml
index d810208..4d68dc2 100644
--- a/health/health-data-client/src/androidTest/AndroidManifest.xml
+++ b/health/health-data-client/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.health.data.client.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/health/health-data-client/src/main/AndroidManifest.xml b/health/health-data-client/src/main/AndroidManifest.xml
index 355f363..7fb5704 100644
--- a/health/health-data-client/src/main/AndroidManifest.xml
+++ b/health/health-data-client/src/main/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.health.data.client">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/health/health-services-client/build.gradle b/health/health-services-client/build.gradle
index a07048e..cb61e51 100644
--- a/health/health-services-client/build.gradle
+++ b/health/health-services-client/build.gradle
@@ -40,6 +40,7 @@
buildFeatures {
aidl = true
}
+ namespace "androidx.health.services.client"
}
protobuf {
diff --git a/health/health-services-client/src/androidTest/AndroidManifest.xml b/health/health-services-client/src/androidTest/AndroidManifest.xml
index d6673ca..c9a2be8 100644
--- a/health/health-services-client/src/androidTest/AndroidManifest.xml
+++ b/health/health-services-client/src/androidTest/AndroidManifest.xml
@@ -11,7 +11,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.health.services.client.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/health/health-services-client/src/main/AndroidManifest.xml b/health/health-services-client/src/main/AndroidManifest.xml
index 75a5742..c9a2be8 100644
--- a/health/health-services-client/src/main/AndroidManifest.xml
+++ b/health/health-services-client/src/main/AndroidManifest.xml
@@ -11,7 +11,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.health.services.client">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/heifwriter/heifwriter/build.gradle b/heifwriter/heifwriter/build.gradle
index 7c630a2..c693ee1 100644
--- a/heifwriter/heifwriter/build.gradle
+++ b/heifwriter/heifwriter/build.gradle
@@ -9,6 +9,7 @@
defaultConfig {
minSdkVersion 28
}
+ namespace "androidx.heifwriter"
}
dependencies {
diff --git a/heifwriter/heifwriter/src/androidTest/AndroidManifest.xml b/heifwriter/heifwriter/src/androidTest/AndroidManifest.xml
index 94c8108..f737ad20 100644
--- a/heifwriter/heifwriter/src/androidTest/AndroidManifest.xml
+++ b/heifwriter/heifwriter/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.heifwriter.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/heifwriter/heifwriter/src/main/AndroidManifest.xml b/heifwriter/heifwriter/src/main/AndroidManifest.xml
index 3c283b3..dd3d3a3 100644
--- a/heifwriter/heifwriter/src/main/AndroidManifest.xml
+++ b/heifwriter/heifwriter/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.heifwriter"/>
+<manifest />
diff --git a/hilt/hilt-common/src/main/AndroidManifest.xml b/hilt/hilt-common/src/main/AndroidManifest.xml
deleted file mode 100644
index 800b74e..0000000
--- a/hilt/hilt-common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
- Copyright 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<manifest package="androidx.hilt">
-</manifest>
diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle
index c95ff61..ce6ed25e 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -30,6 +30,7 @@
defaultConfig {
testInstrumentationRunner "androidx.hilt.navigation.compose.TestRunner"
}
+ namespace "androidx.hilt.navigation.compose"
}
dependencies {
diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle
index 9378415..b169056 100644
--- a/hilt/hilt-navigation-compose/samples/build.gradle
+++ b/hilt/hilt-navigation-compose/samples/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2021"
description = "Samples for the Navigation Compose Hilt Integration"
}
+
+android {
+ namespace "androidx.hilt.navigation.compose.samples"
+}
diff --git a/hilt/hilt-navigation-compose/samples/src/main/AndroidManifest.xml b/hilt/hilt-navigation-compose/samples/src/main/AndroidManifest.xml
index 0a1e1b5..20af317 100644
--- a/hilt/hilt-navigation-compose/samples/src/main/AndroidManifest.xml
+++ b/hilt/hilt-navigation-compose/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.hilt.navigation.compose.samples" />
+<manifest />
diff --git a/hilt/hilt-navigation-compose/src/androidTest/AndroidManifest.xml b/hilt/hilt-navigation-compose/src/androidTest/AndroidManifest.xml
index 764ae11..e794a69 100644
--- a/hilt/hilt-navigation-compose/src/androidTest/AndroidManifest.xml
+++ b/hilt/hilt-navigation-compose/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.hilt.navigation.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.hilt.navigation.compose.HiltViewModelComposeTest$TestActivity" />
diff --git a/hilt/hilt-navigation-compose/src/main/AndroidManifest.xml b/hilt/hilt-navigation-compose/src/main/AndroidManifest.xml
index 4d46feb..38e6839 100644
--- a/hilt/hilt-navigation-compose/src/main/AndroidManifest.xml
+++ b/hilt/hilt-navigation-compose/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.hilt.navigation.compose"/>
+<manifest />
diff --git a/hilt/hilt-navigation-fragment/build.gradle b/hilt/hilt-navigation-fragment/build.gradle
index 123769d..f3dd393 100644
--- a/hilt/hilt-navigation-fragment/build.gradle
+++ b/hilt/hilt-navigation-fragment/build.gradle
@@ -28,6 +28,7 @@
defaultConfig {
testInstrumentationRunner "androidx.hilt.navigation.fragment.TestRunner"
}
+ namespace "androidx.hilt.navigation.fragment"
}
dependencies {
diff --git a/hilt/hilt-navigation-fragment/src/androidTest/AndroidManifest.xml b/hilt/hilt-navigation-fragment/src/androidTest/AndroidManifest.xml
index b310c92..09cd7ca 100644
--- a/hilt/hilt-navigation-fragment/src/androidTest/AndroidManifest.xml
+++ b/hilt/hilt-navigation-fragment/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.hilt.navigation.fragment">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.hilt.navigation.fragment.NavGraphActivity" />
</application>
diff --git a/hilt/hilt-navigation-fragment/src/main/AndroidManifest.xml b/hilt/hilt-navigation-fragment/src/main/AndroidManifest.xml
index 41468c1..38e6839 100644
--- a/hilt/hilt-navigation-fragment/src/main/AndroidManifest.xml
+++ b/hilt/hilt-navigation-fragment/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.hilt.navigation.fragment"/>
+<manifest />
diff --git a/hilt/hilt-navigation/build.gradle b/hilt/hilt-navigation/build.gradle
index a723fc5..c0d5630 100644
--- a/hilt/hilt-navigation/build.gradle
+++ b/hilt/hilt-navigation/build.gradle
@@ -39,3 +39,7 @@
inceptionYear = "2021"
description = "Android Navigation Hilt Extension"
}
+
+android {
+ namespace "androidx.hilt.navigation"
+}
diff --git a/hilt/hilt-navigation/src/main/AndroidManifest.xml b/hilt/hilt-navigation/src/main/AndroidManifest.xml
index e7d638d..38e6839 100644
--- a/hilt/hilt-navigation/src/main/AndroidManifest.xml
+++ b/hilt/hilt-navigation/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.hilt.navigation"/>
+<manifest />
diff --git a/hilt/hilt-work/build.gradle b/hilt/hilt-work/build.gradle
index 832a59a..ec2e644 100644
--- a/hilt/hilt-work/build.gradle
+++ b/hilt/hilt-work/build.gradle
@@ -25,6 +25,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.hilt.work"
}
dependencies {
diff --git a/hilt/hilt-work/src/main/AndroidManifest.xml b/hilt/hilt-work/src/main/AndroidManifest.xml
index 7405b10..53b18aa 100644
--- a/hilt/hilt-work/src/main/AndroidManifest.xml
+++ b/hilt/hilt-work/src/main/AndroidManifest.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<manifest package="androidx.hilt.work">
+<manifest>
</manifest>
diff --git a/hilt/integration-tests/viewmodelapp/build.gradle b/hilt/integration-tests/viewmodelapp/build.gradle
index 368be6b..439a86b 100644
--- a/hilt/integration-tests/viewmodelapp/build.gradle
+++ b/hilt/integration-tests/viewmodelapp/build.gradle
@@ -32,6 +32,7 @@
shrinkResources true
}
}
+ namespace "androidx.hilt.integration.viewmodelapp"
}
dependencies {
diff --git a/hilt/integration-tests/viewmodelapp/src/debug/AndroidManifest.xml b/hilt/integration-tests/viewmodelapp/src/debug/AndroidManifest.xml
index 7024a02..28a84eb 100644
--- a/hilt/integration-tests/viewmodelapp/src/debug/AndroidManifest.xml
+++ b/hilt/integration-tests/viewmodelapp/src/debug/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.hilt.integration.viewmodelapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name=".ActivityInjectionTest$TestActivity"/>
<activity android:name=".BaseActivityInjectionTest$TestActivity"/>
diff --git a/hilt/integration-tests/viewmodelapp/src/main/AndroidManifest.xml b/hilt/integration-tests/viewmodelapp/src/main/AndroidManifest.xml
index 09eb5c4..73a484e 100644
--- a/hilt/integration-tests/viewmodelapp/src/main/AndroidManifest.xml
+++ b/hilt/integration-tests/viewmodelapp/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.hilt.integration.viewmodelapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name=".App">
<activity
diff --git a/hilt/integration-tests/workerapp/build.gradle b/hilt/integration-tests/workerapp/build.gradle
index aaecd82..ea28a91 100644
--- a/hilt/integration-tests/workerapp/build.gradle
+++ b/hilt/integration-tests/workerapp/build.gradle
@@ -32,6 +32,7 @@
shrinkResources true
}
}
+ namespace "androidx.hilt.integration.workerapp"
}
dependencies {
diff --git a/hilt/integration-tests/workerapp/src/main/AndroidManifest.xml b/hilt/integration-tests/workerapp/src/main/AndroidManifest.xml
index 8503ecd..4cef0fa 100644
--- a/hilt/integration-tests/workerapp/src/main/AndroidManifest.xml
+++ b/hilt/integration-tests/workerapp/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.hilt.integration.workerapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:name=".App">
<activity
diff --git a/inspection/inspection-testing/build.gradle b/inspection/inspection-testing/build.gradle
index 79f4e5c..50213ea 100644
--- a/inspection/inspection-testing/build.gradle
+++ b/inspection/inspection-testing/build.gradle
@@ -57,4 +57,5 @@
// studio pipeline works only starting with Android O
minSdkVersion 26
}
+ namespace "androidx.inspection.testing"
}
diff --git a/inspection/inspection-testing/src/main/AndroidManifest.xml b/inspection/inspection-testing/src/main/AndroidManifest.xml
index 8549e11..61b6811 100644
--- a/inspection/inspection-testing/src/main/AndroidManifest.xml
+++ b/inspection/inspection-testing/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.inspection.testing"/>
+<manifest />
diff --git a/inspection/inspection/build.gradle b/inspection/inspection/build.gradle
index 099bd87..02655dd 100644
--- a/inspection/inspection/build.gradle
+++ b/inspection/inspection/build.gradle
@@ -56,4 +56,5 @@
version "3.22.1"
}
}
+ namespace "androidx.inspection"
}
diff --git a/inspection/inspection/src/main/AndroidManifest.xml b/inspection/inspection/src/main/AndroidManifest.xml
index 5ceb700..873a38a 100644
--- a/inspection/inspection/src/main/AndroidManifest.xml
+++ b/inspection/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.inspection"/>
+<manifest />
diff --git a/interpolator/interpolator/build.gradle b/interpolator/interpolator/build.gradle
index a1634bf..ff19cd2 100644
--- a/interpolator/interpolator/build.gradle
+++ b/interpolator/interpolator/build.gradle
@@ -16,3 +16,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.interpolator"
+}
diff --git a/interpolator/interpolator/src/main/AndroidManifest.xml b/interpolator/interpolator/src/main/AndroidManifest.xml
index f681282..6f49e23 100644
--- a/interpolator/interpolator/src/main/AndroidManifest.xml
+++ b/interpolator/interpolator/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.interpolator"/>
+<manifest />
diff --git a/leanback/leanback-grid/build.gradle b/leanback/leanback-grid/build.gradle
index 6b8c680..d59f22e 100644
--- a/leanback/leanback-grid/build.gradle
+++ b/leanback/leanback-grid/build.gradle
@@ -48,6 +48,7 @@
defaultConfig {
minSdkVersion 17
}
+ namespace "androidx.leanback.widget"
}
androidx {
diff --git a/leanback/leanback-grid/src/main/AndroidManifest.xml b/leanback/leanback-grid/src/main/AndroidManifest.xml
index df35449..3c3c224 100644
--- a/leanback/leanback-grid/src/main/AndroidManifest.xml
+++ b/leanback/leanback-grid/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.leanback.widget"/>
+<manifest />
diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle
index e364a5d..dd3f9ac 100644
--- a/leanback/leanback-paging/build.gradle
+++ b/leanback/leanback-paging/build.gradle
@@ -48,6 +48,7 @@
// Bug in Android Lint 7.0.0-alpha15 b/187419330
disable("MissingLeanbackLauncher", "ImpliedTouchscreenHardware", "MissingLeanbackSupport")
}
+ namespace "androidx.leanback.paging"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/leanback/leanback-paging/src/main/AndroidManifest.xml b/leanback/leanback-paging/src/main/AndroidManifest.xml
index 5cac140..95dabe9 100644
--- a/leanback/leanback-paging/src/main/AndroidManifest.xml
+++ b/leanback/leanback-paging/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.leanback.paging"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle
index 7df30c3..85a291e9 100644
--- a/leanback/leanback-preference/build.gradle
+++ b/leanback/leanback-preference/build.gradle
@@ -24,6 +24,7 @@
"api21"
]
}
+ namespace "androidx.leanback.preference"
}
androidx {
diff --git a/leanback/leanback-preference/src/main/AndroidManifest.xml b/leanback/leanback-preference/src/main/AndroidManifest.xml
index 5ba854b..107b553 100644
--- a/leanback/leanback-preference/src/main/AndroidManifest.xml
+++ b/leanback/leanback-preference/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License
-->
-<manifest package="androidx.leanback.preference"/>
+<manifest />
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle
index 2079d5f..1b4205f 100644
--- a/leanback/leanback-tab/build.gradle
+++ b/leanback/leanback-tab/build.gradle
@@ -33,6 +33,7 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "androidx.leanback.tab"
}
androidx {
diff --git a/leanback/leanback-tab/src/androidTest/AndroidManifest.xml b/leanback/leanback-tab/src/androidTest/AndroidManifest.xml
index d1def15..7a78423 100644
--- a/leanback/leanback-tab/src/androidTest/AndroidManifest.xml
+++ b/leanback/leanback-tab/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.leanback.tab.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true">
diff --git a/leanback/leanback-tab/src/main/AndroidManifest.xml b/leanback/leanback-tab/src/main/AndroidManifest.xml
index db6bbf5..a297096 100644
--- a/leanback/leanback-tab/src/main/AndroidManifest.xml
+++ b/leanback/leanback-tab/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.leanback.tab"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle
index 4f77d23..dceed04 100644
--- a/leanback/leanback/build.gradle
+++ b/leanback/leanback/build.gradle
@@ -51,6 +51,7 @@
"api21",
]
}
+ namespace "androidx.leanback"
}
androidx {
diff --git a/leanback/leanback/src/androidTest/AndroidManifest.xml b/leanback/leanback/src/androidTest/AndroidManifest.xml
index 2f345f9..0abf773 100644
--- a/leanback/leanback/src/androidTest/AndroidManifest.xml
+++ b/leanback/leanback/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.leanback.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/leanback/leanback/src/main/AndroidManifest.xml b/leanback/leanback/src/main/AndroidManifest.xml
index f923b42..6f49e23 100644
--- a/leanback/leanback/src/main/AndroidManifest.xml
+++ b/leanback/leanback/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.leanback"/>
+<manifest />
diff --git a/lifecycle/integration-tests/kotlintestapp/build.gradle b/lifecycle/integration-tests/kotlintestapp/build.gradle
index e64b2bf..7399236 100644
--- a/lifecycle/integration-tests/kotlintestapp/build.gradle
+++ b/lifecycle/integration-tests/kotlintestapp/build.gradle
@@ -59,4 +59,5 @@
test.java.srcDirs += "src/test-common/java"
androidTest.java.srcDirs += "src/test-common/java"
}
+ namespace "androidx.lifecycle.kotlintestapp"
}
diff --git a/lifecycle/integration-tests/kotlintestapp/src/main/AndroidManifest.xml b/lifecycle/integration-tests/kotlintestapp/src/main/AndroidManifest.xml
index 629de7d..f98b924 100644
--- a/lifecycle/integration-tests/kotlintestapp/src/main/AndroidManifest.xml
+++ b/lifecycle/integration-tests/kotlintestapp/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.kotlintestapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.lifecycle.kotlintestapp.TestActivity"
diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index e2edd36..e20cd13 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle
@@ -42,3 +42,7 @@
testImplementation(libs.mockitoCore)
testAnnotationProcessor(project(":lifecycle:lifecycle-compiler"))
}
+
+android {
+ namespace "androidx.lifecycle.testapp"
+}
diff --git a/lifecycle/integration-tests/testapp/src/main/AndroidManifest.xml b/lifecycle/integration-tests/testapp/src/main/AndroidManifest.xml
index 3e6ef7d..654b71e 100644
--- a/lifecycle/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/lifecycle/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -11,8 +11,7 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.lifecycle.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index 32c54b5..81acc67 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -58,3 +58,7 @@
description = "Android Lifecycle Extensions"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.lifecycle.extensions"
+}
diff --git a/lifecycle/lifecycle-extensions/src/androidTest/AndroidManifest.xml b/lifecycle/lifecycle-extensions/src/androidTest/AndroidManifest.xml
index 437b5b1..4f412f6 100644
--- a/lifecycle/lifecycle-extensions/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/lifecycle-extensions/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.extensions.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.lifecycle.EmptyActivity"/>
diff --git a/lifecycle/lifecycle-extensions/src/main/AndroidManifest.xml b/lifecycle/lifecycle-extensions/src/main/AndroidManifest.xml
index 2ec81c4..c337c23 100644
--- a/lifecycle/lifecycle-extensions/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-extensions/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.extensions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
</application>
</manifest>
diff --git a/lifecycle/lifecycle-livedata-core-ktx/build.gradle b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
index 259891e..5658356 100644
--- a/lifecycle/lifecycle-livedata-core-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
@@ -45,6 +45,10 @@
description = "Kotlin extensions for 'livedata-core' artifact"
}
+android {
+ namespace "androidx.lifecycle.livedata.core.ktx"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/lifecycle/lifecycle-livedata-core-ktx/src/main/AndroidManifest.xml b/lifecycle/lifecycle-livedata-core-ktx/src/main/AndroidManifest.xml
index 055ef0c..7535bfb 100644
--- a/lifecycle/lifecycle-livedata-core-ktx/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-livedata-core-ktx/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.lifecycle.livedata.core.ktx"/>
+<manifest />
diff --git a/lifecycle/lifecycle-livedata-core-truth/build.gradle b/lifecycle/lifecycle-livedata-core-truth/build.gradle
index b8da9ea..9ffdaa9 100644
--- a/lifecycle/lifecycle-livedata-core-truth/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-truth/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2019"
description = "Truth extensions for 'livedata-core' artifact"
}
+
+android {
+ namespace "androidx.lifecycle.livedata.core.truth"
+}
diff --git a/lifecycle/lifecycle-livedata-core-truth/src/main/AndroidManifest.xml b/lifecycle/lifecycle-livedata-core-truth/src/main/AndroidManifest.xml
index 30521f1..7535bfb 100644
--- a/lifecycle/lifecycle-livedata-core-truth/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-livedata-core-truth/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.lifecycle.livedata.core.truth"/>
+<manifest />
diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle
index 9b1852b..42da78c 100644
--- a/lifecycle/lifecycle-livedata-core/build.gradle
+++ b/lifecycle/lifecycle-livedata-core/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2017"
description = "Android Lifecycle LiveData Core"
}
+
+android {
+ namespace "androidx.lifecycle.livedata.core"
+}
diff --git a/lifecycle/lifecycle-livedata-core/src/main/AndroidManifest.xml b/lifecycle/lifecycle-livedata-core/src/main/AndroidManifest.xml
index 43abea7..82acbb6 100644
--- a/lifecycle/lifecycle-livedata-core/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-livedata-core/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.livedata.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-livedata-ktx/build.gradle b/lifecycle/lifecycle-livedata-ktx/build.gradle
index 7f7ab39..b49db6a 100644
--- a/lifecycle/lifecycle-livedata-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-ktx/build.gradle
@@ -56,3 +56,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'livedata' artifact"
}
+
+android {
+ namespace "androidx.lifecycle.livedata.ktx"
+}
diff --git a/lifecycle/lifecycle-livedata-ktx/src/main/AndroidManifest.xml b/lifecycle/lifecycle-livedata-ktx/src/main/AndroidManifest.xml
index e3d3b6b..7535bfb 100644
--- a/lifecycle/lifecycle-livedata-ktx/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-livedata-ktx/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.lifecycle.livedata.ktx"/>
+<manifest />
diff --git a/lifecycle/lifecycle-livedata/build.gradle b/lifecycle/lifecycle-livedata/build.gradle
index 9d5a120..daf220a 100644
--- a/lifecycle/lifecycle-livedata/build.gradle
+++ b/lifecycle/lifecycle-livedata/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2017"
description = "Android Lifecycle LiveData"
}
+
+android {
+ namespace "androidx.lifecycle.livedata"
+}
diff --git a/lifecycle/lifecycle-livedata/src/main/AndroidManifest.xml b/lifecycle/lifecycle-livedata/src/main/AndroidManifest.xml
index ecd0fe1..82acbb6 100644
--- a/lifecycle/lifecycle-livedata/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-livedata/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.livedata">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle
index 73434c8..186b49b 100644
--- a/lifecycle/lifecycle-process/build.gradle
+++ b/lifecycle/lifecycle-process/build.gradle
@@ -26,6 +26,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.lifecycle.process"
}
dependencies {
diff --git a/lifecycle/lifecycle-process/src/main/AndroidManifest.xml b/lifecycle/lifecycle-process/src/main/AndroidManifest.xml
index 7b47229..6113d06 100644
--- a/lifecycle/lifecycle-process/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-process/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.lifecycle.process">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<provider
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
index c82d519..84713f2 100644
--- a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
@@ -44,6 +44,10 @@
description = "Kotlin extensions for Lifecycle ReactiveStreams"
}
+android {
+ namespace "androidx.lifecycle.reactivestreams.ktx"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/src/main/AndroidManifest.xml b/lifecycle/lifecycle-reactivestreams-ktx/src/main/AndroidManifest.xml
index d2c150c..29b496b 100644
--- a/lifecycle/lifecycle-reactivestreams-ktx/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-reactivestreams-ktx/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.lifecycle.reactivestreams.ktx"/>
+<manifest />
diff --git a/lifecycle/lifecycle-reactivestreams/build.gradle b/lifecycle/lifecycle-reactivestreams/build.gradle
index 5f942a6..2f02597 100644
--- a/lifecycle/lifecycle-reactivestreams/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams/build.gradle
@@ -46,3 +46,7 @@
inceptionYear = "2017"
description = "Android Lifecycle Reactivestreams"
}
+
+android {
+ namespace "androidx.lifecycle.reactivestreams"
+}
diff --git a/lifecycle/lifecycle-reactivestreams/src/main/AndroidManifest.xml b/lifecycle/lifecycle-reactivestreams/src/main/AndroidManifest.xml
index 96fed76..da23b80 100644
--- a/lifecycle/lifecycle-reactivestreams/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-reactivestreams/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.reactivestreams">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-runtime-ktx/build.gradle b/lifecycle/lifecycle-runtime-ktx/build.gradle
index aa47fdd..4eced98 100644
--- a/lifecycle/lifecycle-runtime-ktx/build.gradle
+++ b/lifecycle/lifecycle-runtime-ktx/build.gradle
@@ -51,6 +51,10 @@
description = "Kotlin extensions for 'lifecycle' artifact"
}
+android {
+ namespace "androidx.lifecycle.ktx"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/lifecycle/lifecycle-runtime-ktx/src/main/AndroidManifest.xml b/lifecycle/lifecycle-runtime-ktx/src/main/AndroidManifest.xml
index 1c2bf90..1a318ef 100644
--- a/lifecycle/lifecycle-runtime-ktx/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-runtime-ktx/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-runtime-testing/build.gradle b/lifecycle/lifecycle-runtime-testing/build.gradle
index 77d49d6..4e818a1 100644
--- a/lifecycle/lifecycle-runtime-testing/build.gradle
+++ b/lifecycle/lifecycle-runtime-testing/build.gradle
@@ -46,6 +46,10 @@
description = "Testing utilities for 'lifecycle' artifact"
}
+android {
+ namespace "androidx.lifecycle.testing"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/lifecycle/lifecycle-runtime-testing/src/main/AndroidManifest.xml b/lifecycle/lifecycle-runtime-testing/src/main/AndroidManifest.xml
index bdb582fe..22df6fd 100644
--- a/lifecycle/lifecycle-runtime-testing/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-runtime-testing/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle
index 0c5f3cd..bc2dc5b 100644
--- a/lifecycle/lifecycle-runtime/build.gradle
+++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -9,6 +9,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.lifecycle.runtime"
}
dependencies {
diff --git a/lifecycle/lifecycle-runtime/src/main/AndroidManifest.xml b/lifecycle/lifecycle-runtime/src/main/AndroidManifest.xml
index af7cc74..9752998 100644
--- a/lifecycle/lifecycle-runtime/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-runtime/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.runtime">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-service/build.gradle b/lifecycle/lifecycle-service/build.gradle
index 082d6d7..d7c2c9a 100644
--- a/lifecycle/lifecycle-service/build.gradle
+++ b/lifecycle/lifecycle-service/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2018"
description = "Android Lifecycle Service"
}
+
+android {
+ namespace "androidx.lifecycle.service"
+}
diff --git a/lifecycle/lifecycle-service/src/androidTest/AndroidManifest.xml b/lifecycle/lifecycle-service/src/androidTest/AndroidManifest.xml
index 513f79b..2af82da 100644
--- a/lifecycle/lifecycle-service/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/lifecycle-service/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.service.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service android:name="androidx.lifecycle.service.TestService"/>
diff --git a/lifecycle/lifecycle-service/src/main/AndroidManifest.xml b/lifecycle/lifecycle-service/src/main/AndroidManifest.xml
index 986d6b1..1f3367f 100644
--- a/lifecycle/lifecycle-service/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-service/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.lifecycle.service"/>
+<manifest />
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index e1c8b46a..59da323 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -63,6 +63,10 @@
runApiTasks = new RunApiTasks.Yes()
}
+android {
+ namespace "androidx.lifecycle.viewmodel.compose"
+}
+
// needed only while https://youtrack.jetbrains.com/issue/KT-47000 isn't resolved which is
// targeted to 1.6
tasks.withType(KotlinCompile).configureEach {
diff --git a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
index e838baa..1a3fda6 100644
--- a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle
@@ -34,3 +34,7 @@
inceptionYear = "2021"
description = "This is a project for Lifecycle ViewModel demos."
}
+
+android {
+ namespace "androidx.lifecycle.viewmodel.compose.demos"
+}
diff --git a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/src/main/AndroidManifest.xml
index d9d8620..20af317 100644
--- a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.lifecycle.viewmodel.compose.demos" />
+<manifest />
diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
index 6decb63..8f37cfc 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
@@ -41,6 +41,10 @@
description = "Samples for Compose integration with Lifecycle ViewModel"
}
+android {
+ namespace "androidx.lifecycle.viewmodel.compose.samples"
+}
+
// needed only while https://youtrack.jetbrains.com/issue/KT-47000 isn't resolved which is
// targeted to 1.6
tasks.withType(KotlinCompile).configureEach {
diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-compose/samples/src/main/AndroidManifest.xml
index 26af120..20af317 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.lifecycle.viewmodel.compose.samples" />
+<manifest />
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/androidTest/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-compose/src/androidTest/AndroidManifest.xml
index 6de27ab..e556862 100644
--- a/lifecycle/lifecycle-viewmodel-compose/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-compose/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.lifecycle.viewmodel.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-compose/src/main/AndroidManifest.xml
index 33022bf..3c3c224 100644
--- a/lifecycle/lifecycle-viewmodel-compose/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-compose/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.lifecycle.viewmodel.compose" />
+<manifest />
diff --git a/lifecycle/lifecycle-viewmodel-ktx/build.gradle b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
index d5885f8..23dbe99 100644
--- a/lifecycle/lifecycle-viewmodel-ktx/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'viewmodel' artifact"
}
+
+android {
+ namespace "androidx.lifecycle.viewmodel.ktx"
+}
diff --git a/lifecycle/lifecycle-viewmodel-ktx/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-ktx/src/main/AndroidManifest.xml
index 75b1d20..dd3d3a3 100644
--- a/lifecycle/lifecycle-viewmodel-ktx/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-ktx/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.lifecycle.viewmodel.ktx"/>
+<manifest />
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
index 9dea8ac..5d0a4f8 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
@@ -28,6 +28,7 @@
buildTypes.all {
consumerProguardFiles("proguard-rules.pro")
}
+ namespace "androidx.lifecycle.viewmodel.savedstate"
}
dependencies {
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/AndroidManifest.xml
index a23e0ca..50815d9 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.viewmodel.savedstate.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-savedstate/src/main/AndroidManifest.xml
index 52d66a8..f728197 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.viewmodel.savedstate">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle
index 6a0cddd..59ad2de 100644
--- a/lifecycle/lifecycle-viewmodel/build.gradle
+++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -28,6 +28,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.lifecycle.viewmodel"
}
dependencies {
diff --git a/lifecycle/lifecycle-viewmodel/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel/src/main/AndroidManifest.xml
index 0fbbcfb..82acbb6 100644
--- a/lifecycle/lifecycle-viewmodel/src/main/AndroidManifest.xml
+++ b/lifecycle/lifecycle-viewmodel/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.lifecycle.viewmodel">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/lint-checks/integration-tests/build.gradle b/lint-checks/integration-tests/build.gradle
index 1787d6f..f1760cab 100644
--- a/lint-checks/integration-tests/build.gradle
+++ b/lint-checks/integration-tests/build.gradle
@@ -51,6 +51,7 @@
// We don't want errors to cause lint to fail
abortOnError false
}
+ namespace "androidx.lint.integration.tests"
}
diff --git a/lint-checks/integration-tests/src/main/AndroidManifest.xml b/lint-checks/integration-tests/src/main/AndroidManifest.xml
index 98ea13f..c98d219 100644
--- a/lint-checks/integration-tests/src/main/AndroidManifest.xml
+++ b/lint-checks/integration-tests/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.lint.integration.tests"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- Application-level metadata is not allowed. -->
<meta-data android:name="name" android:value="value" />
diff --git a/lint-checks/src/test/java/androidx/build/lint/AndroidManifestServiceExportedDetectorTest.kt b/lint-checks/src/test/java/androidx/build/lint/AndroidManifestServiceExportedDetectorTest.kt
index 1a482ac..094e9d5 100644
--- a/lint-checks/src/test/java/androidx/build/lint/AndroidManifestServiceExportedDetectorTest.kt
+++ b/lint-checks/src/test/java/androidx/build/lint/AndroidManifestServiceExportedDetectorTest.kt
@@ -36,7 +36,7 @@
/* ktlint-disable max-line-length */
val expected = """
-AndroidManifest.xml:22: Error: Missing exported=true in <service> tag [MissingServiceExportedEqualsTrue]
+AndroidManifest.xml:21: Error: Missing exported=true in <service> tag [MissingServiceExportedEqualsTrue]
<service android:name="androidx.core.app.JobIntentService">
^
1 errors, 0 warnings
diff --git a/lint-checks/src/test/java/androidx/build/lint/MetadataTagInsideApplicationTagDetectorTest.kt b/lint-checks/src/test/java/androidx/build/lint/MetadataTagInsideApplicationTagDetectorTest.kt
index 7b447d9..62d45d5 100644
--- a/lint-checks/src/test/java/androidx/build/lint/MetadataTagInsideApplicationTagDetectorTest.kt
+++ b/lint-checks/src/test/java/androidx/build/lint/MetadataTagInsideApplicationTagDetectorTest.kt
@@ -36,7 +36,7 @@
/* ktlint-disable max-line-length */
val expected = """
-AndroidManifest.xml:20: Error: Detected <application>-level meta-data tag. [MetadataTagInsideApplicationTag]
+AndroidManifest.xml:19: Error: Detected <application>-level meta-data tag. [MetadataTagInsideApplicationTag]
<meta-data android:name="name" android:value="value" />
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 errors, 0 warnings
diff --git a/lint-demos/lint-demo-appcompat/build.gradle b/lint-demos/lint-demo-appcompat/build.gradle
index 0f821f9..0ed3410 100644
--- a/lint-demos/lint-demo-appcompat/build.gradle
+++ b/lint-demos/lint-demo-appcompat/build.gradle
@@ -19,4 +19,5 @@
// TODO: Enable lint after appcompat:1.1.0 release or use lint-baseline.xml instead.
abortOnError false
}
+ namespace "com.example.android.appcompat"
}
diff --git a/lint-demos/lint-demo-appcompat/src/main/AndroidManifest.xml b/lint-demos/lint-demo-appcompat/src/main/AndroidManifest.xml
index 337e3cc..8a3e352 100644
--- a/lint-demos/lint-demo-appcompat/src/main/AndroidManifest.xml
+++ b/lint-demos/lint-demo-appcompat/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.appcompat">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="false"
diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle
index 662bdde..0f326a8 100644
--- a/loader/loader-ktx/build.gradle
+++ b/loader/loader-ktx/build.gradle
@@ -47,3 +47,7 @@
inceptionYear = "2019"
description = "Kotlin extensions for 'loader' artifact"
}
+
+android {
+ namespace "androidx.loader.ktx"
+}
diff --git a/loader/loader-ktx/src/androidTest/AndroidManifest.xml b/loader/loader-ktx/src/androidTest/AndroidManifest.xml
index a5bee33..f098878 100644
--- a/loader/loader-ktx/src/androidTest/AndroidManifest.xml
+++ b/loader/loader-ktx/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.loader.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
</application>
</manifest>
diff --git a/loader/loader-ktx/src/main/AndroidManifest.xml b/loader/loader-ktx/src/main/AndroidManifest.xml
index 5937e29..b47339d 100644
--- a/loader/loader-ktx/src/main/AndroidManifest.xml
+++ b/loader/loader-ktx/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.loader.ktx"/>
+<manifest />
diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle
index 91babf2..e3c3d99 100644
--- a/loader/loader/build.gradle
+++ b/loader/loader/build.gradle
@@ -29,3 +29,7 @@
inceptionYear = "2011"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren\'t a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.loader"
+}
diff --git a/loader/loader/src/androidTest/AndroidManifest.xml b/loader/loader/src/androidTest/AndroidManifest.xml
index 2217d0e..de941c0 100644
--- a/loader/loader/src/androidTest/AndroidManifest.xml
+++ b/loader/loader/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="android.support.loader.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/loader/loader/src/main/AndroidManifest.xml b/loader/loader/src/main/AndroidManifest.xml
index 03ef1f8..6f49e23 100644
--- a/loader/loader/src/main/AndroidManifest.xml
+++ b/loader/loader/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.loader"/>
+<manifest />
diff --git a/media/media/build.gradle b/media/media/build.gradle
index ab946e7..05c226d 100644
--- a/media/media/build.gradle
+++ b/media/media/build.gradle
@@ -47,6 +47,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.media"
}
androidx {
diff --git a/media/media/src/main/AndroidManifest.xml b/media/media/src/main/AndroidManifest.xml
index 9c20495..6f49e23 100644
--- a/media/media/src/main/AndroidManifest.xml
+++ b/media/media/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.media"/>
+<manifest />
diff --git a/media/version-compat-tests/lib/build.gradle b/media/version-compat-tests/lib/build.gradle
index 3b5f44b..879c393 100644
--- a/media/version-compat-tests/lib/build.gradle
+++ b/media/version-compat-tests/lib/build.gradle
@@ -24,3 +24,7 @@
api("androidx.versionedparcelable:versionedparcelable:1.1.1")
implementation(libs.junit)
}
+
+android {
+ namespace "android.support.mediacompat.testlib"
+}
diff --git a/media/version-compat-tests/lib/src/main/AndroidManifest.xml b/media/version-compat-tests/lib/src/main/AndroidManifest.xml
index 857e61c..4cea376 100644
--- a/media/version-compat-tests/lib/src/main/AndroidManifest.xml
+++ b/media/version-compat-tests/lib/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="android.support.mediacompat.testlib"/>
+<manifest />
diff --git a/media2/integration-tests/testapp/build.gradle b/media2/integration-tests/testapp/build.gradle
index 9291b51..3c9fbfe 100644
--- a/media2/integration-tests/testapp/build.gradle
+++ b/media2/integration-tests/testapp/build.gradle
@@ -37,4 +37,5 @@
defaultConfig {
minSdkVersion 19
}
+ namespace "androidx.media2.integration.testapp"
}
diff --git a/media2/integration-tests/testapp/src/main/AndroidManifest.xml b/media2/integration-tests/testapp/src/main/AndroidManifest.xml
index efb4e45..0d20cac 100644
--- a/media2/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/media2/integration-tests/testapp/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.media2.integration.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="androidx.media2.widget" />
diff --git a/media2/media2-common/build.gradle b/media2/media2-common/build.gradle
index 83460f7..e4292a4 100644
--- a/media2/media2-common/build.gradle
+++ b/media2/media2-common/build.gradle
@@ -53,6 +53,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.media2.common"
}
androidx {
diff --git a/media2/media2-common/src/androidTest/AndroidManifest.xml b/media2/media2-common/src/androidTest/AndroidManifest.xml
index dd43e3e..f8c9e96 100644
--- a/media2/media2-common/src/androidTest/AndroidManifest.xml
+++ b/media2/media2-common/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
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.media2.common.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/media2/media2-common/src/main/AndroidManifest.xml b/media2/media2-common/src/main/AndroidManifest.xml
index a8afab4..dd3d3a3 100644
--- a/media2/media2-common/src/main/AndroidManifest.xml
+++ b/media2/media2-common/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.media2.common"/>
+<manifest />
diff --git a/media2/media2-exoplayer/build.gradle b/media2/media2-exoplayer/build.gradle
index f20f4e7..187272e 100644
--- a/media2/media2-exoplayer/build.gradle
+++ b/media2/media2-exoplayer/build.gradle
@@ -25,6 +25,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.media2.exoplayer.external"
}
dependencies {
diff --git a/media2/media2-exoplayer/src/main/AndroidManifest.xml b/media2/media2-exoplayer/src/main/AndroidManifest.xml
index 94fe9de..dd3d3a3 100644
--- a/media2/media2-exoplayer/src/main/AndroidManifest.xml
+++ b/media2/media2-exoplayer/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.media2.exoplayer.external"/>
+<manifest />
diff --git a/media2/media2-player/build.gradle b/media2/media2-player/build.gradle
index bb0e3af..7320d6f 100644
--- a/media2/media2-player/build.gradle
+++ b/media2/media2-player/build.gradle
@@ -45,6 +45,7 @@
defaultConfig {
minSdkVersion 16
}
+ namespace "androidx.media2.player"
}
androidx {
diff --git a/media2/media2-player/src/androidTest/AndroidManifest.xml b/media2/media2-player/src/androidTest/AndroidManifest.xml
index 8de57c6..4111a98 100644
--- a/media2/media2-player/src/androidTest/AndroidManifest.xml
+++ b/media2/media2-player/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.media2.player.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/media2/media2-player/src/main/AndroidManifest.xml b/media2/media2-player/src/main/AndroidManifest.xml
index 4141843..dd3d3a3 100644
--- a/media2/media2-player/src/main/AndroidManifest.xml
+++ b/media2/media2-player/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.media2.player"/>
+<manifest />
diff --git a/media2/media2-session/build.gradle b/media2/media2-session/build.gradle
index 7cab417..99c9c4a 100644
--- a/media2/media2-session/build.gradle
+++ b/media2/media2-session/build.gradle
@@ -46,6 +46,7 @@
buildFeatures {
aidl = true
}
+ namespace "androidx.media2.session"
}
androidx {
diff --git a/media2/media2-session/src/androidTest/AndroidManifest.xml b/media2/media2-session/src/androidTest/AndroidManifest.xml
index b0cee7d..0a74e49 100644
--- a/media2/media2-session/src/androidTest/AndroidManifest.xml
+++ b/media2/media2-session/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.media2.session.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:usesCleartextTraffic="true">
<activity
diff --git a/media2/media2-session/src/main/AndroidManifest.xml b/media2/media2-session/src/main/AndroidManifest.xml
index 0ef9ddd..dd3d3a3 100644
--- a/media2/media2-session/src/main/AndroidManifest.xml
+++ b/media2/media2-session/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.media2.session"/>
+<manifest />
diff --git a/media2/media2-session/version-compat-tests/common/build.gradle b/media2/media2-session/version-compat-tests/common/build.gradle
index f1e9434..7c4365d 100644
--- a/media2/media2-session/version-compat-tests/common/build.gradle
+++ b/media2/media2-session/version-compat-tests/common/build.gradle
@@ -23,6 +23,7 @@
buildFeatures {
aidl = true
}
+ namespace "androidx.media2.test.common"
}
dependencies {
diff --git a/media2/media2-session/version-compat-tests/common/src/main/AndroidManifest.xml b/media2/media2-session/version-compat-tests/common/src/main/AndroidManifest.xml
index 7a38692..4cf4915 100644
--- a/media2/media2-session/version-compat-tests/common/src/main/AndroidManifest.xml
+++ b/media2/media2-session/version-compat-tests/common/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.media2.test.common"/>
+<manifest />
diff --git a/media2/media2-widget/build.gradle b/media2/media2-widget/build.gradle
index b87b305..91a01ef 100644
--- a/media2/media2-widget/build.gradle
+++ b/media2/media2-widget/build.gradle
@@ -52,6 +52,7 @@
// Remove once b/136119801 is fixed
disable("RestrictedApi")
}
+ namespace "androidx.media2.widget"
}
androidx {
diff --git a/media2/media2-widget/src/androidTest/AndroidManifest.xml b/media2/media2-widget/src/androidTest/AndroidManifest.xml
index 7dba215..6d838cc 100644
--- a/media2/media2-widget/src/androidTest/AndroidManifest.xml
+++ b/media2/media2-widget/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.media2.widget.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/media2/media2-widget/src/main/AndroidManifest.xml b/media2/media2-widget/src/main/AndroidManifest.xml
index 8de476b..7535bfb 100644
--- a/media2/media2-widget/src/main/AndroidManifest.xml
+++ b/media2/media2-widget/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.media2.widget"/>
+<manifest />
diff --git a/mediarouter/mediarouter-testing/build.gradle b/mediarouter/mediarouter-testing/build.gradle
index c765f7b..ce4b429 100644
--- a/mediarouter/mediarouter-testing/build.gradle
+++ b/mediarouter/mediarouter-testing/build.gradle
@@ -34,3 +34,7 @@
description = "Test utilities for AndroidX MediaRouter"
}
+android {
+ namespace "androidx.mediarouter.testing"
+}
+
diff --git a/mediarouter/mediarouter-testing/src/main/AndroidManifest.xml b/mediarouter/mediarouter-testing/src/main/AndroidManifest.xml
index 3e7cf56..3c3c224 100644
--- a/mediarouter/mediarouter-testing/src/main/AndroidManifest.xml
+++ b/mediarouter/mediarouter-testing/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.mediarouter.testing"/>
+<manifest />
diff --git a/mediarouter/mediarouter/build.gradle b/mediarouter/mediarouter/build.gradle
index a387d6c..5be4831 100644
--- a/mediarouter/mediarouter/build.gradle
+++ b/mediarouter/mediarouter/build.gradle
@@ -53,6 +53,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.mediarouter"
}
androidx {
diff --git a/mediarouter/mediarouter/src/androidTest/AndroidManifest.xml b/mediarouter/mediarouter/src/androidTest/AndroidManifest.xml
index d0030ee..6cce57a 100644
--- a/mediarouter/mediarouter/src/androidTest/AndroidManifest.xml
+++ b/mediarouter/mediarouter/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="android.support.v7.mediarouter.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity
diff --git a/mediarouter/mediarouter/src/main/AndroidManifest.xml b/mediarouter/mediarouter/src/main/AndroidManifest.xml
index 88f6aca..bd7af07 100644
--- a/mediarouter/mediarouter/src/main/AndroidManifest.xml
+++ b/mediarouter/mediarouter/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.mediarouter"/>
+<manifest />
diff --git a/metrics/integration-tests/janktest/build.gradle b/metrics/integration-tests/janktest/build.gradle
index e53ff98..476a3ae 100644
--- a/metrics/integration-tests/janktest/build.gradle
+++ b/metrics/integration-tests/janktest/build.gradle
@@ -24,6 +24,7 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.metrics.performance.janktest"
}
dependencies {
diff --git a/metrics/integration-tests/janktest/src/main/AndroidManifest.xml b/metrics/integration-tests/janktest/src/main/AndroidManifest.xml
index 5815d8b..5a9eabd 100644
--- a/metrics/integration-tests/janktest/src/main/AndroidManifest.xml
+++ b/metrics/integration-tests/janktest/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.metrics.performance.janktest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/metrics/metrics-performance/build.gradle b/metrics/metrics-performance/build.gradle
index 13173a6..a673340 100644
--- a/metrics/metrics-performance/build.gradle
+++ b/metrics/metrics-performance/build.gradle
@@ -54,6 +54,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.metrics.performance"
}
androidx {
diff --git a/metrics/metrics-performance/src/androidTest/AndroidManifest.xml b/metrics/metrics-performance/src/androidTest/AndroidManifest.xml
index f0ae7a4..43a2b2e 100644
--- a/metrics/metrics-performance/src/androidTest/AndroidManifest.xml
+++ b/metrics/metrics-performance/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.metrics.performance.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true"
android:theme="@style/Theme.Androidx"
diff --git a/metrics/metrics-performance/src/main/AndroidManifest.xml b/metrics/metrics-performance/src/main/AndroidManifest.xml
index fc276f0..6a68baf 100644
--- a/metrics/metrics-performance/src/main/AndroidManifest.xml
+++ b/metrics/metrics-performance/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.metrics.performance"/>
+<manifest />
diff --git a/navigation/integration-tests/testapp/build.gradle b/navigation/integration-tests/testapp/build.gradle
index 4703da6e..2207e44 100644
--- a/navigation/integration-tests/testapp/build.gradle
+++ b/navigation/integration-tests/testapp/build.gradle
@@ -37,4 +37,8 @@
})
}
+android {
+ namespace "androidx.navigation.testapp"
+}
+
tasks["check"].dependsOn(tasks["connectedCheck"])
diff --git a/navigation/integration-tests/testapp/src/main/AndroidManifest.xml b/navigation/integration-tests/testapp/src/main/AndroidManifest.xml
index c1e43c8..c54caaa 100644
--- a/navigation/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/navigation/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -12,8 +12,7 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.navigation.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/navigation/navigation-benchmark/build.gradle b/navigation/navigation-benchmark/build.gradle
index d4dad48..7dde6e3 100644
--- a/navigation/navigation-benchmark/build.gradle
+++ b/navigation/navigation-benchmark/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2018"
description = "Navigation Benchmarks"
}
+
+android {
+ namespace "androidx.navigation.benchmark"
+}
diff --git a/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml b/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml
index b16e9d9..097b102 100644
--- a/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-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.navigation.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/navigation/navigation-benchmark/src/main/AndroidManifest.xml b/navigation/navigation-benchmark/src/main/AndroidManifest.xml
index 3db0bc5..37aba03 100644
--- a/navigation/navigation-benchmark/src/main/AndroidManifest.xml
+++ b/navigation/navigation-benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.navigation.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/navigation/navigation-common-ktx/build.gradle b/navigation/navigation-common-ktx/build.gradle
index 7f5bb3b..160f4e1 100644
--- a/navigation/navigation-common-ktx/build.gradle
+++ b/navigation/navigation-common-ktx/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2018"
description = "Android Navigation-Common-Ktx"
}
+
+android {
+ namespace "androidx.navigation.common.ktx"
+}
diff --git a/navigation/navigation-common-ktx/src/androidTest/AndroidManifest.xml b/navigation/navigation-common-ktx/src/androidTest/AndroidManifest.xml
index 0cd8daf..9cd35fd 100644
--- a/navigation/navigation-common-ktx/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-common-ktx/src/androidTest/AndroidManifest.xml
@@ -15,6 +15,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.navigation.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-common-ktx/src/main/AndroidManifest.xml b/navigation/navigation-common-ktx/src/main/AndroidManifest.xml
index 9024a1e..fdfdce5 100644
--- a/navigation/navigation-common-ktx/src/main/AndroidManifest.xml
+++ b/navigation/navigation-common-ktx/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.navigation.common.ktx"/>
+<manifest />
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle
index 324d4e7..7c9bb99 100644
--- a/navigation/navigation-common/build.gradle
+++ b/navigation/navigation-common/build.gradle
@@ -27,6 +27,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.navigation.common"
}
dependencies {
diff --git a/navigation/navigation-common/src/androidTest/AndroidManifest.xml b/navigation/navigation-common/src/androidTest/AndroidManifest.xml
index cfe36b8..23f87a3 100644
--- a/navigation/navigation-common/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-common/src/androidTest/AndroidManifest.xml
@@ -15,6 +15,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.navigation.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-common/src/main/AndroidManifest.xml b/navigation/navigation-common/src/main/AndroidManifest.xml
index 716a35e..8f7e4bc 100644
--- a/navigation/navigation-common/src/main/AndroidManifest.xml
+++ b/navigation/navigation-common/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.navigation.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 1e81124..7fc27fe 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -69,3 +69,7 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.navigation.compose"
+}
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
index 3aa19a5..81bcf0b 100644
--- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
+++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2020"
description = "This is a project for Navigation demos."
}
+
+android {
+ namespace "androidx.navigation.compose.demos"
+}
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/src/main/AndroidManifest.xml b/navigation/navigation-compose/integration-tests/navigation-demos/src/main/AndroidManifest.xml
index 9cbabf8..deac81d 100644
--- a/navigation/navigation-compose/integration-tests/navigation-demos/src/main/AndroidManifest.xml
+++ b/navigation/navigation-compose/integration-tests/navigation-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.navigation.compose.demos" />
+<manifest />
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index dc9af4b..5f4d6a8 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -43,3 +43,7 @@
inceptionYear = "2020"
description = "Samples for Compose integration with Navigation"
}
+
+android {
+ namespace "androidx.navigation.compose.samples"
+}
diff --git a/navigation/navigation-compose/samples/src/main/AndroidManifest.xml b/navigation/navigation-compose/samples/src/main/AndroidManifest.xml
index d9b01af..deac81d 100644
--- a/navigation/navigation-compose/samples/src/main/AndroidManifest.xml
+++ b/navigation/navigation-compose/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.navigation.compose.samples" />
+<manifest />
diff --git a/navigation/navigation-compose/src/androidTest/AndroidManifest.xml b/navigation/navigation-compose/src/androidTest/AndroidManifest.xml
index c50c885..9cd4123 100644
--- a/navigation/navigation-compose/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-compose/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.navigation.compose" />
+<manifest />
diff --git a/navigation/navigation-compose/src/main/AndroidManifest.xml b/navigation/navigation-compose/src/main/AndroidManifest.xml
index c50c885..9cd4123 100644
--- a/navigation/navigation-compose/src/main/AndroidManifest.xml
+++ b/navigation/navigation-compose/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.navigation.compose" />
+<manifest />
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle
index c7cf10b..30faee5 100644
--- a/navigation/navigation-dynamic-features-fragment/build.gradle
+++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -60,6 +60,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.navigation.dynamicfeatures.fragment"
}
androidx {
diff --git a/navigation/navigation-dynamic-features-fragment/src/androidTest/AndroidManifest.xml b/navigation/navigation-dynamic-features-fragment/src/androidTest/AndroidManifest.xml
index f5345eb..280e699 100644
--- a/navigation/navigation-dynamic-features-fragment/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-dynamic-features-fragment/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.navigation.dynamicfeatures.fragment">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:name="androidx.multidex.MultiDexApplication">
<activity android:name="androidx.navigation.dynamicfeatures.fragment.NavigationActivity" />
diff --git a/navigation/navigation-dynamic-features-fragment/src/main/AndroidManifest.xml b/navigation/navigation-dynamic-features-fragment/src/main/AndroidManifest.xml
index e75c35b..8f7e4bc 100644
--- a/navigation/navigation-dynamic-features-fragment/src/main/AndroidManifest.xml
+++ b/navigation/navigation-dynamic-features-fragment/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.navigation.dynamicfeatures.fragment">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-dynamic-features-runtime/build.gradle b/navigation/navigation-dynamic-features-runtime/build.gradle
index 347d0cf..8365a88 100644
--- a/navigation/navigation-dynamic-features-runtime/build.gradle
+++ b/navigation/navigation-dynamic-features-runtime/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.navigation.dynamicfeatures"
}
dependencies {
diff --git a/navigation/navigation-dynamic-features-runtime/src/androidTest/AndroidManifest.xml b/navigation/navigation-dynamic-features-runtime/src/androidTest/AndroidManifest.xml
index e2f5533..f54cbb9 100644
--- a/navigation/navigation-dynamic-features-runtime/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-dynamic-features-runtime/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.navigation.dynamicfeatures.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<uses-library android:name="android.test.runner" />
diff --git a/navigation/navigation-dynamic-features-runtime/src/main/AndroidManifest.xml b/navigation/navigation-dynamic-features-runtime/src/main/AndroidManifest.xml
index 43e353d..8f7e4bc 100644
--- a/navigation/navigation-dynamic-features-runtime/src/main/AndroidManifest.xml
+++ b/navigation/navigation-dynamic-features-runtime/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.navigation.dynamicfeatures">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle
index 4c56fa4..83aee82 100644
--- a/navigation/navigation-fragment-ktx/build.gradle
+++ b/navigation/navigation-fragment-ktx/build.gradle
@@ -37,3 +37,7 @@
description = "Android Navigation-Fragment-Ktx"
}
+android {
+ namespace "androidx.navigation.fragment.ktx"
+}
+
diff --git a/navigation/navigation-fragment-ktx/src/androidTest/AndroidManifest.xml b/navigation/navigation-fragment-ktx/src/androidTest/AndroidManifest.xml
index 4b6ae01..8358852 100644
--- a/navigation/navigation-fragment-ktx/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-fragment-ktx/src/androidTest/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.navigation.fragment.ktx"/>
+<manifest />
diff --git a/navigation/navigation-fragment-ktx/src/main/AndroidManifest.xml b/navigation/navigation-fragment-ktx/src/main/AndroidManifest.xml
index bd32886..0e03c43 100644
--- a/navigation/navigation-fragment-ktx/src/main/AndroidManifest.xml
+++ b/navigation/navigation-fragment-ktx/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.navigation.fragment.ktx"/>
+<manifest />
diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle
index 9b69537..fe3aaba 100644
--- a/navigation/navigation-fragment/build.gradle
+++ b/navigation/navigation-fragment/build.gradle
@@ -49,3 +49,7 @@
inceptionYear = "2017"
description = "Android Navigation-Fragment"
}
+
+android {
+ namespace "androidx.navigation.fragment"
+}
diff --git a/navigation/navigation-fragment/src/androidTest/AndroidManifest.xml b/navigation/navigation-fragment/src/androidTest/AndroidManifest.xml
index a6db1e1..5f3d9c2 100644
--- a/navigation/navigation-fragment/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-fragment/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.navigation.fragment">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.navigation.fragment.test.NavigationActivity"/>
<activity
diff --git a/navigation/navigation-fragment/src/main/AndroidManifest.xml b/navigation/navigation-fragment/src/main/AndroidManifest.xml
index 7b28b7d..8f7e4bc 100644
--- a/navigation/navigation-fragment/src/main/AndroidManifest.xml
+++ b/navigation/navigation-fragment/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.navigation.fragment">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle
index 649c865..0066ce3 100644
--- a/navigation/navigation-runtime-ktx/build.gradle
+++ b/navigation/navigation-runtime-ktx/build.gradle
@@ -36,3 +36,7 @@
inceptionYear = "2018"
description = "Android Navigation-Runtime-Ktx"
}
+
+android {
+ namespace "androidx.navigation.ktx"
+}
diff --git a/navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml b/navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml
index b9a4f14..8358852 100644
--- a/navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.navigation.ktx"/>
+<manifest />
diff --git a/navigation/navigation-runtime-ktx/src/main/AndroidManifest.xml b/navigation/navigation-runtime-ktx/src/main/AndroidManifest.xml
index 799fc93..fdfdce5 100644
--- a/navigation/navigation-runtime-ktx/src/main/AndroidManifest.xml
+++ b/navigation/navigation-runtime-ktx/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.navigation.ktx"/>
+<manifest />
diff --git a/navigation/navigation-runtime-truth/build.gradle b/navigation/navigation-runtime-truth/build.gradle
index ddf16b6..f93de57 100644
--- a/navigation/navigation-runtime-truth/build.gradle
+++ b/navigation/navigation-runtime-truth/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2019"
description = "Android Navigation-Runtime-Truth"
}
+
+android {
+ namespace "androidx.navigation.truth"
+}
diff --git a/navigation/navigation-runtime-truth/src/androidTest/AndroidManifest.xml b/navigation/navigation-runtime-truth/src/androidTest/AndroidManifest.xml
index 73950a1..23f87a3 100644
--- a/navigation/navigation-runtime-truth/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-runtime-truth/src/androidTest/AndroidManifest.xml
@@ -15,6 +15,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.navigation.truth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-runtime-truth/src/main/AndroidManifest.xml b/navigation/navigation-runtime-truth/src/main/AndroidManifest.xml
index 02bfc09..fdfdce5 100644
--- a/navigation/navigation-runtime-truth/src/main/AndroidManifest.xml
+++ b/navigation/navigation-runtime-truth/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.navigation.truth"/>
+<manifest />
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index 72647cb..1503a98 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -53,6 +53,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.navigation"
}
androidx {
diff --git a/navigation/navigation-runtime/src/androidTest/AndroidManifest.xml b/navigation/navigation-runtime/src/androidTest/AndroidManifest.xml
index 87d1e54..2beb477 100644
--- a/navigation/navigation-runtime/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-runtime/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.navigation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.multidex.MultiDexApplication">
diff --git a/navigation/navigation-runtime/src/main/AndroidManifest.xml b/navigation/navigation-runtime/src/main/AndroidManifest.xml
index db6466c..8f7e4bc 100644
--- a/navigation/navigation-runtime/src/main/AndroidManifest.xml
+++ b/navigation/navigation-runtime/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.navigation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-testing/build.gradle b/navigation/navigation-testing/build.gradle
index 6c1a3f2..8dde763 100644
--- a/navigation/navigation-testing/build.gradle
+++ b/navigation/navigation-testing/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2017"
description = "Android Navigation-Testing"
}
+
+android {
+ namespace "androidx.navigation.testing"
+}
diff --git a/navigation/navigation-testing/src/androidTest/AndroidManifest.xml b/navigation/navigation-testing/src/androidTest/AndroidManifest.xml
index 1d483b4..67736d0 100644
--- a/navigation/navigation-testing/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-testing/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ 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.navigation.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-testing/src/main/AndroidManifest.xml b/navigation/navigation-testing/src/main/AndroidManifest.xml
index 1d483b4..67736d0 100644
--- a/navigation/navigation-testing/src/main/AndroidManifest.xml
+++ b/navigation/navigation-testing/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ 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.navigation.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/navigation/navigation-ui-ktx/build.gradle b/navigation/navigation-ui-ktx/build.gradle
index a6a2d72..4e889f5 100644
--- a/navigation/navigation-ui-ktx/build.gradle
+++ b/navigation/navigation-ui-ktx/build.gradle
@@ -36,3 +36,7 @@
inceptionYear = "2018"
description = "Android Navigation-UI-Ktx"
}
+
+android {
+ namespace "androidx.navigation.ui.ktx"
+}
diff --git a/navigation/navigation-ui-ktx/src/main/AndroidManifest.xml b/navigation/navigation-ui-ktx/src/main/AndroidManifest.xml
index 120cc3f..fdfdce5 100644
--- a/navigation/navigation-ui-ktx/src/main/AndroidManifest.xml
+++ b/navigation/navigation-ui-ktx/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.navigation.ui.ktx"/>
+<manifest />
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle
index c252bc0..ffb52e84 100644
--- a/navigation/navigation-ui/build.gradle
+++ b/navigation/navigation-ui/build.gradle
@@ -31,6 +31,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.navigation.ui"
}
dependencies {
diff --git a/navigation/navigation-ui/src/androidTest/AndroidManifest.xml b/navigation/navigation-ui/src/androidTest/AndroidManifest.xml
index 59d8580a..ae566f8 100644
--- a/navigation/navigation-ui/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-ui/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.navigation.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:name="androidx.multidex.MultiDexApplication" />
</manifest>
diff --git a/navigation/navigation-ui/src/main/AndroidManifest.xml b/navigation/navigation-ui/src/main/AndroidManifest.xml
index 4db5212..8f7e4bc 100644
--- a/navigation/navigation-ui/src/main/AndroidManifest.xml
+++ b/navigation/navigation-ui/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.navigation.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle
index bb064965..82eccc1 100644
--- a/paging/integration-tests/testapp/build.gradle
+++ b/paging/integration-tests/testapp/build.gradle
@@ -55,6 +55,10 @@
}
}
+android {
+ namespace "androidx.paging.integration.testapp"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/integration-tests/testapp/src/main/AndroidManifest.xml b/paging/integration-tests/testapp/src/main/AndroidManifest.xml
index 8bd2d51..07aa39b 100644
--- a/paging/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/paging/integration-tests/testapp/src/main/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.paging.integration.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index 166f4cc..8a6a33b 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -53,3 +53,7 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.paging.compose"
+}
diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle
index 4d9005b5..7e1b213 100644
--- a/paging/paging-compose/integration-tests/paging-demos/build.gradle
+++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle
@@ -45,3 +45,7 @@
inceptionYear = "2020"
description = "This is a project for Paging demos."
}
+
+android {
+ namespace "androidx.paging.compose.demos"
+}
diff --git a/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml b/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml
index 1f0faaa..deac81d 100644
--- a/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml
+++ b/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.paging.compose.demos" />
+<manifest />
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle
index 1a9576b..d5b9c9f 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2020"
description = "Contains the sample code for the Androidx Paging library compose interop"
}
+
+android {
+ namespace "androidx.paging.compose.samples"
+}
diff --git a/paging/paging-compose/samples/src/main/AndroidManifest.xml b/paging/paging-compose/samples/src/main/AndroidManifest.xml
index c9f148e..deac81d 100644
--- a/paging/paging-compose/samples/src/main/AndroidManifest.xml
+++ b/paging/paging-compose/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.paging.compose.samples" />
+<manifest />
diff --git a/paging/paging-compose/src/androidTest/AndroidManifest.xml b/paging/paging-compose/src/androidTest/AndroidManifest.xml
index dbe6304..9cd4123 100644
--- a/paging/paging-compose/src/androidTest/AndroidManifest.xml
+++ b/paging/paging-compose/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.paging.compose" />
+<manifest />
diff --git a/paging/paging-compose/src/main/AndroidManifest.xml b/paging/paging-compose/src/main/AndroidManifest.xml
index dbe6304..9cd4123 100644
--- a/paging/paging-compose/src/main/AndroidManifest.xml
+++ b/paging/paging-compose/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.paging.compose" />
+<manifest />
diff --git a/paging/paging-guava/build.gradle b/paging/paging-guava/build.gradle
index 1a1b463..10a8b75 100644
--- a/paging/paging-guava/build.gradle
+++ b/paging/paging-guava/build.gradle
@@ -47,6 +47,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.paging.guava"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/paging-guava/src/main/AndroidManifest.xml b/paging/paging-guava/src/main/AndroidManifest.xml
index ac2ee69..f15bef6 100644
--- a/paging/paging-guava/src/main/AndroidManifest.xml
+++ b/paging/paging-guava/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.guava">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/paging-runtime-ktx/build.gradle b/paging/paging-runtime-ktx/build.gradle
index f350d22..4ec8ec9 100644
--- a/paging/paging-runtime-ktx/build.gradle
+++ b/paging/paging-runtime-ktx/build.gradle
@@ -35,3 +35,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'paging-runtime' artifact"
}
+
+android {
+ namespace "androidx.paging.runtime.ktx"
+}
diff --git a/paging/paging-runtime-ktx/src/main/AndroidManifest.xml b/paging/paging-runtime-ktx/src/main/AndroidManifest.xml
index 344917f..61b6811 100644
--- a/paging/paging-runtime-ktx/src/main/AndroidManifest.xml
+++ b/paging/paging-runtime-ktx/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.paging.runtime.ktx"/>
+<manifest />
diff --git a/paging/paging-runtime/build.gradle b/paging/paging-runtime/build.gradle
index 5fed201..9a32fcd 100644
--- a/paging/paging-runtime/build.gradle
+++ b/paging/paging-runtime/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.paging.runtime"
}
dependencies {
diff --git a/paging/paging-runtime/src/main/AndroidManifest.xml b/paging/paging-runtime/src/main/AndroidManifest.xml
index 5f0d628e..7b5bc6e 100644
--- a/paging/paging-runtime/src/main/AndroidManifest.xml
+++ b/paging/paging-runtime/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.paging.runtime"/>
+<manifest />
diff --git a/paging/paging-rxjava2-ktx/build.gradle b/paging/paging-rxjava2-ktx/build.gradle
index 81ebe3d..0d9d6d8 100644
--- a/paging/paging-rxjava2-ktx/build.gradle
+++ b/paging/paging-rxjava2-ktx/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'paging-rxjava2' artifact"
}
+
+android {
+ namespace "androidx.paging.rxjava2.ktx"
+}
diff --git a/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml b/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml
index bdff181..dd3d3a3 100644
--- a/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml
+++ b/paging/paging-rxjava2-ktx/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.paging.rxjava2.ktx"/>
+<manifest />
diff --git a/paging/paging-rxjava2/build.gradle b/paging/paging-rxjava2/build.gradle
index 771eee2..64d838a 100644
--- a/paging/paging-rxjava2/build.gradle
+++ b/paging/paging-rxjava2/build.gradle
@@ -55,6 +55,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.paging.rxjava2"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml b/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml
index c853765..61b6811 100644
--- a/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml
+++ b/paging/paging-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.paging.rxjava2"/>
+<manifest />
diff --git a/paging/paging-rxjava2/src/main/AndroidManifest.xml b/paging/paging-rxjava2/src/main/AndroidManifest.xml
index 4552633..f15bef6 100644
--- a/paging/paging-rxjava2/src/main/AndroidManifest.xml
+++ b/paging/paging-rxjava2/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/paging-rxjava3/build.gradle b/paging/paging-rxjava3/build.gradle
index 5cd5bf6..58cb03c 100644
--- a/paging/paging-rxjava3/build.gradle
+++ b/paging/paging-rxjava3/build.gradle
@@ -53,6 +53,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.paging.rxjava3"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml b/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml
index 2788f86..3c3c224 100644
--- a/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml
+++ b/paging/paging-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.paging.rxjava3"/>
+<manifest />
diff --git a/paging/paging-rxjava3/src/main/AndroidManifest.xml b/paging/paging-rxjava3/src/main/AndroidManifest.xml
index df90e392..9a93f59 100644
--- a/paging/paging-rxjava3/src/main/AndroidManifest.xml
+++ b/paging/paging-rxjava3/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/samples/build.gradle b/paging/samples/build.gradle
index a6b63e4..3bb5bd9 100644
--- a/paging/samples/build.gradle
+++ b/paging/samples/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.paging.samples"
}
dependencies {
diff --git a/paging/samples/src/main/AndroidManifest.xml b/paging/samples/src/main/AndroidManifest.xml
index 344848e..eda0e80 100644
--- a/paging/samples/src/main/AndroidManifest.xml
+++ b/paging/samples/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.paging.samples"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle
index 1b31f6e..0fbe185 100644
--- a/palette/palette-ktx/build.gradle
+++ b/palette/palette-ktx/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'palette' artifact"
}
+
+android {
+ namespace "androidx.palette.ktx"
+}
diff --git a/palette/palette-ktx/src/main/AndroidManifest.xml b/palette/palette-ktx/src/main/AndroidManifest.xml
index f25fda5..7535bfb 100644
--- a/palette/palette-ktx/src/main/AndroidManifest.xml
+++ b/palette/palette-ktx/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.palette.ktx"/>
+<manifest />
diff --git a/palette/palette/build.gradle b/palette/palette/build.gradle
index 64a3d47..14f3c00 100644
--- a/palette/palette/build.gradle
+++ b/palette/palette/build.gradle
@@ -23,3 +23,7 @@
inceptionYear = "2014"
description = "Android Support Palette"
}
+
+android {
+ namespace "androidx.palette"
+}
diff --git a/palette/palette/src/androidTest/AndroidManifest.xml b/palette/palette/src/androidTest/AndroidManifest.xml
index 03db0ba..09ba91d 100644
--- a/palette/palette/src/androidTest/AndroidManifest.xml
+++ b/palette/palette/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.palette.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/palette/palette/src/main/AndroidManifest.xml b/palette/palette/src/main/AndroidManifest.xml
index 78051f8..6f49e23 100644
--- a/palette/palette/src/main/AndroidManifest.xml
+++ b/palette/palette/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.palette"/>
+<manifest />
diff --git a/percentlayout/percentlayout/build.gradle b/percentlayout/percentlayout/build.gradle
index 44ddc22..a69daf7 100644
--- a/percentlayout/percentlayout/build.gradle
+++ b/percentlayout/percentlayout/build.gradle
@@ -20,6 +20,7 @@
sourceSets {
main.res.srcDir "res"
}
+ namespace "androidx.percentlayout"
}
androidx {
diff --git a/percentlayout/percentlayout/src/androidTest/AndroidManifest.xml b/percentlayout/percentlayout/src/androidTest/AndroidManifest.xml
index cf274a1..e9aa8e6 100644
--- a/percentlayout/percentlayout/src/androidTest/AndroidManifest.xml
+++ b/percentlayout/percentlayout/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.percentlayout.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity android:name="androidx.percentlayout.widget.TestFrameActivity"/>
diff --git a/percentlayout/percentlayout/src/main/AndroidManifest.xml b/percentlayout/percentlayout/src/main/AndroidManifest.xml
index ec1ab58..5197378 100644
--- a/percentlayout/percentlayout/src/main/AndroidManifest.xml
+++ b/percentlayout/percentlayout/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.percentlayout"/>
+<manifest />
diff --git a/placeholder-tests/build.gradle b/placeholder-tests/build.gradle
index f96a629..20e7b60e 100644
--- a/placeholder-tests/build.gradle
+++ b/placeholder-tests/build.gradle
@@ -30,3 +30,7 @@
androidx {
name = "Dummy Project for test runner"
}
+
+android {
+ namespace "androidx.testinfra.placeholderintegrationtest"
+}
diff --git a/placeholder-tests/src/main/AndroidManifest.xml b/placeholder-tests/src/main/AndroidManifest.xml
index 73e9a48..24b9bf5 100644
--- a/placeholder-tests/src/main/AndroidManifest.xml
+++ b/placeholder-tests/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest
- package="androidx.testinfra.placeholderintegrationtest">
+<manifest>
<application/>
</manifest>
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle
index ce37ae2..b10c5b1 100644
--- a/preference/preference-ktx/build.gradle
+++ b/preference/preference-ktx/build.gradle
@@ -48,3 +48,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for preferences"
}
+
+android {
+ namespace "androidx.preference.ktx"
+}
diff --git a/preference/preference-ktx/src/androidTest/AndroidManifest.xml b/preference/preference-ktx/src/androidTest/AndroidManifest.xml
index 9779600..3ed7dda 100644
--- a/preference/preference-ktx/src/androidTest/AndroidManifest.xml
+++ b/preference/preference-ktx/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.preference.ktx.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="androidx.preference.PreferenceTestHelperActivity"
diff --git a/preference/preference-ktx/src/main/AndroidManifest.xml b/preference/preference-ktx/src/main/AndroidManifest.xml
index 3ef184a..7535bfb 100644
--- a/preference/preference-ktx/src/main/AndroidManifest.xml
+++ b/preference/preference-ktx/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.preference.ktx"/>
+<manifest />
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle
index 7bc39d8..73f104c 100644
--- a/preference/preference/build.gradle
+++ b/preference/preference/build.gradle
@@ -60,6 +60,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.preference"
}
androidx {
diff --git a/preference/preference/src/androidTest/AndroidManifest.xml b/preference/preference/src/androidTest/AndroidManifest.xml
index 617f90a6..467d865 100644
--- a/preference/preference/src/androidTest/AndroidManifest.xml
+++ b/preference/preference/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.preference.tests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:name="androidx.multidex.MultiDexApplication">
<activity
diff --git a/preference/preference/src/main/AndroidManifest.xml b/preference/preference/src/main/AndroidManifest.xml
index 414d24d..5197378 100644
--- a/preference/preference/src/main/AndroidManifest.xml
+++ b/preference/preference/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.preference"/>
+<manifest />
diff --git a/print/print/build.gradle b/print/print/build.gradle
index c9d4b2e..548c919 100644
--- a/print/print/build.gradle
+++ b/print/print/build.gradle
@@ -16,3 +16,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.print"
+}
diff --git a/print/print/src/main/AndroidManifest.xml b/print/print/src/main/AndroidManifest.xml
index 2d7881b..6f49e23 100644
--- a/print/print/src/main/AndroidManifest.xml
+++ b/print/print/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.print"/>
+<manifest />
diff --git a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
index f97eac2..cf83e68 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
+++ b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
@@ -28,6 +28,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ namespace "androidx.profileinstaller.integration.macrobenchmark.target"
}
dependencies {
diff --git a/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml b/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml
index 7e904e6..edb6a9b 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/profileinstaller/integration-tests/init-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.profileinstaller.integration.macrobenchmark.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Profileinstaller Macrobenchmark Target"
diff --git a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
index 1e4c510..d9d0eb3 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
+++ b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
@@ -24,6 +24,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.profileinstaller.integration.macrobenchmark"
}
dependencies {
diff --git a/profileinstaller/integration-tests/init-macrobenchmark/src/androidTest/AndroidManifest.xml b/profileinstaller/integration-tests/init-macrobenchmark/src/androidTest/AndroidManifest.xml
index c1bd315..5b41847 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/profileinstaller/integration-tests/init-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.profileinstaller.integration.macrobenchmark.test"/>
+<manifest />
diff --git a/profileinstaller/integration-tests/init-macrobenchmark/src/main/AndroidManifest.xml b/profileinstaller/integration-tests/init-macrobenchmark/src/main/AndroidManifest.xml
index ccd5d59..ed173d5 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark/src/main/AndroidManifest.xml
+++ b/profileinstaller/integration-tests/init-macrobenchmark/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.profileinstaller.integration.macrobenchmark" />
+<manifest />
diff --git a/profileinstaller/profileinstaller-benchmark/build.gradle b/profileinstaller/profileinstaller-benchmark/build.gradle
index 8b24635..f9f56b9 100644
--- a/profileinstaller/profileinstaller-benchmark/build.gradle
+++ b/profileinstaller/profileinstaller-benchmark/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2021"
description = "Profileinstaller Benchmarks"
}
+
+android {
+ namespace "androidx.profileinstaller.benchmark"
+}
diff --git a/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml b/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml
index 604941e..097b102 100644
--- a/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml
+++ b/profileinstaller/profileinstaller-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.profileinstaller.benchmark">
+ 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/profileinstaller/profileinstaller-benchmark/src/main/AndroidManifest.xml b/profileinstaller/profileinstaller-benchmark/src/main/AndroidManifest.xml
index 62c9bea..29b496b 100644
--- a/profileinstaller/profileinstaller-benchmark/src/main/AndroidManifest.xml
+++ b/profileinstaller/profileinstaller-benchmark/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.profileinstaller.benchmark" />
+<manifest />
diff --git a/profileinstaller/profileinstaller/build.gradle b/profileinstaller/profileinstaller/build.gradle
index bb206f8..7ae0020 100644
--- a/profileinstaller/profileinstaller/build.gradle
+++ b/profileinstaller/profileinstaller/build.gradle
@@ -37,3 +37,7 @@
description = "Allows libraries to prepopulate ahead of time compilation traces to be read by" +
" ART"
}
+
+android {
+ namespace "androidx.profileinstaller"
+}
diff --git a/profileinstaller/profileinstaller/src/main/AndroidManifest.xml b/profileinstaller/profileinstaller/src/main/AndroidManifest.xml
index bd17478..0a055c0 100644
--- a/profileinstaller/profileinstaller/src/main/AndroidManifest.xml
+++ b/profileinstaller/profileinstaller/src/main/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.profileinstaller">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<provider
android:name="androidx.startup.InitializationProvider"
diff --git a/profileinstaller/profileinstaller/src/test/AndroidManifest.xml b/profileinstaller/profileinstaller/src/test/AndroidManifest.xml
index 43fa506..4d68dc2 100644
--- a/profileinstaller/profileinstaller/src/test/AndroidManifest.xml
+++ b/profileinstaller/profileinstaller/src/test/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.profileinstaller.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/recommendation/recommendation/build.gradle b/recommendation/recommendation/build.gradle
index 4cee198..4e37e3c 100644
--- a/recommendation/recommendation/build.gradle
+++ b/recommendation/recommendation/build.gradle
@@ -13,6 +13,7 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "androidx.recommendation"
}
androidx {
diff --git a/recommendation/recommendation/src/main/AndroidManifest.xml b/recommendation/recommendation/src/main/AndroidManifest.xml
index d258a6a..6f49e23 100644
--- a/recommendation/recommendation/src/main/AndroidManifest.xml
+++ b/recommendation/recommendation/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.recommendation"/>
+<manifest />
diff --git a/recyclerview/recyclerview-benchmark/build.gradle b/recyclerview/recyclerview-benchmark/build.gradle
index bf7a0e0..092475c 100644
--- a/recyclerview/recyclerview-benchmark/build.gradle
+++ b/recyclerview/recyclerview-benchmark/build.gradle
@@ -32,3 +32,7 @@
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.kotlinStdlib)
}
+
+android {
+ namespace "androidx.recyclerview.benchmark"
+}
diff --git a/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml b/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
index d79a491..6afcf10 100644
--- a/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
@@ -15,14 +15,13 @@
~ limitations under the License.
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.recyclerview.benchmark">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
<activity
- android:name=".RecyclerViewActivity"
+ android:name="androidx.recyclerview.benchmark.RecyclerViewActivity"
android:theme="@style/BenchmarkTheme"/>
</application>
</manifest>
diff --git a/recyclerview/recyclerview-benchmark/src/main/AndroidManifest.xml b/recyclerview/recyclerview-benchmark/src/main/AndroidManifest.xml
index 30dc888..37aba03 100644
--- a/recyclerview/recyclerview-benchmark/src/main/AndroidManifest.xml
+++ b/recyclerview/recyclerview-benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.recyclerview.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/recyclerview/recyclerview-selection/build.gradle b/recyclerview/recyclerview-selection/build.gradle
index a807176..7641371 100644
--- a/recyclerview/recyclerview-selection/build.gradle
+++ b/recyclerview/recyclerview-selection/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2017"
description = "Library providing item selection framework for RecyclerView. Support for touch based and band selection is provided."
}
+
+android {
+ namespace "androidx.recyclerview.selection"
+}
diff --git a/recyclerview/recyclerview-selection/src/androidTest/AndroidManifest.xml b/recyclerview/recyclerview-selection/src/androidTest/AndroidManifest.xml
index c0a0dc7..f1a0e918 100644
--- a/recyclerview/recyclerview-selection/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/recyclerview-selection/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.recyclerview.selection.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
</application>
diff --git a/recyclerview/recyclerview-selection/src/main/AndroidManifest.xml b/recyclerview/recyclerview-selection/src/main/AndroidManifest.xml
index e4eaade..8162281 100644
--- a/recyclerview/recyclerview-selection/src/main/AndroidManifest.xml
+++ b/recyclerview/recyclerview-selection/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.recyclerview.selection"/>
+<manifest />
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index 6c9c017..2e7378c 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -51,6 +51,7 @@
testInstrumentationRunner "androidx.testutils.ActivityRecyclingAndroidJUnitRunner"
multiDexEnabled true
}
+ namespace "androidx.recyclerview"
}
androidx {
diff --git a/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml b/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml
index 881938c..a60d13a 100644
--- a/recyclerview/recyclerview/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/recyclerview/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="android.support.v7.recyclerview.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:name="androidx.multidex.MultiDexApplication" android:supportsRtl="true">
<activity android:name="androidx.recyclerview.test.RecyclerViewTestActivity"/>
diff --git a/recyclerview/recyclerview/src/main/AndroidManifest.xml b/recyclerview/recyclerview/src/main/AndroidManifest.xml
index e335835..3c8a63b 100644
--- a/recyclerview/recyclerview/src/main/AndroidManifest.xml
+++ b/recyclerview/recyclerview/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.recyclerview"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle
index 496aeb3..fa66a98 100644
--- a/remotecallback/remotecallback/build.gradle
+++ b/remotecallback/remotecallback/build.gradle
@@ -37,6 +37,7 @@
buildTypes.all {
consumerProguardFiles("proguard-rules.pro")
}
+ namespace "androidx.remotecallback"
}
androidx {
diff --git a/remotecallback/remotecallback/src/androidTest/AndroidManifest.xml b/remotecallback/remotecallback/src/androidTest/AndroidManifest.xml
index 31cd916..8221c86 100644
--- a/remotecallback/remotecallback/src/androidTest/AndroidManifest.xml
+++ b/remotecallback/remotecallback/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.remotecallback.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<receiver android:name="androidx.remotecallback.BasicReceiverTest$BroadcastReceiver" />
diff --git a/remotecallback/remotecallback/src/main/AndroidManifest.xml b/remotecallback/remotecallback/src/main/AndroidManifest.xml
index 6e877b3..ca8cdb4 100644
--- a/remotecallback/remotecallback/src/main/AndroidManifest.xml
+++ b/remotecallback/remotecallback/src/main/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.remotecallback">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<receiver android:name=".ProviderRelayReceiver" />
diff --git a/room/benchmark/build.gradle b/room/benchmark/build.gradle
index c2f2aa9..ffbc949 100644
--- a/room/benchmark/build.gradle
+++ b/room/benchmark/build.gradle
@@ -39,3 +39,7 @@
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(project(":internal-testutils-common"))
}
+
+android {
+ namespace "androidx.room.benchmark"
+}
diff --git a/room/benchmark/src/androidTest/AndroidManifest.xml b/room/benchmark/src/androidTest/AndroidManifest.xml
index 42ea1a8..097b102 100644
--- a/room/benchmark/src/androidTest/AndroidManifest.xml
+++ b/room/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.room.benchmark">
+ 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/room/benchmark/src/main/AndroidManifest.xml b/room/benchmark/src/main/AndroidManifest.xml
index 2745789..37aba03 100644
--- a/room/benchmark/src/main/AndroidManifest.xml
+++ b/room/benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.room.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/room/integration-tests/autovaluetestapp/build.gradle b/room/integration-tests/autovaluetestapp/build.gradle
index c730988..c2b23f1 100644
--- a/room/integration-tests/autovaluetestapp/build.gradle
+++ b/room/integration-tests/autovaluetestapp/build.gradle
@@ -51,6 +51,10 @@
testImplementation(libs.junit)
}
+android {
+ namespace "androidx.room.integration.autovaluetestapp"
+}
+
// Enable parameter names to support Room incremental when its a project() dep.
// See b/198431380
tasks.withType(JavaCompile) {
diff --git a/room/integration-tests/autovaluetestapp/src/main/AndroidManifest.xml b/room/integration-tests/autovaluetestapp/src/main/AndroidManifest.xml
index 3656aab..06437f9 100644
--- a/room/integration-tests/autovaluetestapp/src/main/AndroidManifest.xml
+++ b/room/integration-tests/autovaluetestapp/src/main/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.room.integration.autovaluetestapp"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 79da109..5d9c6c3 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -64,6 +64,7 @@
dimension "processorConfiguration"
}
}
+ namespace "androidx.room.integration.kotlintestapp"
}
dependencies {
diff --git a/room/integration-tests/kotlintestapp/src/main/AndroidManifest.xml b/room/integration-tests/kotlintestapp/src/main/AndroidManifest.xml
index 690eeb5..56014e3 100644
--- a/room/integration-tests/kotlintestapp/src/main/AndroidManifest.xml
+++ b/room/integration-tests/kotlintestapp/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.room.integration.kotlintestapp"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/room/integration-tests/noappcompattestapp/build.gradle b/room/integration-tests/noappcompattestapp/build.gradle
index 5529e27..07dfb8c7 100644
--- a/room/integration-tests/noappcompattestapp/build.gradle
+++ b/room/integration-tests/noappcompattestapp/build.gradle
@@ -33,6 +33,10 @@
testImplementation(libs.junit)
}
+android {
+ namespace "androidx.room.integration.noappcompat"
+}
+
// Enable parameter names to support Room incremental when its a project() dep.
// See b/198431380
tasks.withType(JavaCompile) {
diff --git a/room/integration-tests/noappcompattestapp/src/main/AndroidManifest.xml b/room/integration-tests/noappcompattestapp/src/main/AndroidManifest.xml
index d36e5fc..06437f9 100644
--- a/room/integration-tests/noappcompattestapp/src/main/AndroidManifest.xml
+++ b/room/integration-tests/noappcompattestapp/src/main/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.room.integration.noappcompat"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index 358a6e5..76b7067 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -81,6 +81,7 @@
}
}
}
+ namespace "androidx.room.integration.testapp"
}
dependencies {
diff --git a/room/integration-tests/testapp/src/main/AndroidManifest.xml b/room/integration-tests/testapp/src/main/AndroidManifest.xml
index abd3c54..78a08a5 100644
--- a/room/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/room/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -14,9 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest
- package="androidx.room.integration.testapp"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application
android:name="androidx.multidex.MultiDexApplication"
diff --git a/room/room-guava/build.gradle b/room/room-guava/build.gradle
index 5558b74..1fae3c1 100644
--- a/room/room-guava/build.gradle
+++ b/room/room-guava/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2018"
description = "Android Room Guava"
}
+
+android {
+ namespace "androidx.room.guava"
+}
diff --git a/room/room-guava/src/main/AndroidManifest.xml b/room/room-guava/src/main/AndroidManifest.xml
index cba56a8..f15bef6 100644
--- a/room/room-guava/src/main/AndroidManifest.xml
+++ b/room/room-guava/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.room.guava">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/room/room-ktx/build.gradle b/room/room-ktx/build.gradle
index ab39ab6..ea8af11 100644
--- a/room/room-ktx/build.gradle
+++ b/room/room-ktx/build.gradle
@@ -48,6 +48,10 @@
description = "Android Room Kotlin Extensions"
}
+android {
+ namespace "androidx.room.ktx"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/room/room-ktx/src/main/AndroidManifest.xml b/room/room-ktx/src/main/AndroidManifest.xml
index fe341fb..f15bef6 100644
--- a/room/room-ktx/src/main/AndroidManifest.xml
+++ b/room/room-ktx/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.room.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/room/room-paging/build.gradle b/room/room-paging/build.gradle
index 19003cb..68034c0 100644
--- a/room/room-paging/build.gradle
+++ b/room/room-paging/build.gradle
@@ -39,6 +39,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.room.paging"
}
dependencies {
diff --git a/room/room-paging/src/androidTest/AndroidManifest.xml b/room/room-paging/src/androidTest/AndroidManifest.xml
index 50ba2eb..4d68dc2 100644
--- a/room/room-paging/src/androidTest/AndroidManifest.xml
+++ b/room/room-paging/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.room.paging.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/room/room-paging/src/main/AndroidManifest.xml b/room/room-paging/src/main/AndroidManifest.xml
index fa18cd8..037bd65 100644
--- a/room/room-paging/src/main/AndroidManifest.xml
+++ b/room/room-paging/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.room.paging">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/room/room-runtime/build.gradle b/room/room-runtime/build.gradle
index a7a8db3..60f74f9 100644
--- a/room/room-runtime/build.gradle
+++ b/room/room-runtime/build.gradle
@@ -29,6 +29,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.room"
}
dependencies {
diff --git a/room/room-runtime/src/main/AndroidManifest.xml b/room/room-runtime/src/main/AndroidManifest.xml
index 5d8771f..d8d1302 100644
--- a/room/room-runtime/src/main/AndroidManifest.xml
+++ b/room/room-runtime/src/main/AndroidManifest.xml
@@ -14,9 +14,7 @@
~ limitations under the License.
-->
-<manifest
- package="androidx.room"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application>
diff --git a/room/room-rxjava2/build.gradle b/room/room-rxjava2/build.gradle
index 163a4e2..6b1f6f8 100644
--- a/room/room-rxjava2/build.gradle
+++ b/room/room-rxjava2/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2017"
description = "Android Room RXJava2"
}
+
+android {
+ namespace "androidx.room.rxjava2"
+}
diff --git a/room/room-rxjava2/src/main/AndroidManifest.xml b/room/room-rxjava2/src/main/AndroidManifest.xml
index dc3a472..da23b80 100644
--- a/room/room-rxjava2/src/main/AndroidManifest.xml
+++ b/room/room-rxjava2/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.room.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/room/room-rxjava3/build.gradle b/room/room-rxjava3/build.gradle
index 4f6572e..ce5cd30 100644
--- a/room/room-rxjava3/build.gradle
+++ b/room/room-rxjava3/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2020"
description = "Android Room RXJava3"
}
+
+android {
+ namespace "androidx.room.rxjava3"
+}
diff --git a/room/room-rxjava3/src/main/AndroidManifest.xml b/room/room-rxjava3/src/main/AndroidManifest.xml
index fd2038f..926fcdd 100644
--- a/room/room-rxjava3/src/main/AndroidManifest.xml
+++ b/room/room-rxjava3/src/main/AndroidManifest.xml
@@ -14,5 +14,5 @@
~ limitations under the License.
-->
-<manifest package="androidx.room.rxjava3">
+<manifest>
</manifest>
diff --git a/room/room-testing/build.gradle b/room/room-testing/build.gradle
index 4de2c2c..2bf4ab2 100644
--- a/room/room-testing/build.gradle
+++ b/room/room-testing/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2017"
description = "Android Room Testing"
}
+
+android {
+ namespace "androidx.room.testing"
+}
diff --git a/room/room-testing/src/main/AndroidManifest.xml b/room/room-testing/src/main/AndroidManifest.xml
index 16fc464..da23b80 100644
--- a/room/room-testing/src/main/AndroidManifest.xml
+++ b/room/room-testing/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.room.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index 756cc36..c282a18 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -16,3 +16,7 @@
implementation(libs.kotlinStdlib)
implementation(libs.kotlinCoroutinesAndroid)
}
+
+android {
+ namespace "com.example.android.supportv4"
+}
diff --git a/samples/Support4Demos/src/main/AndroidManifest.xml b/samples/Support4Demos/src/main/AndroidManifest.xml
index a2c2c6d..ca8a773 100644
--- a/samples/Support4Demos/src/main/AndroidManifest.xml
+++ b/samples/Support4Demos/src/main/AndroidManifest.xml
@@ -19,8 +19,7 @@
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
to come from a domain that you own or have control over. -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.supportv4">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:hardwareAccelerated="true"
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index 22f0706..dc3790f 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle
@@ -33,4 +33,5 @@
// TODO: Enable lint after appcompat:1.1.0 release or use lint-baseline.xml instead.
abortOnError false
}
+ namespace "com.example.android.supportv7"
}
diff --git a/samples/Support7Demos/src/main/AndroidManifest.xml b/samples/Support7Demos/src/main/AndroidManifest.xml
index 8e5cc32..d886e97 100644
--- a/samples/Support7Demos/src/main/AndroidManifest.xml
+++ b/samples/Support7Demos/src/main/AndroidManifest.xml
@@ -19,8 +19,7 @@
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
to come from a domain that you own or have control over. -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.supportv7">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Permission for INTERNET is required for streaming video content
from the web, it's not required otherwise. -->
<application
diff --git a/samples/SupportAnimationDemos/build.gradle b/samples/SupportAnimationDemos/build.gradle
index 759e92b..c0c6e5f 100644
--- a/samples/SupportAnimationDemos/build.gradle
+++ b/samples/SupportAnimationDemos/build.gradle
@@ -6,3 +6,7 @@
dependencies {
implementation(project(":dynamicanimation:dynamicanimation"))
}
+
+android {
+ namespace "com.example.android.support.animation"
+}
diff --git a/samples/SupportAnimationDemos/src/main/AndroidManifest.xml b/samples/SupportAnimationDemos/src/main/AndroidManifest.xml
index cf6fc23..32f63b3 100644
--- a/samples/SupportAnimationDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportAnimationDemos/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.support.animation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/app_sample_code"
diff --git a/samples/SupportContentDemos/build.gradle b/samples/SupportContentDemos/build.gradle
index dd39ef8..d2ab9a4 100644
--- a/samples/SupportContentDemos/build.gradle
+++ b/samples/SupportContentDemos/build.gradle
@@ -29,3 +29,7 @@
implementation(project(":coordinatorlayout:coordinatorlayout"))
implementation(project(":core:core"))
}
+
+android {
+ namespace "com.example.android.support.content.demos"
+}
diff --git a/samples/SupportContentDemos/src/main/AndroidManifest.xml b/samples/SupportContentDemos/src/main/AndroidManifest.xml
index 4507e63..7530fa3 100644
--- a/samples/SupportContentDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportContentDemos/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="com.example.android.support.content.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle
index 0104831..94e9a78 100644
--- a/samples/SupportEmojiDemos/build.gradle
+++ b/samples/SupportEmojiDemos/build.gradle
@@ -35,4 +35,5 @@
sourceSets {
main.assets.srcDirs = [new File(fontDir, "supported-emojis").getAbsolutePath()]
}
+ namespace "com.example.android.support.text.emoji"
}
diff --git a/samples/SupportEmojiDemos/src/main/AndroidManifest.xml b/samples/SupportEmojiDemos/src/main/AndroidManifest.xml
index 22000bf..7aac6ed 100755
--- a/samples/SupportEmojiDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportEmojiDemos/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.example.android.support.text.emoji">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:name=".EmojiCompatApplication"
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle
index 906fa29..2526092 100644
--- a/samples/SupportLeanbackDemos/build.gradle
+++ b/samples/SupportLeanbackDemos/build.gradle
@@ -21,4 +21,5 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "com.example.android.leanback"
}
diff --git a/samples/SupportLeanbackDemos/src/main/AndroidManifest.xml b/samples/SupportLeanbackDemos/src/main/AndroidManifest.xml
index 5838c3f..64a5bed 100644
--- a/samples/SupportLeanbackDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportLeanbackDemos/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.example.android.leanback"
android:versionCode="1"
android:versionName="1.0">
diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle
index 160564b..0ce894b 100644
--- a/samples/SupportPreferenceDemos/build.gradle
+++ b/samples/SupportPreferenceDemos/build.gradle
@@ -14,4 +14,8 @@
implementation(project(":recyclerview:recyclerview"))
implementation(project(":leanback:leanback"))
implementation(project(":leanback:leanback-preference"))
+}
+
+android {
+ namespace "com.example.androidx.preference"
}
\ No newline at end of file
diff --git a/samples/SupportPreferenceDemos/src/main/AndroidManifest.xml b/samples/SupportPreferenceDemos/src/main/AndroidManifest.xml
index a743e90a..a43a5de 100644
--- a/samples/SupportPreferenceDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportPreferenceDemos/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.example.androidx.preference">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk
tools:overrideLibrary="
diff --git a/samples/SupportRemoteCallbackDemos/build.gradle b/samples/SupportRemoteCallbackDemos/build.gradle
index f35b59c..4c0746b 100644
--- a/samples/SupportRemoteCallbackDemos/build.gradle
+++ b/samples/SupportRemoteCallbackDemos/build.gradle
@@ -30,4 +30,5 @@
defaultConfig {
minSdkVersion 19
}
+ namespace "com.example.androidx.remotecallback.demos"
}
diff --git a/samples/SupportRemoteCallbackDemos/src/main/AndroidManifest.xml b/samples/SupportRemoteCallbackDemos/src/main/AndroidManifest.xml
index 57a7ff3..050d20c 100644
--- a/samples/SupportRemoteCallbackDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportRemoteCallbackDemos/src/main/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="com.example.androidx.remotecallback.demos">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/samples/SupportSliceDemos/build.gradle b/samples/SupportSliceDemos/build.gradle
index ef57df5..c928b0b 100644
--- a/samples/SupportSliceDemos/build.gradle
+++ b/samples/SupportSliceDemos/build.gradle
@@ -35,4 +35,5 @@
defaultConfig {
minSdkVersion 19
}
+ namespace "com.example.androidx.slice.demos"
}
diff --git a/samples/SupportSliceDemos/src/main/AndroidManifest.xml b/samples/SupportSliceDemos/src/main/AndroidManifest.xml
index 9757694..003d89c 100644
--- a/samples/SupportSliceDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportSliceDemos/src/main/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="com.example.androidx.slice.demos">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="androidx.slice.view, androidx.slice.builders, androidx.slice.core" />
diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle
index 9838c8c..c9e585b 100644
--- a/samples/SupportTransitionDemos/build.gradle
+++ b/samples/SupportTransitionDemos/build.gradle
@@ -14,5 +14,6 @@
aaptOptions {
additionalParameters "--no-version-transitions"
}
+ namespace "com.example.android.support.transition"
}
diff --git a/samples/SupportTransitionDemos/src/main/AndroidManifest.xml b/samples/SupportTransitionDemos/src/main/AndroidManifest.xml
index 4008165..c149625 100644
--- a/samples/SupportTransitionDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportTransitionDemos/src/main/AndroidManifest.xml
@@ -19,8 +19,7 @@
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
to come from a domain that you own or have control over. -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.support.transition">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/app_sample_code"
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle
index 776ef35..505859c 100644
--- a/samples/SupportWearDemos/build.gradle
+++ b/samples/SupportWearDemos/build.gradle
@@ -28,4 +28,5 @@
defaultConfig {
minSdkVersion 24
}
+ namespace "com.example.android.support.wear"
}
diff --git a/samples/SupportWearDemos/src/main/AndroidManifest.xml b/samples/SupportWearDemos/src/main/AndroidManifest.xml
index 5f280d8..5e61f4a 100644
--- a/samples/SupportWearDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportWearDemos/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="com.example.android.support.wear">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/app_sample_code"
diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle
index 7a40c6e..e09dc9f 100644
--- a/savedstate/savedstate-ktx/build.gradle
+++ b/savedstate/savedstate-ktx/build.gradle
@@ -39,3 +39,7 @@
inceptionYear = "2020"
description = "Kotlin extensions for 'savedstate' artifact"
}
+
+android {
+ namespace "androidx.savedstate.ktx"
+}
diff --git a/savedstate/savedstate-ktx/src/main/AndroidManifest.xml b/savedstate/savedstate-ktx/src/main/AndroidManifest.xml
index 1ffcdaf..ee19b21 100644
--- a/savedstate/savedstate-ktx/src/main/AndroidManifest.xml
+++ b/savedstate/savedstate-ktx/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.savedstate.ktx"/>
+<manifest />
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
index 8cf584e..f5735d0 100644
--- a/savedstate/savedstate/build.gradle
+++ b/savedstate/savedstate/build.gradle
@@ -10,6 +10,7 @@
buildTypes.all {
consumerProguardFiles("proguard-rules.pro")
}
+ namespace "androidx.savedstate"
}
dependencies {
diff --git a/savedstate/savedstate/src/androidTest/AndroidManifest.xml b/savedstate/savedstate/src/androidTest/AndroidManifest.xml
index 68a93f6..e61c8c5 100644
--- a/savedstate/savedstate/src/androidTest/AndroidManifest.xml
+++ b/savedstate/savedstate/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.savedstate.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
</application>
diff --git a/savedstate/savedstate/src/main/AndroidManifest.xml b/savedstate/savedstate/src/main/AndroidManifest.xml
index db70f2e..36c2546 100644
--- a/savedstate/savedstate/src/main/AndroidManifest.xml
+++ b/savedstate/savedstate/src/main/AndroidManifest.xml
@@ -13,5 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.savedstate">
+<manifest>
</manifest>
diff --git a/security/security-app-authenticator-testing/build.gradle b/security/security-app-authenticator-testing/build.gradle
index 708c8e7..cc5998e 100644
--- a/security/security-app-authenticator-testing/build.gradle
+++ b/security/security-app-authenticator-testing/build.gradle
@@ -34,6 +34,7 @@
android {
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.security.app.authenticator.testing"
}
androidx {
diff --git a/security/security-app-authenticator-testing/src/androidTest/AndroidManifest.xml b/security/security-app-authenticator-testing/src/androidTest/AndroidManifest.xml
index 901dec6..bf7ad19 100644
--- a/security/security-app-authenticator-testing/src/androidTest/AndroidManifest.xml
+++ b/security/security-app-authenticator-testing/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.security.app.authenticator.testing.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/security/security-app-authenticator-testing/src/main/AndroidManifest.xml b/security/security-app-authenticator-testing/src/main/AndroidManifest.xml
index 24789e6..4d68dc2 100644
--- a/security/security-app-authenticator-testing/src/main/AndroidManifest.xml
+++ b/security/security-app-authenticator-testing/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.security.app.authenticator.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/security/security-app-authenticator/build.gradle b/security/security-app-authenticator/build.gradle
index 45c0ded..21f835c 100644
--- a/security/security-app-authenticator/build.gradle
+++ b/security/security-app-authenticator/build.gradle
@@ -44,6 +44,7 @@
android {
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.security.app.authenticator"
}
androidx {
diff --git a/security/security-app-authenticator/src/androidTest/AndroidManifest.xml b/security/security-app-authenticator/src/androidTest/AndroidManifest.xml
index 1ae9328..44beb7b 100644
--- a/security/security-app-authenticator/src/androidTest/AndroidManifest.xml
+++ b/security/security-app-authenticator/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.security.app.authenticator.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/security/security-app-authenticator/src/main/AndroidManifest.xml b/security/security-app-authenticator/src/main/AndroidManifest.xml
index 239ae64..ef21401 100644
--- a/security/security-app-authenticator/src/main/AndroidManifest.xml
+++ b/security/security-app-authenticator/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.security.app.authenticator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/security/security-biometric/build.gradle b/security/security-biometric/build.gradle
index d7f05e6..9183eab 100644
--- a/security/security-biometric/build.gradle
+++ b/security/security-biometric/build.gradle
@@ -39,6 +39,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.security.biometric"
}
androidx {
diff --git a/security/security-biometric/src/androidTest/AndroidManifest.xml b/security/security-biometric/src/androidTest/AndroidManifest.xml
index 5aae322..beb3c5d 100644
--- a/security/security-biometric/src/androidTest/AndroidManifest.xml
+++ b/security/security-biometric/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.security.biometric.tests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<application>
</application>
diff --git a/security/security-biometric/src/main/AndroidManifest.xml b/security/security-biometric/src/main/AndroidManifest.xml
index fe79f64..36ffb62 100644
--- a/security/security-biometric/src/main/AndroidManifest.xml
+++ b/security/security-biometric/src/main/AndroidManifest.xml
@@ -13,6 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.security.biometric"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/security/security-crypto-ktx/build.gradle b/security/security-crypto-ktx/build.gradle
index ad4ffbe..f2f0acd 100644
--- a/security/security-crypto-ktx/build.gradle
+++ b/security/security-crypto-ktx/build.gradle
@@ -38,6 +38,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.security.ktx"
}
androidx {
diff --git a/security/security-crypto-ktx/src/androidTest/AndroidManifest.xml b/security/security-crypto-ktx/src/androidTest/AndroidManifest.xml
index d5a6597..beb3c5d 100644
--- a/security/security-crypto-ktx/src/androidTest/AndroidManifest.xml
+++ b/security/security-crypto-ktx/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.security.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<application>
</application>
diff --git a/security/security-crypto-ktx/src/main/AndroidManifest.xml b/security/security-crypto-ktx/src/main/AndroidManifest.xml
index 99d697b..36ffb62 100644
--- a/security/security-crypto-ktx/src/main/AndroidManifest.xml
+++ b/security/security-crypto-ktx/src/main/AndroidManifest.xml
@@ -13,6 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.security.ktx"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/security/security-crypto/build.gradle b/security/security-crypto/build.gradle
index d280e84..e7ca0fc 100644
--- a/security/security-crypto/build.gradle
+++ b/security/security-crypto/build.gradle
@@ -42,6 +42,7 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "androidx.security"
}
androidx {
diff --git a/security/security-crypto/src/androidTest/AndroidManifest.xml b/security/security-crypto/src/androidTest/AndroidManifest.xml
index a9e1214..0484333 100644
--- a/security/security-crypto/src/androidTest/AndroidManifest.xml
+++ b/security/security-crypto/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.security.tests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<application>
</application>
diff --git a/security/security-crypto/src/main/AndroidManifest.xml b/security/security-crypto/src/main/AndroidManifest.xml
index 25bdf7a..0d0975d 100644
--- a/security/security-crypto/src/main/AndroidManifest.xml
+++ b/security/security-crypto/src/main/AndroidManifest.xml
@@ -13,6 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.security"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/security/security-identity-credential/build.gradle b/security/security-identity-credential/build.gradle
index a0ce8a4..6b1e4f8 100644
--- a/security/security-identity-credential/build.gradle
+++ b/security/security-identity-credential/build.gradle
@@ -41,6 +41,7 @@
defaultConfig {
minSdkVersion 24
}
+ namespace "androidx.security.identity.credential"
}
androidx {
diff --git a/security/security-identity-credential/src/androidTest/AndroidManifest.xml b/security/security-identity-credential/src/androidTest/AndroidManifest.xml
index 3ec1ea6..074be6b 100644
--- a/security/security-identity-credential/src/androidTest/AndroidManifest.xml
+++ b/security/security-identity-credential/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
limitations under the License
-->
-<manifest
- package="androidx.security.identity.credential.tests">
+<manifest>
</manifest>
diff --git a/security/security-identity-credential/src/main/AndroidManifest.xml b/security/security-identity-credential/src/main/AndroidManifest.xml
index ae5ba7a..78f1829 100644
--- a/security/security-identity-credential/src/main/AndroidManifest.xml
+++ b/security/security-identity-credential/src/main/AndroidManifest.xml
@@ -13,6 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.security.identity.credential"
- >
+<manifest>
</manifest>
\ No newline at end of file
diff --git a/sharetarget/integration-tests/testapp/build.gradle b/sharetarget/integration-tests/testapp/build.gradle
index 6f1bc4f..a36f631 100644
--- a/sharetarget/integration-tests/testapp/build.gradle
+++ b/sharetarget/integration-tests/testapp/build.gradle
@@ -25,3 +25,7 @@
api("androidx.appcompat:appcompat:1.3.1")
api(libs.constraintLayout)
}
+
+android {
+ namespace "androidx.sharetarget.testapp"
+}
diff --git a/sharetarget/integration-tests/testapp/src/main/AndroidManifest.xml b/sharetarget/integration-tests/testapp/src/main/AndroidManifest.xml
index 46fbee3..359ad9d 100644
--- a/sharetarget/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/sharetarget/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.sharetarget.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/sharetarget/sharetarget/build.gradle b/sharetarget/sharetarget/build.gradle
index 4c48094..e9d3b79 100644
--- a/sharetarget/sharetarget/build.gradle
+++ b/sharetarget/sharetarget/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2018"
description = "ShareTarget"
}
+
+android {
+ namespace "androidx.sharetarget"
+}
diff --git a/sharetarget/sharetarget/src/androidTest/AndroidManifest.xml b/sharetarget/sharetarget/src/androidTest/AndroidManifest.xml
index 01e95ab..d6239e6 100644
--- a/sharetarget/sharetarget/src/androidTest/AndroidManifest.xml
+++ b/sharetarget/sharetarget/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="android.support.compat.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<!-- Dummy main activity to provide a "android.app.shortcuts" meta-data entry -->
diff --git a/sharetarget/sharetarget/src/main/AndroidManifest.xml b/sharetarget/sharetarget/src/main/AndroidManifest.xml
index 044e38f..5f88d88 100644
--- a/sharetarget/sharetarget/src/main/AndroidManifest.xml
+++ b/sharetarget/sharetarget/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.sharetarget">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service android:name=".ChooserTargetServiceCompat"
diff --git a/slice/slice-benchmark/build.gradle b/slice/slice-benchmark/build.gradle
index 2f837ff..a8733ea 100644
--- a/slice/slice-benchmark/build.gradle
+++ b/slice/slice-benchmark/build.gradle
@@ -46,3 +46,7 @@
inceptionYear = "2018"
description = "RecyclerView Benchmarks"
}
+
+android {
+ namespace "androidx.slice.benchmark"
+}
diff --git a/slice/slice-benchmark/src/androidTest/AndroidManifest.xml b/slice/slice-benchmark/src/androidTest/AndroidManifest.xml
index ff574dd..097b102 100644
--- a/slice/slice-benchmark/src/androidTest/AndroidManifest.xml
+++ b/slice/slice-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.slice.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/slice/slice-benchmark/src/main/AndroidManifest.xml b/slice/slice-benchmark/src/main/AndroidManifest.xml
index 40d01d2..37aba03 100644
--- a/slice/slice-benchmark/src/main/AndroidManifest.xml
+++ b/slice/slice-benchmark/src/main/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.slice.benchmark"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/slice/slice-builders-ktx/build.gradle b/slice/slice-builders-ktx/build.gradle
index 4965fd7..2fd11c0 100644
--- a/slice/slice-builders-ktx/build.gradle
+++ b/slice/slice-builders-ktx/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
minSdkVersion 19
}
+ namespace "androidx.slice.builders.ktx"
}
dependencies {
diff --git a/slice/slice-builders-ktx/src/androidTest/AndroidManifest.xml b/slice/slice-builders-ktx/src/androidTest/AndroidManifest.xml
index e88f27b..095b558 100644
--- a/slice/slice-builders-ktx/src/androidTest/AndroidManifest.xml
+++ b/slice/slice-builders-ktx/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.slice.builders.ktx.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.slice.builders.TestActivity"/>
diff --git a/slice/slice-builders-ktx/src/main/AndroidManifest.xml b/slice/slice-builders-ktx/src/main/AndroidManifest.xml
index 056bda6..dd3d3a3 100644
--- a/slice/slice-builders-ktx/src/main/AndroidManifest.xml
+++ b/slice/slice-builders-ktx/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.slice.builders.ktx"/>
+<manifest />
diff --git a/slice/slice-builders/build.gradle b/slice/slice-builders/build.gradle
index e6885e3c..eab2fbf 100644
--- a/slice/slice-builders/build.gradle
+++ b/slice/slice-builders/build.gradle
@@ -38,3 +38,7 @@
description = "A set of builders to create templates using SliceProvider APIs"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.slice.builders"
+}
diff --git a/slice/slice-builders/src/main/AndroidManifest.xml b/slice/slice-builders/src/main/AndroidManifest.xml
index 6eababe..95c4426 100644
--- a/slice/slice-builders/src/main/AndroidManifest.xml
+++ b/slice/slice-builders/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.slice.builders"/>
+<manifest />
diff --git a/slice/slice-core/build.gradle b/slice/slice-core/build.gradle
index 4c0c448..bba2449 100644
--- a/slice/slice-core/build.gradle
+++ b/slice/slice-core/build.gradle
@@ -44,3 +44,7 @@
description = "The slices core library provides utilities for the slices view and provider libraries"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.slice.core"
+}
diff --git a/slice/slice-core/src/androidTest/AndroidManifest.xml b/slice/slice-core/src/androidTest/AndroidManifest.xml
index 636cb63..5331603 100644
--- a/slice/slice-core/src/androidTest/AndroidManifest.xml
+++ b/slice/slice-core/src/androidTest/AndroidManifest.xml
@@ -15,8 +15,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.slice.core.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<provider android:name="androidx.slice.SliceTestProvider"
diff --git a/slice/slice-core/src/main/AndroidManifest.xml b/slice/slice-core/src/main/AndroidManifest.xml
index 8a748c9..ccc9b6c 100644
--- a/slice/slice-core/src/main/AndroidManifest.xml
+++ b/slice/slice-core/src/main/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.slice.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.slice.compat.SlicePermissionActivity"
android:excludeFromRecents="true">
diff --git a/slice/slice-remotecallback/build.gradle b/slice/slice-remotecallback/build.gradle
index 20a573e..7a75ffecf 100644
--- a/slice/slice-remotecallback/build.gradle
+++ b/slice/slice-remotecallback/build.gradle
@@ -44,3 +44,7 @@
description = "A library that handles PendingIntents in slices as remote callbacks"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.slice.remotecallback"
+}
diff --git a/slice/slice-remotecallback/src/androidTest/AndroidManifest.xml b/slice/slice-remotecallback/src/androidTest/AndroidManifest.xml
index 5dba38c..432d2e3 100644
--- a/slice/slice-remotecallback/src/androidTest/AndroidManifest.xml
+++ b/slice/slice-remotecallback/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.slice.remotecallback.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<provider android:name="androidx.slice.remotecallback.RemoteSliceProviderTest$Provider"
diff --git a/slice/slice-remotecallback/src/main/AndroidManifest.xml b/slice/slice-remotecallback/src/main/AndroidManifest.xml
index 8bfbcbf..dcf3758 100644
--- a/slice/slice-remotecallback/src/main/AndroidManifest.xml
+++ b/slice/slice-remotecallback/src/main/AndroidManifest.xml
@@ -13,5 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <manifest package="androidx.slice.remotecallback"/>
+ <manifest />
diff --git a/slice/slice-test/build.gradle b/slice/slice-test/build.gradle
index 135ae59..8268e8f 100644
--- a/slice/slice-test/build.gradle
+++ b/slice/slice-test/build.gradle
@@ -47,3 +47,7 @@
description = "A library that holds common code for testing slices"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.slice.test"
+}
diff --git a/slice/slice-test/src/main/AndroidManifest.xml b/slice/slice-test/src/main/AndroidManifest.xml
index de0ce99..9d91fc7 100644
--- a/slice/slice-test/src/main/AndroidManifest.xml
+++ b/slice/slice-test/src/main/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.slice.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<application>
diff --git a/slice/slice-view/build.gradle b/slice/slice-view/build.gradle
index e51b6ac..f36b668 100644
--- a/slice/slice-view/build.gradle
+++ b/slice/slice-view/build.gradle
@@ -48,3 +48,7 @@
description = "A library that handles rendering of slice content into supported templates"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.slice.view"
+}
diff --git a/slice/slice-view/src/androidTest/AndroidManifest.xml b/slice/slice-view/src/androidTest/AndroidManifest.xml
index 213c0fe..2fcdef5 100644
--- a/slice/slice-view/src/androidTest/AndroidManifest.xml
+++ b/slice/slice-view/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.slice.view.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:label="Slice Render Test">
<activity
diff --git a/slice/slice-view/src/main/AndroidManifest.xml b/slice/slice-view/src/main/AndroidManifest.xml
index ae0565b..6f49e23 100644
--- a/slice/slice-view/src/main/AndroidManifest.xml
+++ b/slice/slice-view/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.slice.view"/>
+<manifest />
diff --git a/slidingpanelayout/slidingpanelayout/build.gradle b/slidingpanelayout/slidingpanelayout/build.gradle
index e27ea31..08fca49 100644
--- a/slidingpanelayout/slidingpanelayout/build.gradle
+++ b/slidingpanelayout/slidingpanelayout/build.gradle
@@ -29,3 +29,7 @@
inceptionYear = "2018"
description = "SlidingPaneLayout offers a responsive, two pane layout that automatically switches between overlapping panes on smaller devices to a side by side view on larger devices."
}
+
+android {
+ namespace "androidx.slidingpanelayout"
+}
diff --git a/slidingpanelayout/slidingpanelayout/src/androidTest/AndroidManifest.xml b/slidingpanelayout/slidingpanelayout/src/androidTest/AndroidManifest.xml
index ab6ef73..33523b8 100644
--- a/slidingpanelayout/slidingpanelayout/src/androidTest/AndroidManifest.xml
+++ b/slidingpanelayout/slidingpanelayout/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.slidingpanelayout">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:supportsRtl="true">
<activity
diff --git a/slidingpanelayout/slidingpanelayout/src/main/AndroidManifest.xml b/slidingpanelayout/slidingpanelayout/src/main/AndroidManifest.xml
index 91749dd..6f49e23 100644
--- a/slidingpanelayout/slidingpanelayout/src/main/AndroidManifest.xml
+++ b/slidingpanelayout/slidingpanelayout/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.slidingpanelayout"/>
+<manifest />
diff --git a/sqlite/integration-tests/inspection-room-testapp/build.gradle b/sqlite/integration-tests/inspection-room-testapp/build.gradle
index 0084551..af17c84 100644
--- a/sqlite/integration-tests/inspection-room-testapp/build.gradle
+++ b/sqlite/integration-tests/inspection-room-testapp/build.gradle
@@ -41,4 +41,5 @@
// studio pipeline works only starting with Android O
minSdkVersion 26
}
+ namespace "androidx.sqlite.inspection.roomtestapp"
}
diff --git a/sqlite/integration-tests/inspection-room-testapp/src/main/AndroidManifest.xml b/sqlite/integration-tests/inspection-room-testapp/src/main/AndroidManifest.xml
index 6a6069c..6b59a07 100644
--- a/sqlite/integration-tests/inspection-room-testapp/src/main/AndroidManifest.xml
+++ b/sqlite/integration-tests/inspection-room-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.sqlite.inspection.roomtestapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
</application>
</manifest>
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
index 8de9c32..1245b22 100644
--- a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
+++ b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
@@ -42,4 +42,5 @@
// studio pipeline works only starting with Android O
minSdkVersion 26
}
+ namespace "androidx.sqlite.inspection.sqldeligttestapp"
}
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/src/main/AndroidManifest.xml b/sqlite/integration-tests/inspection-sqldelight-testapp/src/main/AndroidManifest.xml
index c44e080..6b59a07 100644
--- a/sqlite/integration-tests/inspection-sqldelight-testapp/src/main/AndroidManifest.xml
+++ b/sqlite/integration-tests/inspection-sqldelight-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.sqlite.inspection.sqldeligttestapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
</application>
</manifest>
diff --git a/sqlite/sqlite-framework/build.gradle b/sqlite/sqlite-framework/build.gradle
index 9dfb2cf..8f170c3 100644
--- a/sqlite/sqlite-framework/build.gradle
+++ b/sqlite/sqlite-framework/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2017"
description = "The implementation of Support SQLite library using the framework code."
}
+
+android {
+ namespace "androidx.sqlite.db.framework"
+}
diff --git a/sqlite/sqlite-framework/src/main/AndroidManifest.xml b/sqlite/sqlite-framework/src/main/AndroidManifest.xml
index f18f9ad..5e1f634 100644
--- a/sqlite/sqlite-framework/src/main/AndroidManifest.xml
+++ b/sqlite/sqlite-framework/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.sqlite.db.framework">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/sqlite/sqlite-inspection/build.gradle b/sqlite/sqlite-inspection/build.gradle
index 9541027..adde681 100644
--- a/sqlite/sqlite-inspection/build.gradle
+++ b/sqlite/sqlite-inspection/build.gradle
@@ -55,6 +55,7 @@
sourceSets {
main.resources.srcDirs += "src/main/proto"
}
+ namespace "androidx.sqlite.inspection"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/sqlite/sqlite-inspection/src/androidTest/AndroidManifest.xml b/sqlite/sqlite-inspection/src/androidTest/AndroidManifest.xml
index 0d654f4..e95a361 100644
--- a/sqlite/sqlite-inspection/src/androidTest/AndroidManifest.xml
+++ b/sqlite/sqlite-inspection/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.sqlite.inspection.testing"/>
+<manifest />
diff --git a/sqlite/sqlite-inspection/src/main/AndroidManifest.xml b/sqlite/sqlite-inspection/src/main/AndroidManifest.xml
index 7bae56a..e95a361 100644
--- a/sqlite/sqlite-inspection/src/main/AndroidManifest.xml
+++ b/sqlite/sqlite-inspection/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.sqlite.inspection"/>
+<manifest />
diff --git a/sqlite/sqlite-ktx/build.gradle b/sqlite/sqlite-ktx/build.gradle
index 0a6a6b7..38d13e0 100644
--- a/sqlite/sqlite-ktx/build.gradle
+++ b/sqlite/sqlite-ktx/build.gradle
@@ -37,3 +37,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for DB"
}
+
+android {
+ namespace "androidx.sqlite.db.ktx"
+}
diff --git a/sqlite/sqlite-ktx/src/main/AndroidManifest.xml b/sqlite/sqlite-ktx/src/main/AndroidManifest.xml
index f4d66ba..29b496b 100644
--- a/sqlite/sqlite-ktx/src/main/AndroidManifest.xml
+++ b/sqlite/sqlite-ktx/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ limitations under the License.
-->
-<manifest package="androidx.sqlite.db.ktx"/>
+<manifest />
diff --git a/sqlite/sqlite/build.gradle b/sqlite/sqlite/build.gradle
index ac6a99c..63ddf32 100644
--- a/sqlite/sqlite/build.gradle
+++ b/sqlite/sqlite/build.gradle
@@ -27,6 +27,10 @@
testImplementation(libs.mockitoCore)
}
+android {
+ namespace "androidx.sqlite.db"
+}
+
// Used by testImplementation in room-compiler
android.libraryVariants.all { variant ->
def name = variant.name
diff --git a/sqlite/sqlite/src/main/AndroidManifest.xml b/sqlite/sqlite/src/main/AndroidManifest.xml
index 8b4263b..5e1f634 100644
--- a/sqlite/sqlite/src/main/AndroidManifest.xml
+++ b/sqlite/sqlite/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.sqlite.db">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/startup/integration-tests/first-library/build.gradle b/startup/integration-tests/first-library/build.gradle
index c9f27d1..3acf247 100644
--- a/startup/integration-tests/first-library/build.gradle
+++ b/startup/integration-tests/first-library/build.gradle
@@ -33,3 +33,7 @@
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker
testImplementation(libs.junit)
}
+
+android {
+ namespace "androidx.startup.first_library"
+}
diff --git a/startup/integration-tests/first-library/src/main/AndroidManifest.xml b/startup/integration-tests/first-library/src/main/AndroidManifest.xml
index b5f96d8..958c0ff 100644
--- a/startup/integration-tests/first-library/src/main/AndroidManifest.xml
+++ b/startup/integration-tests/first-library/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.startup.first_library">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
diff --git a/startup/integration-tests/second-library/build.gradle b/startup/integration-tests/second-library/build.gradle
index 2102ffe..68a15f7 100644
--- a/startup/integration-tests/second-library/build.gradle
+++ b/startup/integration-tests/second-library/build.gradle
@@ -32,3 +32,7 @@
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker
testImplementation(libs.junit)
}
+
+android {
+ namespace "androidx.startup.second_library"
+}
diff --git a/startup/integration-tests/second-library/src/main/AndroidManifest.xml b/startup/integration-tests/second-library/src/main/AndroidManifest.xml
index 5440658..38403da 100644
--- a/startup/integration-tests/second-library/src/main/AndroidManifest.xml
+++ b/startup/integration-tests/second-library/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.startup.second_library">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<provider
diff --git a/startup/integration-tests/test-app/build.gradle b/startup/integration-tests/test-app/build.gradle
index f4a5acc..7dbe4b8 100644
--- a/startup/integration-tests/test-app/build.gradle
+++ b/startup/integration-tests/test-app/build.gradle
@@ -26,6 +26,7 @@
minifyEnabled = true
}
}
+ namespace "androidx.startup.testapp"
}
dependencies {
diff --git a/startup/integration-tests/test-app/src/main/AndroidManifest.xml b/startup/integration-tests/test-app/src/main/AndroidManifest.xml
index d6276df..9128ed2 100644
--- a/startup/integration-tests/test-app/src/main/AndroidManifest.xml
+++ b/startup/integration-tests/test-app/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.startup.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle
index 99bbaeb..7b8b18a 100644
--- a/startup/startup-runtime/build.gradle
+++ b/startup/startup-runtime/build.gradle
@@ -27,6 +27,7 @@
consumerProguardFiles "proguard-rules.pro"
multiDexKeepProguard file("multidex-rules.pro")
}
+ namespace "androidx.startup"
}
dependencies {
diff --git a/startup/startup-runtime/src/main/AndroidManifest.xml b/startup/startup-runtime/src/main/AndroidManifest.xml
index 1688fee..53153df 100644
--- a/startup/startup-runtime/src/main/AndroidManifest.xml
+++ b/startup/startup-runtime/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.startup">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<provider
diff --git a/swiperefreshlayout/swiperefreshlayout/build.gradle b/swiperefreshlayout/swiperefreshlayout/build.gradle
index 288419b..6c86792 100644
--- a/swiperefreshlayout/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/swiperefreshlayout/build.gradle
@@ -35,3 +35,7 @@
inceptionYear = "2018"
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
}
+
+android {
+ namespace "androidx.swiperefreshlayout"
+}
diff --git a/swiperefreshlayout/swiperefreshlayout/src/androidTest/AndroidManifest.xml b/swiperefreshlayout/swiperefreshlayout/src/androidTest/AndroidManifest.xml
index 6ab7d65..f3d9af1 100644
--- a/swiperefreshlayout/swiperefreshlayout/src/androidTest/AndroidManifest.xml
+++ b/swiperefreshlayout/swiperefreshlayout/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="android.support.swiperefreshlayout.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true"
diff --git a/swiperefreshlayout/swiperefreshlayout/src/main/AndroidManifest.xml b/swiperefreshlayout/swiperefreshlayout/src/main/AndroidManifest.xml
index 0a2727d..6f49e23 100644
--- a/swiperefreshlayout/swiperefreshlayout/src/main/AndroidManifest.xml
+++ b/swiperefreshlayout/swiperefreshlayout/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.swiperefreshlayout"/>
+<manifest />
diff --git a/template/template-appwidget/build.gradle b/template/template-appwidget/build.gradle
index b697446..af406fd 100644
--- a/template/template-appwidget/build.gradle
+++ b/template/template-appwidget/build.gradle
@@ -44,3 +44,7 @@
"template functionality to widget development."
targetsJavaConsumers = false
}
+
+android {
+ namespace "androidx.template.appwidget"
+}
diff --git a/template/template-appwidget/integration-tests/demos/build.gradle b/template/template-appwidget/integration-tests/demos/build.gradle
index ad75722..6e6e3fb 100644
--- a/template/template-appwidget/integration-tests/demos/build.gradle
+++ b/template/template-appwidget/integration-tests/demos/build.gradle
@@ -44,4 +44,5 @@
// part of CI.
archivesBaseName = "template-appwidget-demos-testapp"
}
+ namespace "androidx.template.appwidget.demos"
}
diff --git a/template/template-appwidget/integration-tests/demos/src/main/AndroidManifest.xml b/template/template-appwidget/integration-tests/demos/src/main/AndroidManifest.xml
index b2daeef..1a359c1 100644
--- a/template/template-appwidget/integration-tests/demos/src/main/AndroidManifest.xml
+++ b/template/template-appwidget/integration-tests/demos/src/main/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.template.appwidget.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="false"
diff --git a/template/template-appwidget/src/androidMain/AndroidManifest.xml b/template/template-appwidget/src/androidMain/AndroidManifest.xml
index 13e7214..66f8bad3 100644
--- a/template/template-appwidget/src/androidMain/AndroidManifest.xml
+++ b/template/template-appwidget/src/androidMain/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.template.appwidget" />
+<manifest />
diff --git a/template/template/build.gradle b/template/template/build.gradle
index 2a05b82..7fb7309 100644
--- a/template/template/build.gradle
+++ b/template/template/build.gradle
@@ -45,3 +45,7 @@
"glanceable layouts across surface types."
targetsJavaConsumers = false
}
+
+android {
+ namespace "androidx.template.template"
+}
diff --git a/template/template/src/androidMain/AndroidManifest.xml b/template/template/src/androidMain/AndroidManifest.xml
index e82e9b1..66f8bad3 100644
--- a/template/template/src/androidMain/AndroidManifest.xml
+++ b/template/template/src/androidMain/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.template.template" />
+<manifest />
diff --git a/test/ext/junit-gtest/build.gradle b/test/ext/junit-gtest/build.gradle
index 9d5e617..e5f316c 100644
--- a/test/ext/junit-gtest/build.gradle
+++ b/test/ext/junit-gtest/build.gradle
@@ -69,6 +69,7 @@
name "junit-gtest"
}
}
+ namespace "androidx.test.ext.junitgtest"
}
afterEvaluate {
diff --git a/test/ext/junit-gtest/src/androidTest/AndroidManifest.xml b/test/ext/junit-gtest/src/androidTest/AndroidManifest.xml
index ed832fe..4d68dc2 100644
--- a/test/ext/junit-gtest/src/androidTest/AndroidManifest.xml
+++ b/test/ext/junit-gtest/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.test.ext.junitgtest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/test/ext/junit-gtest/src/main/AndroidManifest.xml b/test/ext/junit-gtest/src/main/AndroidManifest.xml
index deb145bf..037bd65 100644
--- a/test/ext/junit-gtest/src/main/AndroidManifest.xml
+++ b/test/ext/junit-gtest/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.test.ext.junitgtest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/test/screenshot/screenshot/build.gradle b/test/screenshot/screenshot/build.gradle
index c47cd72..5726a9b 100644
--- a/test/screenshot/screenshot/build.gradle
+++ b/test/screenshot/screenshot/build.gradle
@@ -43,3 +43,7 @@
type = LibraryType.INTERNAL_TEST_LIBRARY
mavenGroup = LibraryGroups.TESTSCREENSHOT
}
+
+android {
+ namespace "androidx.test.screenshot"
+}
diff --git a/test/screenshot/screenshot/src/main/AndroidManifest.xml b/test/screenshot/screenshot/src/main/AndroidManifest.xml
index aec96e8..61b6811 100644
--- a/test/screenshot/screenshot/src/main/AndroidManifest.xml
+++ b/test/screenshot/screenshot/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.test.screenshot"/>
+<manifest />
diff --git a/testutils/testutils-appcompat/build.gradle b/testutils/testutils-appcompat/build.gradle
index 832c172..ac4b131 100644
--- a/testutils/testutils-appcompat/build.gradle
+++ b/testutils/testutils-appcompat/build.gradle
@@ -37,6 +37,7 @@
lintOptions {
disable "InvalidPackage" // Lint is unhappy about junit package
}
+ namespace "androidx.testutils.appcompat"
}
androidx {
diff --git a/testutils/testutils-appcompat/src/main/AndroidManifest.xml b/testutils/testutils-appcompat/src/main/AndroidManifest.xml
index 6883e42..61b6811 100644
--- a/testutils/testutils-appcompat/src/main/AndroidManifest.xml
+++ b/testutils/testutils-appcompat/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.testutils.appcompat"/>
+<manifest />
diff --git a/testutils/testutils-espresso/build.gradle b/testutils/testutils-espresso/build.gradle
index db5fcf70..8bdb558 100644
--- a/testutils/testutils-espresso/build.gradle
+++ b/testutils/testutils-espresso/build.gradle
@@ -34,6 +34,7 @@
lintOptions {
disable "InvalidPackage" // Lint is unhappy about junit package
}
+ namespace "androidx.testutils.espresso"
}
androidx {
diff --git a/testutils/testutils-espresso/src/main/AndroidManifest.xml b/testutils/testutils-espresso/src/main/AndroidManifest.xml
index 38665d0..61b6811 100644
--- a/testutils/testutils-espresso/src/main/AndroidManifest.xml
+++ b/testutils/testutils-espresso/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.testutils.espresso"/>
+<manifest />
diff --git a/testutils/testutils-macrobenchmark/build.gradle b/testutils/testutils-macrobenchmark/build.gradle
index a239cb8..3f7f009 100644
--- a/testutils/testutils-macrobenchmark/build.gradle
+++ b/testutils/testutils-macrobenchmark/build.gradle
@@ -33,6 +33,7 @@
defaultConfig {
minSdkVersion 23
}
+ namespace "androidx.testutils.macrobenchmark"
}
androidx {
diff --git a/testutils/testutils-macrobenchmark/src/main/AndroidManifest.xml b/testutils/testutils-macrobenchmark/src/main/AndroidManifest.xml
index 01ddb5a..3c3c224 100644
--- a/testutils/testutils-macrobenchmark/src/main/AndroidManifest.xml
+++ b/testutils/testutils-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.testutils.macrobenchmark"/>
+<manifest />
diff --git a/testutils/testutils-mockito/build.gradle b/testutils/testutils-mockito/build.gradle
index 36831bb..c502a0d 100644
--- a/testutils/testutils-mockito/build.gradle
+++ b/testutils/testutils-mockito/build.gradle
@@ -32,6 +32,7 @@
lintOptions {
disable "InvalidPackage" // Lint is unhappy about java.lang.instrument package
}
+ namespace "androidx.testutils.mockito"
}
androidx {
diff --git a/testutils/testutils-mockito/src/main/AndroidManifest.xml b/testutils/testutils-mockito/src/main/AndroidManifest.xml
index dbe1e34..9cd4123 100644
--- a/testutils/testutils-mockito/src/main/AndroidManifest.xml
+++ b/testutils/testutils-mockito/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.testutils.mockito"/>
+<manifest />
diff --git a/testutils/testutils-navigation/build.gradle b/testutils/testutils-navigation/build.gradle
index f22e74e..c6ab842 100644
--- a/testutils/testutils-navigation/build.gradle
+++ b/testutils/testutils-navigation/build.gradle
@@ -44,6 +44,10 @@
type = LibraryType.INTERNAL_TEST_LIBRARY
}
+android {
+ namespace "androidx.testutils.navigation"
+}
+
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
diff --git a/testutils/testutils-navigation/src/androidTest/AndroidManifest.xml b/testutils/testutils-navigation/src/androidTest/AndroidManifest.xml
index 118821f..67736d0 100644
--- a/testutils/testutils-navigation/src/androidTest/AndroidManifest.xml
+++ b/testutils/testutils-navigation/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ 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.testutils">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/testutils/testutils-navigation/src/main/AndroidManifest.xml b/testutils/testutils-navigation/src/main/AndroidManifest.xml
index efa7db9..67736d0 100644
--- a/testutils/testutils-navigation/src/main/AndroidManifest.xml
+++ b/testutils/testutils-navigation/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ 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.testutils.navigation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/testutils/testutils-runtime/build.gradle b/testutils/testutils-runtime/build.gradle
index 310a3ab..8413a90 100644
--- a/testutils/testutils-runtime/build.gradle
+++ b/testutils/testutils-runtime/build.gradle
@@ -38,6 +38,7 @@
defaultConfig {
testInstrumentationRunner "androidx.testutils.ActivityRecyclingAndroidJUnitRunner"
}
+ namespace "androidx.testutils.runtime"
}
androidx {
diff --git a/testutils/testutils-runtime/src/androidTest/AndroidManifest.xml b/testutils/testutils-runtime/src/androidTest/AndroidManifest.xml
index 2ab71cd..7ce12e8 100644
--- a/testutils/testutils-runtime/src/androidTest/AndroidManifest.xml
+++ b/testutils/testutils-runtime/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.testutils.test"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/testutils/testutils-runtime/src/main/AndroidManifest.xml b/testutils/testutils-runtime/src/main/AndroidManifest.xml
index 62da5ed..c7003d8 100644
--- a/testutils/testutils-runtime/src/main/AndroidManifest.xml
+++ b/testutils/testutils-runtime/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.testutils.runtime"/>
+<manifest />
diff --git a/text/text/build.gradle b/text/text/build.gradle
index e9fa32a..1fd3a06 100644
--- a/text/text/build.gradle
+++ b/text/text/build.gradle
@@ -55,3 +55,7 @@
description = "Text primitives and utilities"
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.compose.ui.text.android"
+}
diff --git a/text/text/src/androidTest/AndroidManifest.xml b/text/text/src/androidTest/AndroidManifest.xml
index e183574..7535bfb 100644
--- a/text/text/src/androidTest/AndroidManifest.xml
+++ b/text/text/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.android" />
+<manifest />
diff --git a/text/text/src/main/AndroidManifest.xml b/text/text/src/main/AndroidManifest.xml
index e183574..7535bfb 100644
--- a/text/text/src/main/AndroidManifest.xml
+++ b/text/text/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.text.android" />
+<manifest />
diff --git a/textclassifier/integration-tests/testapp/build.gradle b/textclassifier/integration-tests/testapp/build.gradle
index 172072c..5f3e053d 100644
--- a/textclassifier/integration-tests/testapp/build.gradle
+++ b/textclassifier/integration-tests/testapp/build.gradle
@@ -27,6 +27,7 @@
}
defaultConfig.vectorDrawables.useSupportLibrary = true
defaultConfig.minSdkVersion 19
+ namespace "androidx.textclassifier.integration.testapp"
}
dependencies {
diff --git a/textclassifier/integration-tests/testapp/src/main/AndroidManifest.xml b/textclassifier/integration-tests/testapp/src/main/AndroidManifest.xml
index 3391e59..7f1aeae 100644
--- a/textclassifier/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/textclassifier/integration-tests/testapp/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.textclassifier.integration.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/textclassifier/textclassifier/build.gradle b/textclassifier/textclassifier/build.gradle
index 35a7b89..cfb7fea 100644
--- a/textclassifier/textclassifier/build.gradle
+++ b/textclassifier/textclassifier/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.textclassifier"
}
androidx {
diff --git a/textclassifier/textclassifier/src/androidTest/AndroidManifest.xml b/textclassifier/textclassifier/src/androidTest/AndroidManifest.xml
index 30371d7..e4ad559 100644
--- a/textclassifier/textclassifier/src/androidTest/AndroidManifest.xml
+++ b/textclassifier/textclassifier/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.textclassifier.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true"
diff --git a/textclassifier/textclassifier/src/main/AndroidManifest.xml b/textclassifier/textclassifier/src/main/AndroidManifest.xml
index b0b179e..dd3d3a3 100644
--- a/textclassifier/textclassifier/src/main/AndroidManifest.xml
+++ b/textclassifier/textclassifier/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.textclassifier"/>
+<manifest />
diff --git a/tracing/tracing-ktx/build.gradle b/tracing/tracing-ktx/build.gradle
index 20f57d7..e68efcd 100644
--- a/tracing/tracing-ktx/build.gradle
+++ b/tracing/tracing-ktx/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2020"
description = "Android Tracing"
}
+
+android {
+ namespace "androidx.tracing.ktx"
+}
diff --git a/tracing/tracing-ktx/src/main/AndroidManifest.xml b/tracing/tracing-ktx/src/main/AndroidManifest.xml
index ede3fba..1d800f1 100644
--- a/tracing/tracing-ktx/src/main/AndroidManifest.xml
+++ b/tracing/tracing-ktx/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.tracing.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/tracing/tracing-perfetto-binary/build.gradle b/tracing/tracing-perfetto-binary/build.gradle
index 47be997..ee341e2 100644
--- a/tracing/tracing-perfetto-binary/build.gradle
+++ b/tracing/tracing-perfetto-binary/build.gradle
@@ -29,6 +29,7 @@
version libs.versions.cmake.get()
}
}
+ namespace "androidx.tracing.perfetto.binary"
}
dependencies {
diff --git a/tracing/tracing-perfetto-binary/src/androidTest/AndroidManifest.xml b/tracing/tracing-perfetto-binary/src/androidTest/AndroidManifest.xml
index dcfae12..f4b4645 100644
--- a/tracing/tracing-perfetto-binary/src/androidTest/AndroidManifest.xml
+++ b/tracing/tracing-perfetto-binary/src/androidTest/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.tracing.perfetto.binary.test"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/tracing/tracing-perfetto-binary/src/main/AndroidManifest.xml b/tracing/tracing-perfetto-binary/src/main/AndroidManifest.xml
index c486eb2..76d8aad 100644
--- a/tracing/tracing-perfetto-binary/src/main/AndroidManifest.xml
+++ b/tracing/tracing-perfetto-binary/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.tracing.perfetto.binary">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/tracing/tracing-perfetto/build.gradle b/tracing/tracing-perfetto/build.gradle
index 76de44b..9fe5e0a 100644
--- a/tracing/tracing-perfetto/build.gradle
+++ b/tracing/tracing-perfetto/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2022"
description = "AndroidX Tracing: Perfetto SDK"
}
+
+android {
+ namespace "androidx.tracing.perfetto"
+}
diff --git a/tracing/tracing-perfetto/src/androidTest/AndroidManifest.xml b/tracing/tracing-perfetto/src/androidTest/AndroidManifest.xml
index d35db9a..76d8aad 100644
--- a/tracing/tracing-perfetto/src/androidTest/AndroidManifest.xml
+++ b/tracing/tracing-perfetto/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.tracing.perfetto.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/tracing/tracing-perfetto/src/main/AndroidManifest.xml b/tracing/tracing-perfetto/src/main/AndroidManifest.xml
index d761d36..76d8aad 100644
--- a/tracing/tracing-perfetto/src/main/AndroidManifest.xml
+++ b/tracing/tracing-perfetto/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.tracing.perfetto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/tracing/tracing/build.gradle b/tracing/tracing/build.gradle
index 1f7e057..5e7f556 100644
--- a/tracing/tracing/build.gradle
+++ b/tracing/tracing/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2020"
description = "Android Tracing"
}
+
+android {
+ namespace "androidx.tracing"
+}
diff --git a/tracing/tracing/src/main/AndroidManifest.xml b/tracing/tracing/src/main/AndroidManifest.xml
index 976de72..1d800f1 100644
--- a/tracing/tracing/src/main/AndroidManifest.xml
+++ b/tracing/tracing/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.tracing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/transition/transition-ktx/build.gradle b/transition/transition-ktx/build.gradle
index 21e1668..1e7b9e5 100644
--- a/transition/transition-ktx/build.gradle
+++ b/transition/transition-ktx/build.gradle
@@ -40,3 +40,7 @@
inceptionYear = "2019"
description = "Kotlin extensions for 'transition' artifact"
}
+
+android {
+ namespace "androidx.transition.ktx"
+}
diff --git a/transition/transition-ktx/src/androidTest/AndroidManifest.xml b/transition/transition-ktx/src/androidTest/AndroidManifest.xml
index 613c893..b90cb91 100644
--- a/transition/transition-ktx/src/androidTest/AndroidManifest.xml
+++ b/transition/transition-ktx/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.transition.ktx.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.transition.TestActivity"/>
</application>
diff --git a/transition/transition-ktx/src/main/AndroidManifest.xml b/transition/transition-ktx/src/main/AndroidManifest.xml
index a9a9c83..61b6811 100644
--- a/transition/transition-ktx/src/main/AndroidManifest.xml
+++ b/transition/transition-ktx/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.transition.ktx"/>
+<manifest />
diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle
index 63a8f08..1e203e2 100644
--- a/transition/transition/build.gradle
+++ b/transition/transition/build.gradle
@@ -40,6 +40,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.transition"
}
androidx {
diff --git a/transition/transition/src/androidTest/AndroidManifest.xml b/transition/transition/src/androidTest/AndroidManifest.xml
index c6660c7..7f4a31d 100755
--- a/transition/transition/src/androidTest/AndroidManifest.xml
+++ b/transition/transition/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.transition.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:supportsRtl="true">
diff --git a/transition/transition/src/main/AndroidManifest.xml b/transition/transition/src/main/AndroidManifest.xml
index b67b5e5..6136621 100644
--- a/transition/transition/src/main/AndroidManifest.xml
+++ b/transition/transition/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.transition"/>
+<manifest />
diff --git a/tvprovider/tvprovider/build.gradle b/tvprovider/tvprovider/build.gradle
index 38dd11b..f18eb11 100644
--- a/tvprovider/tvprovider/build.gradle
+++ b/tvprovider/tvprovider/build.gradle
@@ -20,6 +20,7 @@
defaultConfig {
minSdkVersion 21
}
+ namespace "androidx.tvprovider"
}
androidx {
diff --git a/tvprovider/tvprovider/src/androidTest/AndroidManifest.xml b/tvprovider/tvprovider/src/androidTest/AndroidManifest.xml
index 83b1355..6266251 100644
--- a/tvprovider/tvprovider/src/androidTest/AndroidManifest.xml
+++ b/tvprovider/tvprovider/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
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.tvprovider.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/tvprovider/tvprovider/src/main/AndroidManifest.xml b/tvprovider/tvprovider/src/main/AndroidManifest.xml
index 438e8d39..b6705fa 100644
--- a/tvprovider/tvprovider/src/main/AndroidManifest.xml
+++ b/tvprovider/tvprovider/src/main/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.tvprovider">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
<uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
</manifest>
diff --git a/vectordrawable/integration-tests/testapp/build.gradle b/vectordrawable/integration-tests/testapp/build.gradle
index 95b524e..031dfd2 100644
--- a/vectordrawable/integration-tests/testapp/build.gradle
+++ b/vectordrawable/integration-tests/testapp/build.gradle
@@ -31,5 +31,6 @@
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
+ namespace "com.example.android.support.vectordrawable"
}
diff --git a/vectordrawable/integration-tests/testapp/src/main/AndroidManifest.xml b/vectordrawable/integration-tests/testapp/src/main/AndroidManifest.xml
index 5b5a275..603385d 100644
--- a/vectordrawable/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/vectordrawable/integration-tests/testapp/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="com.example.android.support.vectordrawable">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/app_sample_code"
diff --git a/vectordrawable/vectordrawable-animated/build.gradle b/vectordrawable/vectordrawable-animated/build.gradle
index 93e64cc..8b3b6b3 100644
--- a/vectordrawable/vectordrawable-animated/build.gradle
+++ b/vectordrawable/vectordrawable-animated/build.gradle
@@ -28,6 +28,7 @@
buildTypes.all {
consumerProguardFiles("proguard-rules.pro")
}
+ namespace "androidx.vectordrawable.animated"
}
androidx {
diff --git a/vectordrawable/vectordrawable-animated/src/androidTest/AndroidManifest.xml b/vectordrawable/vectordrawable-animated/src/androidTest/AndroidManifest.xml
index 4104e141..8ccff5c 100644
--- a/vectordrawable/vectordrawable-animated/src/androidTest/AndroidManifest.xml
+++ b/vectordrawable/vectordrawable-animated/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.vectordrawable.animated.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>
diff --git a/vectordrawable/vectordrawable-animated/src/main/AndroidManifest.xml b/vectordrawable/vectordrawable-animated/src/main/AndroidManifest.xml
index be43129..3bae3b9 100644
--- a/vectordrawable/vectordrawable-animated/src/main/AndroidManifest.xml
+++ b/vectordrawable/vectordrawable-animated/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.vectordrawable.animated"/>
+<manifest />
diff --git a/vectordrawable/vectordrawable-seekable/build.gradle b/vectordrawable/vectordrawable-seekable/build.gradle
index 185d67f5..3a55058 100644
--- a/vectordrawable/vectordrawable-seekable/build.gradle
+++ b/vectordrawable/vectordrawable-seekable/build.gradle
@@ -36,6 +36,7 @@
buildTypes.all {
consumerProguardFiles("proguard-rules.pro")
}
+ namespace "androidx.vectordrawable.seekable"
}
androidx {
diff --git a/vectordrawable/vectordrawable-seekable/src/androidTest/AndroidManifest.xml b/vectordrawable/vectordrawable-seekable/src/androidTest/AndroidManifest.xml
index 9fa8c8b..4de3d50 100644
--- a/vectordrawable/vectordrawable-seekable/src/androidTest/AndroidManifest.xml
+++ b/vectordrawable/vectordrawable-seekable/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.vectordrawable.seekable.test" />
+<manifest />
diff --git a/vectordrawable/vectordrawable-seekable/src/main/AndroidManifest.xml b/vectordrawable/vectordrawable-seekable/src/main/AndroidManifest.xml
index ee87b57..4de3d50 100644
--- a/vectordrawable/vectordrawable-seekable/src/main/AndroidManifest.xml
+++ b/vectordrawable/vectordrawable-seekable/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.vectordrawable.seekable"/>
+<manifest />
diff --git a/vectordrawable/vectordrawable/build.gradle b/vectordrawable/vectordrawable/build.gradle
index 75acc2e..8e6ae22 100644
--- a/vectordrawable/vectordrawable/build.gradle
+++ b/vectordrawable/vectordrawable/build.gradle
@@ -24,6 +24,7 @@
aaptOptions {
additionalParameters "--no-version-vectors"
}
+ namespace "androidx.vectordrawable"
}
androidx {
diff --git a/vectordrawable/vectordrawable/src/androidTest/AndroidManifest.xml b/vectordrawable/vectordrawable/src/androidTest/AndroidManifest.xml
index 7f2b137..52c7477 100644
--- a/vectordrawable/vectordrawable/src/androidTest/AndroidManifest.xml
+++ b/vectordrawable/vectordrawable/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.vectordrawable.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/vectordrawable/vectordrawable/src/main/AndroidManifest.xml b/vectordrawable/vectordrawable/src/main/AndroidManifest.xml
index 7b11e22..3bae3b9 100644
--- a/vectordrawable/vectordrawable/src/main/AndroidManifest.xml
+++ b/vectordrawable/vectordrawable/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.vectordrawable"/>
+<manifest />
diff --git a/versionedparcelable/versionedparcelable/build.gradle b/versionedparcelable/versionedparcelable/build.gradle
index 1986a3a..fd8a54d 100644
--- a/versionedparcelable/versionedparcelable/build.gradle
+++ b/versionedparcelable/versionedparcelable/build.gradle
@@ -41,6 +41,7 @@
buildTypes.all {
consumerProguardFiles("proguard-rules.pro")
}
+ namespace "androidx.versionedparcelable"
}
androidx {
diff --git a/versionedparcelable/versionedparcelable/src/main/AndroidManifest.xml b/versionedparcelable/versionedparcelable/src/main/AndroidManifest.xml
index a759b89..bd40425 100644
--- a/versionedparcelable/versionedparcelable/src/main/AndroidManifest.xml
+++ b/versionedparcelable/versionedparcelable/src/main/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.versionedparcelable">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
</application>
</manifest>
diff --git a/viewpager/viewpager/build.gradle b/viewpager/viewpager/build.gradle
index 79f2496..24b3deb 100644
--- a/viewpager/viewpager/build.gradle
+++ b/viewpager/viewpager/build.gradle
@@ -28,3 +28,7 @@
description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.viewpager"
+}
diff --git a/viewpager/viewpager/src/androidTest/AndroidManifest.xml b/viewpager/viewpager/src/androidTest/AndroidManifest.xml
index b50caaf..8c31a72 100644
--- a/viewpager/viewpager/src/androidTest/AndroidManifest.xml
+++ b/viewpager/viewpager/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.viewpager.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
diff --git a/viewpager/viewpager/src/main/AndroidManifest.xml b/viewpager/viewpager/src/main/AndroidManifest.xml
index 2228669..dd3d3a3 100644
--- a/viewpager/viewpager/src/main/AndroidManifest.xml
+++ b/viewpager/viewpager/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.viewpager" />
+<manifest />
diff --git a/viewpager2/integration-tests/targetsdk-tests/build.gradle b/viewpager2/integration-tests/targetsdk-tests/build.gradle
index ac47b17..4572431 100644
--- a/viewpager2/integration-tests/targetsdk-tests/build.gradle
+++ b/viewpager2/integration-tests/targetsdk-tests/build.gradle
@@ -36,6 +36,7 @@
// Default is set to latest
}
}
+ namespace "androidx.viewpager2.integration.targestsdktests"
}
dependencies {
diff --git a/viewpager2/integration-tests/targetsdk-tests/src/main/AndroidManifest.xml b/viewpager2/integration-tests/targetsdk-tests/src/main/AndroidManifest.xml
index 798b222..a270226 100644
--- a/viewpager2/integration-tests/targetsdk-tests/src/main/AndroidManifest.xml
+++ b/viewpager2/integration-tests/targetsdk-tests/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.viewpager2.integration.targestsdktests"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/viewpager2/integration-tests/testapp/build.gradle b/viewpager2/integration-tests/testapp/build.gradle
index 7aed76de..7f7f332 100644
--- a/viewpager2/integration-tests/testapp/build.gradle
+++ b/viewpager2/integration-tests/testapp/build.gradle
@@ -40,3 +40,7 @@
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.espressoCore)
}
+
+android {
+ namespace "androidx.viewpager2.integration.testapp"
+}
diff --git a/viewpager2/integration-tests/testapp/src/main/AndroidManifest.xml b/viewpager2/integration-tests/testapp/src/main/AndroidManifest.xml
index 3ec4e78..c6f66b2 100644
--- a/viewpager2/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/viewpager2/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
-->
<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.viewpager2.integration.testapp">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:icon="@drawable/app_sample_code"
diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle
index b78633f..5d007b6 100644
--- a/viewpager2/viewpager2/build.gradle
+++ b/viewpager2/viewpager2/build.gradle
@@ -56,3 +56,7 @@
inceptionYear = "2017"
description = "AndroidX Widget ViewPager2"
}
+
+android {
+ namespace "androidx.viewpager2"
+}
diff --git a/viewpager2/viewpager2/src/androidTest/AndroidManifest.xml b/viewpager2/viewpager2/src/androidTest/AndroidManifest.xml
index 687adfd..cc7d16f 100755
--- a/viewpager2/viewpager2/src/androidTest/AndroidManifest.xml
+++ b/viewpager2/viewpager2/src/androidTest/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.viewpager2.test">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
<application android:supportsRtl="true">
diff --git a/viewpager2/viewpager2/src/main/AndroidManifest.xml b/viewpager2/viewpager2/src/main/AndroidManifest.xml
index af291ec..b6d5627 100644
--- a/viewpager2/viewpager2/src/main/AndroidManifest.xml
+++ b/viewpager2/viewpager2/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.viewpager2"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
index 8b165bb..f24e3ef 100644
--- a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -32,6 +32,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ namespace "androidx.wear.benchmark.integration.macrobenchmark.target"
}
dependencies {
diff --git a/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index e431910..5fae824 100644
--- a/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -17,8 +17,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.benchmark.integration.macrobenchmark.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Wear Macrobenchmark Target"
diff --git a/wear/benchmark/integration-tests/macrobenchmark/build.gradle b/wear/benchmark/integration-tests/macrobenchmark/build.gradle
index 67fa2c2..bc4ca1c 100644
--- a/wear/benchmark/integration-tests/macrobenchmark/build.gradle
+++ b/wear/benchmark/integration-tests/macrobenchmark/build.gradle
@@ -24,6 +24,7 @@
defaultConfig {
minSdkVersion 29
}
+ namespace "androidx.wear.benchmark.integration.macrobenchmark"
}
dependencies {
diff --git a/wear/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml b/wear/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
index c9becec4..e0788d6 100644
--- a/wear/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/wear/benchmark/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.benchmark.integration.macrobenchmark.test"/>
+<manifest />
diff --git a/wear/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml b/wear/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
index 86fc508..f734545 100644
--- a/wear/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
+++ b/wear/benchmark/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.benchmark.integration.macrobenchmark" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index 57dd9f7..4339deb 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -102,6 +102,7 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.compose.foundation"
}
androidx {
diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle
index eaa83b4..8058766 100644
--- a/wear/compose/compose-foundation/samples/build.gradle
+++ b/wear/compose/compose-foundation/samples/build.gradle
@@ -41,6 +41,7 @@
defaultConfig {
minSdkVersion 25
}
+ namespace "androidx.wear.compose.foundation.samples"
}
androidx {
diff --git a/wear/compose/compose-foundation/samples/src/main/AndroidManifest.xml b/wear/compose/compose-foundation/samples/src/main/AndroidManifest.xml
index bf52724..472cf7b 100644
--- a/wear/compose/compose-foundation/samples/src/main/AndroidManifest.xml
+++ b/wear/compose/compose-foundation/samples/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.compose.foundation.samples">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="androidx.wear.compose.foundation"/>
</manifest>
diff --git a/wear/compose/compose-foundation/src/androidMain/AndroidManifest.xml b/wear/compose/compose-foundation/src/androidMain/AndroidManifest.xml
index 55fe1cd..e0788d6 100644
--- a/wear/compose/compose-foundation/src/androidMain/AndroidManifest.xml
+++ b/wear/compose/compose-foundation/src/androidMain/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.compose.foundation" />
+<manifest />
diff --git a/wear/compose/compose-material/benchmark/build.gradle b/wear/compose/compose-material/benchmark/build.gradle
index f97e85b..8416175 100644
--- a/wear/compose/compose-material/benchmark/build.gradle
+++ b/wear/compose/compose-material/benchmark/build.gradle
@@ -29,6 +29,7 @@
buildTypes.all {
consumerProguardFiles "benchmark-proguard-rules.pro"
}
+ namespace "androidx.wear.compose.material.benchmark"
}
dependencies {
diff --git a/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml b/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml
index 2615d48..39f7fc3 100644
--- a/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml
+++ b/wear/compose/compose-material/benchmark/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.wear.compose.material.benchmark"/>
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/wear/compose/compose-material/benchmark/src/main/AndroidManifest.xml b/wear/compose/compose-material/benchmark/src/main/AndroidManifest.xml
index c9b016e..490f800 100644
--- a/wear/compose/compose-material/benchmark/src/main/AndroidManifest.xml
+++ b/wear/compose/compose-material/benchmark/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.compose.material.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
</manifest>
\ No newline at end of file
diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle
index f275f43..ab53f5e 100644
--- a/wear/compose/compose-material/build.gradle
+++ b/wear/compose/compose-material/build.gradle
@@ -117,6 +117,7 @@
testOptions.unitTests.includeAndroidResources = true
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/wear/compose/material"
+ namespace "androidx.wear.compose.material"
}
androidx {
diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle
index a43b1e7e..3b4ae09 100644
--- a/wear/compose/compose-material/samples/build.gradle
+++ b/wear/compose/compose-material/samples/build.gradle
@@ -50,6 +50,7 @@
defaultConfig {
minSdkVersion 25
}
+ namespace "androidx.wear.compose.material.samples"
}
androidx {
diff --git a/wear/compose/compose-material/samples/src/androidTest/AndroidManifest.xml b/wear/compose/compose-material/samples/src/androidTest/AndroidManifest.xml
index 5ffe6c3..8e90956 100644
--- a/wear/compose/compose-material/samples/src/androidTest/AndroidManifest.xml
+++ b/wear/compose/compose-material/samples/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.wear.compose.material.samples.test" />
+<manifest />
diff --git a/wear/compose/compose-material/samples/src/main/AndroidManifest.xml b/wear/compose/compose-material/samples/src/main/AndroidManifest.xml
index 9607116..80d4a9b 100644
--- a/wear/compose/compose-material/samples/src/main/AndroidManifest.xml
+++ b/wear/compose/compose-material/samples/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.compose.material.samples">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="androidx.wear.compose.material"/>
</manifest>
diff --git a/wear/compose/compose-material/src/androidMain/AndroidManifest.xml b/wear/compose/compose-material/src/androidMain/AndroidManifest.xml
index bcb362e..e0788d6 100644
--- a/wear/compose/compose-material/src/androidMain/AndroidManifest.xml
+++ b/wear/compose/compose-material/src/androidMain/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.compose.material" />
+<manifest />
diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle
index cfcceff..ca53b64 100644
--- a/wear/compose/compose-navigation/build.gradle
+++ b/wear/compose/compose-navigation/build.gradle
@@ -55,6 +55,7 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.compose.navigation"
}
androidx {
diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle
index d56d6eb..aa5cb3d 100644
--- a/wear/compose/compose-navigation/samples/build.gradle
+++ b/wear/compose/compose-navigation/samples/build.gradle
@@ -44,6 +44,7 @@
defaultConfig {
minSdkVersion 25
}
+ namespace "androidx.wear.compose.navigation.samples"
}
androidx {
diff --git a/wear/compose/compose-navigation/samples/src/main/AndroidManifest.xml b/wear/compose/compose-navigation/samples/src/main/AndroidManifest.xml
index fef6cfd..8acb708 100644
--- a/wear/compose/compose-navigation/samples/src/main/AndroidManifest.xml
+++ b/wear/compose/compose-navigation/samples/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.compose.navigation.samples">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="androidx.wear.compose.navigation"/>
</manifest>
diff --git a/wear/compose/compose-navigation/src/androidTest/AndroidManifest.xml b/wear/compose/compose-navigation/src/androidTest/AndroidManifest.xml
index 5c9fd34..3c3c224 100644
--- a/wear/compose/compose-navigation/src/androidTest/AndroidManifest.xml
+++ b/wear/compose/compose-navigation/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.wear.compose.navigation" />
+<manifest />
diff --git a/wear/compose/compose-navigation/src/main/AndroidManifest.xml b/wear/compose/compose-navigation/src/main/AndroidManifest.xml
index 03d76bd..e0788d6 100644
--- a/wear/compose/compose-navigation/src/main/AndroidManifest.xml
+++ b/wear/compose/compose-navigation/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.compose.navigation" />
+<manifest />
diff --git a/wear/compose/integration-tests/demos/build.gradle b/wear/compose/integration-tests/demos/build.gradle
index 15bd2b3..26ea1fd 100644
--- a/wear/compose/integration-tests/demos/build.gradle
+++ b/wear/compose/integration-tests/demos/build.gradle
@@ -43,6 +43,7 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.wear.compose.integration.demos"
}
dependencies {
diff --git a/wear/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml b/wear/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml
index cfe8548..e865f27 100644
--- a/wear/compose/integration-tests/demos/src/androidTest/AndroidManifest.xml
+++ b/wear/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.wear.compose.integration.demos" />
+<manifest />
diff --git a/wear/compose/integration-tests/demos/src/main/AndroidManifest.xml b/wear/compose/integration-tests/demos/src/main/AndroidManifest.xml
index 85b38e6..12770f7 100644
--- a/wear/compose/integration-tests/demos/src/main/AndroidManifest.xml
+++ b/wear/compose/integration-tests/demos/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.compose.integration.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/wear/compose/integration-tests/macrobenchmark-target/build.gradle b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
index c2c870b..1120457 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -22,6 +22,8 @@
}
android {
+
+ namespace "androidx.wear.compose.integration.macrobenchmark.target"
buildTypes {
release {
minifyEnabled true
diff --git a/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index 8abaf1d..dac72dd 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -17,8 +17,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.compose.integration.macrobenchmark.target">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:label="Wear Compose Macrobenchmark Target"
diff --git a/wear/compose/integration-tests/macrobenchmark/build.gradle b/wear/compose/integration-tests/macrobenchmark/build.gradle
index a37be4c..71db817 100644
--- a/wear/compose/integration-tests/macrobenchmark/build.gradle
+++ b/wear/compose/integration-tests/macrobenchmark/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
minSdkVersion 29
}
+ namespace "androidx.wear.compose.integration.macrobenchmark"
}
dependencies {
diff --git a/wear/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml b/wear/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
index 566f1c9..e0788d6 100644
--- a/wear/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
+++ b/wear/compose/integration-tests/macrobenchmark/src/androidTest/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.compose.integration.macrobenchmark.test"/>
+<manifest />
diff --git a/wear/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml b/wear/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
index c08fdf6..f734545 100644
--- a/wear/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
+++ b/wear/compose/integration-tests/macrobenchmark/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<manifest package="androidx.wear.compose.integration.macrobenchmark" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/wear/compose/integration-tests/navigation/build.gradle b/wear/compose/integration-tests/navigation/build.gradle
index b2f8d46..e80fb17 100644
--- a/wear/compose/integration-tests/navigation/build.gradle
+++ b/wear/compose/integration-tests/navigation/build.gradle
@@ -42,6 +42,7 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.wear.compose.integration.navigation"
}
dependencies {
diff --git a/wear/compose/integration-tests/navigation/src/main/AndroidManifest.xml b/wear/compose/integration-tests/navigation/src/main/AndroidManifest.xml
index f477c51..e22da84 100644
--- a/wear/compose/integration-tests/navigation/src/main/AndroidManifest.xml
+++ b/wear/compose/integration-tests/navigation/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.compose.integration.navigation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle
index 70d80a8..b03ceb2 100644
--- a/wear/tiles/tiles-material/build.gradle
+++ b/wear/tiles/tiles-material/build.gradle
@@ -34,6 +34,7 @@
defaultConfig {
minSdkVersion 25
}
+ namespace "androidx.wear.tiles.material"
}
androidx {
diff --git a/wear/tiles/tiles-material/src/androidTest/AndroidManifest.xml b/wear/tiles/tiles-material/src/androidTest/AndroidManifest.xml
index 34f2ca8..4d68dc2 100644
--- a/wear/tiles/tiles-material/src/androidTest/AndroidManifest.xml
+++ b/wear/tiles/tiles-material/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.wear.tiles.material.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/tiles/tiles-material/src/main/AndroidManifest.xml b/wear/tiles/tiles-material/src/main/AndroidManifest.xml
index c2d7f85..037bd65 100644
--- a/wear/tiles/tiles-material/src/main/AndroidManifest.xml
+++ b/wear/tiles/tiles-material/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.wear.tiles.material">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
index 50cb5bd..8ca825f 100644
--- a/wear/tiles/tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -81,6 +81,7 @@
sourceSets {
androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear-tiles-renderer"
}
+ namespace "androidx.wear.tiles.renderer"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml b/wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml
index 6c1bac5..3082842 100644
--- a/wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml
+++ b/wear/tiles/tiles-renderer/src/androidTest/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.tiles.renderer.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/tiles/tiles-renderer/src/main/AndroidManifest.xml b/wear/tiles/tiles-renderer/src/main/AndroidManifest.xml
index 7a1958f..9a40236 100644
--- a/wear/tiles/tiles-renderer/src/main/AndroidManifest.xml
+++ b/wear/tiles/tiles-renderer/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.tiles.renderer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/tiles/tiles-renderer/src/test/AndroidManifest.xml b/wear/tiles/tiles-renderer/src/test/AndroidManifest.xml
index 5cd4ba8..9a40236 100644
--- a/wear/tiles/tiles-renderer/src/test/AndroidManifest.xml
+++ b/wear/tiles/tiles-renderer/src/test/AndroidManifest.xml
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.tiles.renderer.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/tiles/tiles-testing/build.gradle b/wear/tiles/tiles-testing/build.gradle
index 3a63890..7d23776 100644
--- a/wear/tiles/tiles-testing/build.gradle
+++ b/wear/tiles/tiles-testing/build.gradle
@@ -55,6 +55,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.tiles.testing"
}
androidx {
diff --git a/wear/tiles/tiles-testing/src/main/AndroidManifest.xml b/wear/tiles/tiles-testing/src/main/AndroidManifest.xml
index 6238b06..3082842 100644
--- a/wear/tiles/tiles-testing/src/main/AndroidManifest.xml
+++ b/wear/tiles/tiles-testing/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.tiles.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle
index c6d94f9..92fb660 100644
--- a/wear/tiles/tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -53,6 +53,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.tiles"
}
androidx {
diff --git a/wear/tiles/tiles/src/main/AndroidManifest.xml b/wear/tiles/tiles/src/main/AndroidManifest.xml
index 6f94c07..3b4ff38 100644
--- a/wear/tiles/tiles/src/main/AndroidManifest.xml
+++ b/wear/tiles/tiles/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.tiles">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<intent>
<action android:name="androidx.wear.tiles.action.BIND_UPDATE_REQUESTER" />
diff --git a/wear/watchface/watchface-client-guava/build.gradle b/wear/watchface/watchface-client-guava/build.gradle
index 3cde077..12ada55 100644
--- a/wear/watchface/watchface-client-guava/build.gradle
+++ b/wear/watchface/watchface-client-guava/build.gradle
@@ -58,4 +58,5 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.client.guava"
}
diff --git a/wear/watchface/watchface-client-guava/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-client-guava/src/androidTest/AndroidManifest.xml
index 9ea23e3..41ccf29 100644
--- a/wear/watchface/watchface-client-guava/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-client-guava/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.wear.watchface.client.guava.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:requestLegacyExternalStorage="true">
<service android:name="androidx.wear.watchface.client.guava.WatchFaceControlTestService"
android:exported="true">
diff --git a/wear/watchface/watchface-client-guava/src/main/AndroidManifest.xml b/wear/watchface/watchface-client-guava/src/main/AndroidManifest.xml
index e585274..b645f25 100644
--- a/wear/watchface/watchface-client-guava/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-client-guava/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.client.guava">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="com.google.android.wearable.permission.BIND_WATCH_FACE_CONTROL"/>
</manifest>
diff --git a/wear/watchface/watchface-client/build.gradle b/wear/watchface/watchface-client/build.gradle
index f808076..5dc30f9 100644
--- a/wear/watchface/watchface-client/build.gradle
+++ b/wear/watchface/watchface-client/build.gradle
@@ -66,6 +66,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.client"
}
androidx {
diff --git a/wear/watchface/watchface-client/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-client/src/androidTest/AndroidManifest.xml
index cbbf30d..a2ae439 100644
--- a/wear/watchface/watchface-client/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-client/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.wear.watchface.client.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:requestLegacyExternalStorage="true">
<service android:name="androidx.wear.watchface.client.test.WatchFaceControlTestService"/>
<service android:name="androidx.wear.watchface.client.test.TestNopCanvasWatchFaceService"/>
diff --git a/wear/watchface/watchface-client/src/main/AndroidManifest.xml b/wear/watchface/watchface-client/src/main/AndroidManifest.xml
index 5849c92..c3f99a4 100644
--- a/wear/watchface/watchface-client/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-client/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.client">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="com.google.android.wearable.permission.BIND_WATCH_FACE_CONTROL"/>
</manifest>
diff --git a/wear/watchface/watchface-complications-data-source-ktx/build.gradle b/wear/watchface/watchface-complications-data-source-ktx/build.gradle
index e1605ea..290a516 100644
--- a/wear/watchface/watchface-complications-data-source-ktx/build.gradle
+++ b/wear/watchface/watchface-complications-data-source-ktx/build.gradle
@@ -40,6 +40,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.complications.datasource.ktx"
}
androidx {
diff --git a/wear/watchface/watchface-complications-data-source-ktx/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications-data-source-ktx/src/main/AndroidManifest.xml
index 425c576..87642d6 100644
--- a/wear/watchface/watchface-complications-data-source-ktx/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-data-source-ktx/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.complications.datasource.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<uses-library android:name="com.google.android.wearable" android:required="false" />
</application>
diff --git a/wear/watchface/watchface-complications-data-source-samples/build.gradle b/wear/watchface/watchface-complications-data-source-samples/build.gradle
index 501ba62..64181e2 100644
--- a/wear/watchface/watchface-complications-data-source-samples/build.gradle
+++ b/wear/watchface/watchface-complications-data-source-samples/build.gradle
@@ -31,4 +31,5 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.complications.datasource.samples"
}
diff --git a/wear/watchface/watchface-complications-data-source-samples/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications-data-source-samples/src/main/AndroidManifest.xml
index 00ef4fb..6215d9d 100644
--- a/wear/watchface/watchface-complications-data-source-samples/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-data-source-samples/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.wear.watchface.complications.datasource.samples">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission
android:name="com.google.android.wearable.permission.USE_IMMEDIATE_COMPLICATION_UPDATE" />
<application
diff --git a/wear/watchface/watchface-complications-data-source/build.gradle b/wear/watchface/watchface-complications-data-source/build.gradle
index 87ed861..31a1651 100644
--- a/wear/watchface/watchface-complications-data-source/build.gradle
+++ b/wear/watchface/watchface-complications-data-source/build.gradle
@@ -48,6 +48,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.complications.datasource"
}
androidx {
diff --git a/wear/watchface/watchface-complications-data-source/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications-data-source/src/main/AndroidManifest.xml
index 310c9bd..87642d6 100644
--- a/wear/watchface/watchface-complications-data-source/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-data-source/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.complications.datasource">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<uses-library android:name="com.google.android.wearable" android:required="false" />
</application>
diff --git a/wear/watchface/watchface-complications-data/build.gradle b/wear/watchface/watchface-complications-data/build.gradle
index 252ff17..e4c1784 100644
--- a/wear/watchface/watchface-complications-data/build.gradle
+++ b/wear/watchface/watchface-complications-data/build.gradle
@@ -53,6 +53,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.complications.data"
}
androidx {
diff --git a/wear/watchface/watchface-complications-data/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications-data/src/main/AndroidManifest.xml
index 29fea9c..87642d6 100644
--- a/wear/watchface/watchface-complications-data/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-data/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="androidx.wear.watchface.complications.data">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<uses-library android:name="com.google.android.wearable" android:required="false" />
</application>
diff --git a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
index 4e8f8e0..cccb4e7 100644
--- a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
+++ b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
@@ -40,4 +40,5 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.complications.permission.dialogs.sample"
}
diff --git a/wear/watchface/watchface-complications-permission-dialogs-sample/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications-permission-dialogs-sample/src/main/AndroidManifest.xml
index e4b1944..4252abf 100644
--- a/wear/watchface/watchface-complications-permission-dialogs-sample/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-permission-dialogs-sample/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.wear.watchface.complications.permission.dialogs.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".ComplicationDeniedActivity"
diff --git a/wear/watchface/watchface-complications-rendering/build.gradle b/wear/watchface/watchface-complications-rendering/build.gradle
index e7bc2a1..e80cb79 100644
--- a/wear/watchface/watchface-complications-rendering/build.gradle
+++ b/wear/watchface/watchface-complications-rendering/build.gradle
@@ -55,6 +55,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.complications.rendering"
}
androidx {
diff --git a/wear/watchface/watchface-complications-rendering/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-complications-rendering/src/androidTest/AndroidManifest.xml
index 6ae4bb2..f04d862 100644
--- a/wear/watchface/watchface-complications-rendering/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-rendering/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,5 @@
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.wear.watchface.complications.rendering.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/watchface/watchface-complications-rendering/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications-rendering/src/main/AndroidManifest.xml
index f55eb25..22df6fd 100644
--- a/wear/watchface/watchface-complications-rendering/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications-rendering/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.complications.rendering">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/watchface/watchface-complications/build.gradle b/wear/watchface/watchface-complications/build.gradle
index c6fcacf..ca48143 100644
--- a/wear/watchface/watchface-complications/build.gradle
+++ b/wear/watchface/watchface-complications/build.gradle
@@ -55,6 +55,7 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.complications"
}
androidx {
diff --git a/wear/watchface/watchface-complications/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-complications/src/androidTest/AndroidManifest.xml
index 29e7ac2..54b61fe 100644
--- a/wear/watchface/watchface-complications/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.editor.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service android:name="androidx.wear.watchface.complications.TestProviderInfoService">
diff --git a/wear/watchface/watchface-complications/src/main/AndroidManifest.xml b/wear/watchface/watchface-complications/src/main/AndroidManifest.xml
index 6cfe9021..9a40236 100644
--- a/wear/watchface/watchface-complications/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-complications/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="androidx.wear.watchface.complications">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/watchface/watchface-data/build.gradle b/wear/watchface/watchface-data/build.gradle
index 8385e4f3..abf1300 100644
--- a/wear/watchface/watchface-data/build.gradle
+++ b/wear/watchface/watchface-data/build.gradle
@@ -44,6 +44,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.wear.watchface.data"
}
androidx {
diff --git a/wear/watchface/watchface-data/src/main/AndroidManifest.xml b/wear/watchface/watchface-data/src/main/AndroidManifest.xml
index d3ca6a5..22df6fd 100644
--- a/wear/watchface/watchface-data/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-data/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.data">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/watchface/watchface-editor-guava/build.gradle b/wear/watchface/watchface-editor-guava/build.gradle
index 79123ca..ec769ce 100644
--- a/wear/watchface/watchface-editor-guava/build.gradle
+++ b/wear/watchface/watchface-editor-guava/build.gradle
@@ -49,4 +49,5 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.editor.guava"
}
diff --git a/wear/watchface/watchface-editor-guava/src/main/AndroidManifest.xml b/wear/watchface/watchface-editor-guava/src/main/AndroidManifest.xml
index 69455ff..a487c0d 100644
--- a/wear/watchface/watchface-editor-guava/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-editor-guava/src/main/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.wear.watchface.editor.guava"/>
\ 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/wear/watchface/watchface-editor/build.gradle b/wear/watchface/watchface-editor/build.gradle
index bb224a6..66cc13e 100644
--- a/wear/watchface/watchface-editor/build.gradle
+++ b/wear/watchface/watchface-editor/build.gradle
@@ -53,6 +53,7 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.editor"
}
androidx {
diff --git a/wear/watchface/watchface-editor/samples/build.gradle b/wear/watchface/watchface-editor/samples/build.gradle
index 6cf010a..142bfd5 100644
--- a/wear/watchface/watchface-editor/samples/build.gradle
+++ b/wear/watchface/watchface-editor/samples/build.gradle
@@ -43,6 +43,7 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.editor.samples"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/wear/watchface/watchface-editor/samples/src/main/AndroidManifest.xml b/wear/watchface/watchface-editor/samples/src/main/AndroidManifest.xml
index 289b0de..91eee54 100644
--- a/wear/watchface/watchface-editor/samples/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-editor/samples/src/main/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.wear.watchface.editor.samples"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/wear/watchface/watchface-editor/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-editor/src/androidTest/AndroidManifest.xml
index c7f41d0..c32035d 100644
--- a/wear/watchface/watchface-editor/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-editor/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.wear.watchface.editor.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
diff --git a/wear/watchface/watchface-editor/src/main/AndroidManifest.xml b/wear/watchface/watchface-editor/src/main/AndroidManifest.xml
index 205f898..91eee54 100644
--- a/wear/watchface/watchface-editor/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-editor/src/main/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.wear.watchface.editor"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/wear/watchface/watchface-guava/build.gradle b/wear/watchface/watchface-guava/build.gradle
index 112d05f..03f8acd 100644
--- a/wear/watchface/watchface-guava/build.gradle
+++ b/wear/watchface/watchface-guava/build.gradle
@@ -59,4 +59,5 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.guava"
}
diff --git a/wear/watchface/watchface-guava/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-guava/src/androidTest/AndroidManifest.xml
index 91b6498..7fc766e 100644
--- a/wear/watchface/watchface-guava/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-guava/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.wear.watchface.guava.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:requestLegacyExternalStorage="true">
<service android:name="androidx.wear.watchface.test.WatchFaceControlTestService"/>
</application>
diff --git a/wear/watchface/watchface-guava/src/main/AndroidManifest.xml b/wear/watchface/watchface-guava/src/main/AndroidManifest.xml
index c170b73..3082842 100644
--- a/wear/watchface/watchface-guava/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-guava/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.guava">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/watchface/watchface-samples-minimal-complications/build.gradle b/wear/watchface/watchface-samples-minimal-complications/build.gradle
index d563296..ec59cdc 100644
--- a/wear/watchface/watchface-samples-minimal-complications/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-complications/build.gradle
@@ -59,4 +59,5 @@
sourceCompatibility 1.8
targetCompatibility 1.8
}
+ namespace "androidx.wear.watchface.samples.minimal.complications"
}
diff --git a/wear/watchface/watchface-samples-minimal-complications/src/main/AndroidManifest.xml b/wear/watchface/watchface-samples-minimal-complications/src/main/AndroidManifest.xml
index 38f2785..f0b904f 100644
--- a/wear/watchface/watchface-samples-minimal-complications/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-samples-minimal-complications/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.samples.minimal.complications">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.type.watch" />
diff --git a/wear/watchface/watchface-samples-minimal-style/build.gradle b/wear/watchface/watchface-samples-minimal-style/build.gradle
index 8300c7d..f2d59f2 100644
--- a/wear/watchface/watchface-samples-minimal-style/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-style/build.gradle
@@ -56,4 +56,5 @@
sourceCompatibility 1.8
targetCompatibility 1.8
}
+ namespace "androidx.wear.watchface.samples.minimal.style"
}
diff --git a/wear/watchface/watchface-samples-minimal-style/src/main/AndroidManifest.xml b/wear/watchface/watchface-samples-minimal-style/src/main/AndroidManifest.xml
index 6413be2..404d473 100644
--- a/wear/watchface/watchface-samples-minimal-style/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-samples-minimal-style/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.samples.minimal.style">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.type.watch" />
diff --git a/wear/watchface/watchface-style/build.gradle b/wear/watchface/watchface-style/build.gradle
index 89859be..ca7e1b3 100644
--- a/wear/watchface/watchface-style/build.gradle
+++ b/wear/watchface/watchface-style/build.gradle
@@ -54,6 +54,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface.style"
}
androidx {
diff --git a/wear/watchface/watchface-style/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface-style/src/androidTest/AndroidManifest.xml
index 82a70a4..91eee54 100644
--- a/wear/watchface/watchface-style/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface-style/src/androidTest/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.wear.watchface.style.test"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/wear/watchface/watchface-style/src/main/AndroidManifest.xml b/wear/watchface/watchface-style/src/main/AndroidManifest.xml
index 8dc40aa..bb4d1e4 100644
--- a/wear/watchface/watchface-style/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface-style/src/main/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.wear.watchface.style"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle
index f536635..2c7d92a 100644
--- a/wear/watchface/watchface/build.gradle
+++ b/wear/watchface/watchface/build.gradle
@@ -68,6 +68,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.watchface"
}
androidx {
diff --git a/wear/watchface/watchface/samples/app/build.gradle b/wear/watchface/watchface/samples/app/build.gradle
index 00e0d32..cdd2ca2 100644
--- a/wear/watchface/watchface/samples/app/build.gradle
+++ b/wear/watchface/watchface/samples/app/build.gradle
@@ -58,4 +58,5 @@
sourceCompatibility 1.8
targetCompatibility 1.8
}
+ namespace "androidx.wear.watchface.samples.app"
}
diff --git a/wear/watchface/watchface/samples/app/src/main/AndroidManifest.xml b/wear/watchface/watchface/samples/app/src/main/AndroidManifest.xml
index cfccd22..bfc4724 100644
--- a/wear/watchface/watchface/samples/app/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface/samples/app/src/main/AndroidManifest.xml
@@ -15,7 +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.wear.watchface.samples.app">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/wear/watchface/watchface/samples/build.gradle b/wear/watchface/watchface/samples/build.gradle
index 5980cfd..43c6d08 100644
--- a/wear/watchface/watchface/samples/build.gradle
+++ b/wear/watchface/watchface/samples/build.gradle
@@ -44,6 +44,7 @@
defaultConfig {
minSdkVersion 26
}
+ namespace "androidx.wear.watchface.samples"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/wear/watchface/watchface/samples/minimal/build.gradle b/wear/watchface/watchface/samples/minimal/build.gradle
index b2691d3..8896dd1 100644
--- a/wear/watchface/watchface/samples/minimal/build.gradle
+++ b/wear/watchface/watchface/samples/minimal/build.gradle
@@ -52,4 +52,5 @@
sourceCompatibility 1.8
targetCompatibility 1.8
}
+ namespace "androidx.wear.watchface.samples.minimal"
}
diff --git a/wear/watchface/watchface/samples/minimal/src/main/AndroidManifest.xml b/wear/watchface/watchface/samples/minimal/src/main/AndroidManifest.xml
index 4c45d9c..98b3075 100644
--- a/wear/watchface/watchface/samples/minimal/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface/samples/minimal/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.watchface.samples.minimal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.type.watch" />
diff --git a/wear/watchface/watchface/samples/src/main/AndroidManifest.xml b/wear/watchface/watchface/samples/src/main/AndroidManifest.xml
index 22be947..b25e77e 100644
--- a/wear/watchface/watchface/samples/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface/samples/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.wear.watchface.samples">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!--
Required for complications to receive complication data and open the data source chooser.
diff --git a/wear/watchface/watchface/src/androidTest/AndroidManifest.xml b/wear/watchface/watchface/src/androidTest/AndroidManifest.xml
index 8cf4059..6b7ef2f 100644
--- a/wear/watchface/watchface/src/androidTest/AndroidManifest.xml
+++ b/wear/watchface/watchface/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.wear.watchface.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:requestLegacyExternalStorage="true">
<activity android:name=".ComplicationTapActivity" android:exported="false"/>
<activity
diff --git a/wear/watchface/watchface/src/main/AndroidManifest.xml b/wear/watchface/watchface/src/main/AndroidManifest.xml
index eba84a7..52231e3 100644
--- a/wear/watchface/watchface/src/main/AndroidManifest.xml
+++ b/wear/watchface/watchface/src/main/AndroidManifest.xml
@@ -14,7 +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.wear.watchface">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<intent>
<!-- Needed to have visibility on complication data sources installed on the device. -->
diff --git a/wear/wear-input-testing/build.gradle b/wear/wear-input-testing/build.gradle
index 540294b..2a35c02 100644
--- a/wear/wear-input-testing/build.gradle
+++ b/wear/wear-input-testing/build.gradle
@@ -30,6 +30,7 @@
defaultConfig {
minSdkVersion 25
}
+ namespace "androidx.wear.input.testing"
}
androidx {
diff --git a/wear/wear-input-testing/src/main/AndroidManifest.xml b/wear/wear-input-testing/src/main/AndroidManifest.xml
index a337dc2..9cd4123 100644
--- a/wear/wear-input-testing/src/main/AndroidManifest.xml
+++ b/wear/wear-input-testing/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.wear.input.testing"/>
+<manifest />
diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle
index 2eef70c..d55712d 100644
--- a/wear/wear-input/build.gradle
+++ b/wear/wear-input/build.gradle
@@ -47,6 +47,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.input"
}
androidx {
diff --git a/wear/wear-input/samples/build.gradle b/wear/wear-input/samples/build.gradle
index 26edfe6..036ffa5 100644
--- a/wear/wear-input/samples/build.gradle
+++ b/wear/wear-input/samples/build.gradle
@@ -34,6 +34,7 @@
defaultConfig {
minSdkVersion 25
}
+ namespace "androidx.wear.input.samples"
}
androidx {
diff --git a/wear/wear-input/samples/src/main/AndroidManifest.xml b/wear/wear-input/samples/src/main/AndroidManifest.xml
index 474f309..d1d709a 100644
--- a/wear/wear-input/samples/src/main/AndroidManifest.xml
+++ b/wear/wear-input/samples/src/main/AndroidManifest.xml
@@ -16,6 +16,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.input.samples">
+ xmlns:tools="http://schemas.android.com/tools">
</manifest>
\ No newline at end of file
diff --git a/wear/wear-input/src/main/AndroidManifest.xml b/wear/wear-input/src/main/AndroidManifest.xml
index 19e4723a..9cd4123 100644
--- a/wear/wear-input/src/main/AndroidManifest.xml
+++ b/wear/wear-input/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.wear.input"/>
+<manifest />
diff --git a/wear/wear-ongoing/build.gradle b/wear/wear-ongoing/build.gradle
index 0adbb5b..c4eae59 100644
--- a/wear/wear-ongoing/build.gradle
+++ b/wear/wear-ongoing/build.gradle
@@ -28,6 +28,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.ongoing"
}
androidx {
diff --git a/wear/wear-ongoing/src/main/AndroidManifest.xml b/wear/wear-ongoing/src/main/AndroidManifest.xml
index 0c985fa..9e46016 100644
--- a/wear/wear-ongoing/src/main/AndroidManifest.xml
+++ b/wear/wear-ongoing/src/main/AndroidManifest.xml
@@ -13,5 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.wear.ongoing"/>
+<manifest />
diff --git a/wear/wear-phone-interactions/build.gradle b/wear/wear-phone-interactions/build.gradle
index c12dda5..8bfb4bc 100644
--- a/wear/wear-phone-interactions/build.gradle
+++ b/wear/wear-phone-interactions/build.gradle
@@ -50,6 +50,7 @@
buildFeatures {
aidl = true
}
+ namespace "androidx.wear.phone.interactions"
}
androidx {
diff --git a/wear/wear-phone-interactions/src/main/AndroidManifest.xml b/wear/wear-phone-interactions/src/main/AndroidManifest.xml
index f111ff0..3082842 100644
--- a/wear/wear-phone-interactions/src/main/AndroidManifest.xml
+++ b/wear/wear-phone-interactions/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.phone.interactions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/wear/wear-remote-interactions/build.gradle b/wear/wear-remote-interactions/build.gradle
index 0d95deb..6b92f7e 100644
--- a/wear/wear-remote-interactions/build.gradle
+++ b/wear/wear-remote-interactions/build.gradle
@@ -56,6 +56,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear.remote.interactions"
}
androidx {
diff --git a/wear/wear-remote-interactions/src/main/AndroidManifest.xml b/wear/wear-remote-interactions/src/main/AndroidManifest.xml
index 4d89c3b..e97e69d 100644
--- a/wear/wear-remote-interactions/src/main/AndroidManifest.xml
+++ b/wear/wear-remote-interactions/src/main/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.remote.interactions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/wear/wear-samples-ambient/build.gradle b/wear/wear-samples-ambient/build.gradle
index b3bb65e..00d04e6 100644
--- a/wear/wear-samples-ambient/build.gradle
+++ b/wear/wear-samples-ambient/build.gradle
@@ -53,4 +53,5 @@
sourceCompatibility 1.8
targetCompatibility 1.8
}
+ namespace "androidx.wear.samples.ambient"
}
diff --git a/wear/wear-samples-ambient/src/main/AndroidManifest.xml b/wear/wear-samples-ambient/src/main/AndroidManifest.xml
index 9362003..af45bf8 100644
--- a/wear/wear-samples-ambient/src/main/AndroidManifest.xml
+++ b/wear/wear-samples-ambient/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.wear.samples.ambient">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.type.watch" />
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle
index 84e45f9..6f65819 100644
--- a/wear/wear/build.gradle
+++ b/wear/wear/build.gradle
@@ -56,6 +56,7 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ namespace "androidx.wear"
}
androidx {
diff --git a/wear/wear/src/androidTest/AndroidManifest.xml b/wear/wear/src/androidTest/AndroidManifest.xml
index 44a598f2..fd88400 100644
--- a/wear/wear/src/androidTest/AndroidManifest.xml
+++ b/wear/wear/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.wear.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:requestLegacyExternalStorage="true"
diff --git a/wear/wear/src/main/AndroidManifest.xml b/wear/wear/src/main/AndroidManifest.xml
index 53ae49b..8609cef 100644
--- a/wear/wear/src/main/AndroidManifest.xml
+++ b/wear/wear/src/main/AndroidManifest.xml
@@ -13,7 +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.wear">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<uses-library android:name="com.google.android.wearable" android:required="false" />
</application>
diff --git a/webkit/integration-tests/testapp/build.gradle b/webkit/integration-tests/testapp/build.gradle
index edcf35d..4ac5d9e 100644
--- a/webkit/integration-tests/testapp/build.gradle
+++ b/webkit/integration-tests/testapp/build.gradle
@@ -75,4 +75,5 @@
minifyEnabled true
}
}
+ namespace "com.example.androidx.webkit"
}
diff --git a/webkit/integration-tests/testapp/src/main/AndroidManifest.xml b/webkit/integration-tests/testapp/src/main/AndroidManifest.xml
index 77fd399..2970267 100644
--- a/webkit/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/webkit/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.example.androidx.webkit"
tools:ignore="GoogleAppIndexingWarning">
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/webkit/webkit/build.gradle b/webkit/webkit/build.gradle
index a1fea14c..2c3fcdd 100644
--- a/webkit/webkit/build.gradle
+++ b/webkit/webkit/build.gradle
@@ -57,6 +57,7 @@
"proguard-rules.pro"
)
}
+ namespace "androidx.webkit"
}
androidx {
diff --git a/webkit/webkit/src/androidTest/AndroidManifest.xml b/webkit/webkit/src/androidTest/AndroidManifest.xml
index df5f531..228aeec 100644
--- a/webkit/webkit/src/androidTest/AndroidManifest.xml
+++ b/webkit/webkit/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.webkit.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Note: we must provide INTERNET permission for
ServiceWorkerWebSettingsCompatTest#testBlockNetworkLoads -->
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/webkit/webkit/src/main/AndroidManifest.xml b/webkit/webkit/src/main/AndroidManifest.xml
index d50d0f7..95c4426 100644
--- a/webkit/webkit/src/main/AndroidManifest.xml
+++ b/webkit/webkit/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.webkit"/>
+<manifest />
diff --git a/window/extensions/extensions/build.gradle b/window/extensions/extensions/build.gradle
index 0acb6ac..eb25ebd 100644
--- a/window/extensions/extensions/build.gradle
+++ b/window/extensions/extensions/build.gradle
@@ -45,3 +45,7 @@
"(androidx.window:window) will use when communicating with the " +
"device-specific OEM extension."
}
+
+android {
+ namespace "androidx.window.extensions"
+}
diff --git a/window/extensions/extensions/src/androidTest/AndroidManifest.xml b/window/extensions/extensions/src/androidTest/AndroidManifest.xml
index d85d231..de33c4c6 100644
--- a/window/extensions/extensions/src/androidTest/AndroidManifest.xml
+++ b/window/extensions/extensions/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.window.extensions.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.window.extensions.TestActivity" />
diff --git a/window/extensions/extensions/src/main/AndroidManifest.xml b/window/extensions/extensions/src/main/AndroidManifest.xml
index 3c7e1ea..deac81d 100644
--- a/window/extensions/extensions/src/main/AndroidManifest.xml
+++ b/window/extensions/extensions/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.window.extensions" />
+<manifest />
diff --git a/window/sidecar/sidecar/build.gradle b/window/sidecar/sidecar/build.gradle
index b708694..5ff1fff 100644
--- a/window/sidecar/sidecar/build.gradle
+++ b/window/sidecar/sidecar/build.gradle
@@ -35,3 +35,7 @@
description = "This version of the OEM extension is deprecated. Please use window:extensions:extensions." +
"module instead."
}
+
+android {
+ namespace "androidx.window.sidecar"
+}
diff --git a/window/sidecar/sidecar/src/main/AndroidManifest.xml b/window/sidecar/sidecar/src/main/AndroidManifest.xml
index 7a16a48..deac81d 100644
--- a/window/sidecar/sidecar/src/main/AndroidManifest.xml
+++ b/window/sidecar/sidecar/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.window.sidecar" />
+<manifest />
diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle
index 393e511..b5c254f 100644
--- a/window/window-java/build.gradle
+++ b/window/window-java/build.gradle
@@ -46,6 +46,10 @@
description = "WindowManager Java Support"
}
+android {
+ namespace "androidx.window.java"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/window/window-java/src/androidTest/AndroidManifest.xml b/window/window-java/src/androidTest/AndroidManifest.xml
index b0a8659..55bc4a4 100644
--- a/window/window-java/src/androidTest/AndroidManifest.xml
+++ b/window/window-java/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.window.java.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Empty manifest file for the library.-->
</manifest>
diff --git a/window/window-java/src/main/AndroidManifest.xml b/window/window-java/src/main/AndroidManifest.xml
index 6ff89d0..b996125 100644
--- a/window/window-java/src/main/AndroidManifest.xml
+++ b/window/window-java/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.window.java">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Empty manifest file for the library.-->
</manifest>
\ No newline at end of file
diff --git a/window/window-rxjava2/build.gradle b/window/window-rxjava2/build.gradle
index f6ce06b..0515bce3 100644
--- a/window/window-rxjava2/build.gradle
+++ b/window/window-rxjava2/build.gradle
@@ -28,6 +28,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.window.rxjava2"
}
dependencies {
diff --git a/window/window-rxjava2/src/androidTest/AndroidManifest.xml b/window/window-rxjava2/src/androidTest/AndroidManifest.xml
index 25af29c..55bc4a4 100644
--- a/window/window-rxjava2/src/androidTest/AndroidManifest.xml
+++ b/window/window-rxjava2/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.window.rxjava2.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Empty manifest file for the library.-->
</manifest>
diff --git a/window/window-rxjava2/src/main/AndroidManifest.xml b/window/window-rxjava2/src/main/AndroidManifest.xml
index 5f2d863..b996125 100644
--- a/window/window-rxjava2/src/main/AndroidManifest.xml
+++ b/window/window-rxjava2/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.window.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Empty manifest file for the library.-->
</manifest>
\ No newline at end of file
diff --git a/window/window-rxjava3/build.gradle b/window/window-rxjava3/build.gradle
index 2397d23..fce4ba6 100644
--- a/window/window-rxjava3/build.gradle
+++ b/window/window-rxjava3/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.window.rxjava3"
}
dependencies {
diff --git a/window/window-rxjava3/src/androidTest/AndroidManifest.xml b/window/window-rxjava3/src/androidTest/AndroidManifest.xml
index 2f5f252..55bc4a4 100644
--- a/window/window-rxjava3/src/androidTest/AndroidManifest.xml
+++ b/window/window-rxjava3/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.window.rxjava3.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Empty manifest file for the library.-->
</manifest>
diff --git a/window/window-rxjava3/src/main/AndroidManifest.xml b/window/window-rxjava3/src/main/AndroidManifest.xml
index e4a2332..b996125 100644
--- a/window/window-rxjava3/src/main/AndroidManifest.xml
+++ b/window/window-rxjava3/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.window.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Empty manifest file for the library.-->
</manifest>
\ No newline at end of file
diff --git a/window/window-samples/build.gradle b/window/window-samples/build.gradle
index cc05259..1b3060c1 100644
--- a/window/window-samples/build.gradle
+++ b/window/window-samples/build.gradle
@@ -31,6 +31,7 @@
buildFeatures {
viewBinding true
}
+ namespace "androidx.window.sample"
}
dependencies {
diff --git a/window/window-samples/src/main/AndroidManifest.xml b/window/window-samples/src/main/AndroidManifest.xml
index 23b38e8..de10c6a 100644
--- a/window/window-samples/src/main/AndroidManifest.xml
+++ b/window/window-samples/src/main/AndroidManifest.xml
@@ -12,8 +12,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.window.sample">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
android:label="@string/app_name"
diff --git a/window/window-testing/build.gradle b/window/window-testing/build.gradle
index 090ca46..ee8ebfe 100644
--- a/window/window-testing/build.gradle
+++ b/window/window-testing/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled = true
}
+ namespace "androidx.window.testing"
}
dependencies {
diff --git a/window/window-testing/src/androidTest/AndroidManifest.xml b/window/window-testing/src/androidTest/AndroidManifest.xml
index 5ee77ce..f85e119 100644
--- a/window/window-testing/src/androidTest/AndroidManifest.xml
+++ b/window/window-testing/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.window.testing.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.window.testing.TestActivity"/>
</application>
diff --git a/window/window-testing/src/main/AndroidManifest.xml b/window/window-testing/src/main/AndroidManifest.xml
index 9582ba4..3d198a9 100644
--- a/window/window-testing/src/main/AndroidManifest.xml
+++ b/window/window-testing/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
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.window.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
\ No newline at end of file
diff --git a/window/window/build.gradle b/window/window/build.gradle
index ec90405..ca84543 100644
--- a/window/window/build.gradle
+++ b/window/window/build.gradle
@@ -39,6 +39,7 @@
java.srcDir testUtilDir
}
}
+ namespace "androidx.window"
}
dependencies {
diff --git a/window/window/src/androidTest/AndroidManifest.xml b/window/window/src/androidTest/AndroidManifest.xml
index 8a08129..bf604a6 100644
--- a/window/window/src/androidTest/AndroidManifest.xml
+++ b/window/window/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.window.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity android:name="androidx.window.TestActivity" />
diff --git a/window/window/src/main/AndroidManifest.xml b/window/window/src/main/AndroidManifest.xml
index d7a3c70..b99ed29 100644
--- a/window/window/src/main/AndroidManifest.xml
+++ b/window/window/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.window">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<uses-library android:name="androidx.window.extensions"
diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle
index e05c182..72acc47 100644
--- a/work/integration-tests/testapp/build.gradle
+++ b/work/integration-tests/testapp/build.gradle
@@ -46,6 +46,7 @@
useSupportLibrary = true
}
}
+ namespace "androidx.work.integration.testapp"
}
dependencies {
diff --git a/work/integration-tests/testapp/src/main/AndroidManifest.xml b/work/integration-tests/testapp/src/main/AndroidManifest.xml
index 17ab7d6..9ab778a 100644
--- a/work/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/work/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"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.work.integration.testapp">
+ xmlns:tools="http://schemas.android.com/tools">
<application
android:name=".TestApplication"
diff --git a/work/work-benchmark/build.gradle b/work/work-benchmark/build.gradle
index e46d1ca..9a5d999 100644
--- a/work/work-benchmark/build.gradle
+++ b/work/work-benchmark/build.gradle
@@ -44,3 +44,7 @@
inceptionYear = "2019"
description = "Android WorkManager Benchmark Library"
}
+
+android {
+ namespace "androidx.work.benchmark"
+}
diff --git a/work/work-benchmark/src/androidTest/AndroidManifest.xml b/work/work-benchmark/src/androidTest/AndroidManifest.xml
index f07f839..35687b9 100644
--- a/work/work-benchmark/src/androidTest/AndroidManifest.xml
+++ b/work/work-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.work.benchmark.test">
+<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/work/work-benchmark/src/main/AndroidManifest.xml b/work/work-benchmark/src/main/AndroidManifest.xml
index 4eb2ff3..4d64e1c 100644
--- a/work/work-benchmark/src/main/AndroidManifest.xml
+++ b/work/work-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.work.benchmark" />
+<manifest />
diff --git a/work/work-gcm/build.gradle b/work/work-gcm/build.gradle
index b2a7435..336375fb 100644
--- a/work/work-gcm/build.gradle
+++ b/work/work-gcm/build.gradle
@@ -26,6 +26,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.work.impl.background.gcm"
}
dependencies {
diff --git a/work/work-gcm/src/main/AndroidManifest.xml b/work/work-gcm/src/main/AndroidManifest.xml
index 91c1375..8971b343 100644
--- a/work/work-gcm/src/main/AndroidManifest.xml
+++ b/work/work-gcm/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.work.impl.background.gcm">
+ xmlns:tools="http://schemas.android.com/tools">
<application>
<service
diff --git a/work/work-inspection/build.gradle b/work/work-inspection/build.gradle
index 39953f4..66abf53 100644
--- a/work/work-inspection/build.gradle
+++ b/work/work-inspection/build.gradle
@@ -57,6 +57,7 @@
sourceSets {
main.resources.srcDirs += "src/main/proto"
}
+ namespace "androidx.work.inspection"
}
// Allow usage of Kotlin's @OptIn.
diff --git a/work/work-inspection/src/androidTest/AndroidManifest.xml b/work/work-inspection/src/androidTest/AndroidManifest.xml
index 2c1a6a2..622c58e 100644
--- a/work/work-inspection/src/androidTest/AndroidManifest.xml
+++ b/work/work-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.work.inspection.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:name="androidx.work.inspection.InspectorApp" />
diff --git a/work/work-inspection/src/main/AndroidManifest.xml b/work/work-inspection/src/main/AndroidManifest.xml
index d4da33a..9a93f59 100644
--- a/work/work-inspection/src/main/AndroidManifest.xml
+++ b/work/work-inspection/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.work.inspection">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/work/work-multiprocess/build.gradle b/work/work-multiprocess/build.gradle
index 24f6373..f350aa2 100644
--- a/work/work-multiprocess/build.gradle
+++ b/work/work-multiprocess/build.gradle
@@ -26,6 +26,7 @@
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
+ namespace "androidx.work.multiprocess"
}
dependencies {
diff --git a/work/work-multiprocess/src/androidTest/AndroidManifest.xml b/work/work-multiprocess/src/androidTest/AndroidManifest.xml
index 9721117..e49600c 100644
--- a/work/work-multiprocess/src/androidTest/AndroidManifest.xml
+++ b/work/work-multiprocess/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.work.multiprocess.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service android:name="androidx.work.multiprocess.RemoteWorkerService" />
diff --git a/work/work-multiprocess/src/main/AndroidManifest.xml b/work/work-multiprocess/src/main/AndroidManifest.xml
index 855611d..81880c7 100644
--- a/work/work-multiprocess/src/main/AndroidManifest.xml
+++ b/work/work-multiprocess/src/main/AndroidManifest.xml
@@ -13,9 +13,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest
- package="androidx.work.multiprocess"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" >
<application>
diff --git a/work/work-runtime-ktx/build.gradle b/work/work-runtime-ktx/build.gradle
index 85ffcb15..0cc64c2 100644
--- a/work/work-runtime-ktx/build.gradle
+++ b/work/work-runtime-ktx/build.gradle
@@ -47,6 +47,10 @@
description = "Android WorkManager Kotlin Extensions"
}
+android {
+ namespace "androidx.work.ktx"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
diff --git a/work/work-runtime-ktx/src/main/AndroidManifest.xml b/work/work-runtime-ktx/src/main/AndroidManifest.xml
index b70e9b6..f1486e6 100644
--- a/work/work-runtime-ktx/src/main/AndroidManifest.xml
+++ b/work/work-runtime-ktx/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.work.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/work/work-runtime/build.gradle b/work/work-runtime/build.gradle
index 18a689c..1821a57 100644
--- a/work/work-runtime/build.gradle
+++ b/work/work-runtime/build.gradle
@@ -47,6 +47,7 @@
sourceSets {
androidTest.assets.srcDirs += files("$projectDir/src/schemas".toString())
}
+ namespace "androidx.work"
}
dependencies {
diff --git a/work/work-runtime/src/androidTest/AndroidManifest.xml b/work/work-runtime/src/androidTest/AndroidManifest.xml
index f78145a..3f54449 100644
--- a/work/work-runtime/src/androidTest/AndroidManifest.xml
+++ b/work/work-runtime/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.work.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!--
~ Adding this permission to the test-app's AndroidManifest.xml. This is because
diff --git a/work/work-runtime/src/main/AndroidManifest.xml b/work/work-runtime/src/main/AndroidManifest.xml
index f8cc60a..f695143 100644
--- a/work/work-runtime/src/main/AndroidManifest.xml
+++ b/work/work-runtime/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.work">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/work/work-rxjava2/build.gradle b/work/work-rxjava2/build.gradle
index 568032d..575800f 100644
--- a/work/work-rxjava2/build.gradle
+++ b/work/work-rxjava2/build.gradle
@@ -39,3 +39,7 @@
description = "Android WorkManager RxJava2 interoperatibility library"
failOnDeprecationWarnings = false
}
+
+android {
+ namespace "androidx.work.rxjava2"
+}
diff --git a/work/work-rxjava2/src/main/AndroidManifest.xml b/work/work-rxjava2/src/main/AndroidManifest.xml
index 8d7c4d1..f15bef6 100644
--- a/work/work-rxjava2/src/main/AndroidManifest.xml
+++ b/work/work-rxjava2/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.work.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/work/work-rxjava3/build.gradle b/work/work-rxjava3/build.gradle
index 362ddcf..4894866 100644
--- a/work/work-rxjava3/build.gradle
+++ b/work/work-rxjava3/build.gradle
@@ -38,3 +38,7 @@
inceptionYear = "2020"
description = "Android WorkManager RxJava3 interoperatibility library"
}
+
+android {
+ namespace "androidx.work.rxjava3"
+}
diff --git a/work/work-rxjava3/src/main/AndroidManifest.xml b/work/work-rxjava3/src/main/AndroidManifest.xml
index bd6fae1..f15bef6 100644
--- a/work/work-rxjava3/src/main/AndroidManifest.xml
+++ b/work/work-rxjava3/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.work.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/work/work-testing/build.gradle b/work/work-testing/build.gradle
index a8806cc..a255bc8 100644
--- a/work/work-testing/build.gradle
+++ b/work/work-testing/build.gradle
@@ -47,3 +47,7 @@
inceptionYear = "2018"
description = "Android WorkManager testing library"
}
+
+android {
+ namespace "androidx.work.testing"
+}
diff --git a/work/work-testing/src/main/AndroidManifest.xml b/work/work-testing/src/main/AndroidManifest.xml
index 2ef3c35..f1486e6 100644
--- a/work/work-testing/src/main/AndroidManifest.xml
+++ b/work/work-testing/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.work.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
