Skip to content

Commit dcfa035

Browse files
liutikasliutikas
committed
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
1 parent fbb17f3 commit dcfa035

File tree

1,196 files changed

+1854
-1190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,196 files changed

+1854
-1190
lines changed

‎activity/activity-compose/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,7 @@ androidx {
6262
description = "Compose integration with Activity"
6363
runApiTasks = new RunApiTasks.Yes()
6464
}
65+
66+
android {
67+
namespace "androidx.activity.compose"
68+
}

‎activity/activity-compose/integration-tests/activity-demos/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ androidx {
3636
inceptionYear = "2020"
3737
description = "This is a project for Activity demos."
3838
}
39+
40+
android {
41+
namespace "androidx.activity.compose.demos"
42+
}

‎activity/activity-compose/integration-tests/activity-demos/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
limitations under the License.
1515
-->
1616

17-
<manifest package="androidx.activity.compose.demos" />
17+
<manifest />

‎activity/activity-compose/samples/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,7 @@ androidx {
4747
inceptionYear = "2020"
4848
description = "Samples for Compose integration with Activity"
4949
}
50+
51+
android {
52+
namespace "androidx.activity.compose.samples"
53+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
limitations under the License.
1515
-->
1616

17-
<manifest package="androidx.activity.compose.samples" />
17+
<manifest />

‎activity/activity-compose/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<manifest package="androidx.activity.compose" />
17+
<manifest />

‎activity/activity-compose/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<manifest package="androidx.activity.compose" />
17+
<manifest />

‎activity/activity-ktx/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ androidx {
5757
description = "Kotlin extensions for 'activity' artifact"
5858
}
5959

60+
android {
61+
namespace "androidx.activity.ktx"
62+
}
63+
6064
// needed only while https://youtrack.jetbrains.com/issue/KT-47000 isn't resolved which is
6165
// targeted to 1.6
6266
tasks.withType(KotlinCompile).configureEach {

‎activity/activity-ktx/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
17-
package="androidx.activity.ktx">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<application>
1918
<activity
2019
android:name="androidx.activity.ActivityViewModelLazyTest$TestActivity"

‎activity/activity-ktx/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest package="androidx.activity.ktx"/>
16+
<manifest />

‎activity/activity/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ android {
1111
multiDexEnabled true
1212
testInstrumentationRunnerArgument "listener", "leakcanary.FailTestOnLeakRunListener"
1313
}
14+
namespace "androidx.activity"
1415
}
1516

1617
dependencies {

‎activity/activity/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="androidx.activity.test">
17+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<application android:name="androidx.activity.LeakCanaryApp">
2120
<activity

‎activity/activity/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest package="androidx.activity">
16+
<manifest>
1717
</manifest>

‎activity/integration-tests/testapp/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626

2727
applicationId "androidx.activity.integration.testapp"
2828
}
29+
namespace "androidx.activity.integration.testapp"
2930
}
3031

3132
dependencies {

‎activity/integration-tests/testapp/src/androidTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
<manifest package="androidx.activity.integration.testapp.test">
17+
<manifest>
1818
</manifest>

‎activity/integration-tests/testapp/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
xmlns:tools="http://schemas.android.com/tools"
19-
package="androidx.activity.integration.testapp">
18+
xmlns:tools="http://schemas.android.com/tools">
2019

2120
<application tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">
2221
<activity

‎ads/ads-identifier-benchmark/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@ dependencies {
3535
androidTestImplementation(libs.testRules)
3636
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
3737
}
38+
39+
android {
40+
namespace "androidx.ads.identifier.benchmark"
41+
}

‎ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<manifest
18-
xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="androidx.ads.identifier.benchmark.test">
18+
xmlns:android="http://schemas.android.com/apk/res/android">
2019
<application
2120
android:name="androidx.ads.identifier.benchmark.AdsIdentifierBenchmarkApplication">
2221
<!-- enable profiling by shell for non-intrusive profiling tools -->

‎ads/ads-identifier-benchmark/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<manifest package="androidx.ads.identifier.benchmark" />
18+
<manifest />

‎ads/ads-identifier-common/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ android {
3737
aidl = true
3838
}
3939
testOptions.unitTests.includeAndroidResources = true
40+
namespace "androidx.ads.identifier.common"
4041
}
4142

4243
androidx {

‎ads/ads-identifier-common/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest package="androidx.ads.identifier.common"
17-
xmlns:android="http://schemas.android.com/apk/res/android">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
</manifest>

‎ads/ads-identifier-provider/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,7 @@ androidx {
4747
inceptionYear = "2019"
4848
description = "AndroidX Ads Identifier Provider"
4949
}
50+
51+
android {
52+
namespace "androidx.ads.identifier.provider"
53+
}

‎ads/ads-identifier-provider/integration-tests/testapp/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ android {
2323
applicationId "androidx.ads.identifier.provider.testapp"
2424
minSdkVersion 14
2525
}
26+
namespace "androidx.ads.identifier.provider.testapp"
2627
}
2728

2829
dependencies {

‎ads/ads-identifier-provider/integration-tests/testapp/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="androidx.ads.identifier.provider.testapp">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<application
76
android:name=".AdsIdentifierProviderApplication"

‎ads/ads-identifier-provider/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
limitations under the License
1515
-->
1616

17-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="androidx.ads.identifier.provider.test">
17+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1918
</manifest>

‎ads/ads-identifier-provider/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
17-
xmlns:tools="http://schemas.android.com/tools"
18-
package="androidx.ads.identifier.provider">
17+
xmlns:tools="http://schemas.android.com/tools">
1918

2019
<application>
2120
<service

‎ads/ads-identifier-testing/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ android {
3131
lintOptions {
3232
disable "InvalidPackage" // Lint is unhappy about mockito package
3333
}
34+
namespace "androidx.ads.identifier.testing"
3435
}
3536

3637
androidx {

‎ads/ads-identifier-testing/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<manifest package="androidx.ads.identifier.testing" />
18+
<manifest />

‎ads/ads-identifier/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@ androidx {
4949
inceptionYear = "2019"
5050
description = "AndroidX Ads Identifier"
5151
}
52+
53+
android {
54+
namespace "androidx.ads.identifier"
55+
}

‎ads/ads-identifier/integration-tests/testapp/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ android {
2424
applicationId "androidx.ads.identifier.testapp"
2525
minSdkVersion 14
2626
}
27+
namespace "androidx.ads.identifier.testapp"
2728
}
2829

2930
dependencies {

‎ads/ads-identifier/integration-tests/testapp/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="androidx.ads.identifier.testapp">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<application
76
android:allowBackup="false"

‎ads/ads-identifier/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
-->
1616

1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
xmlns:tools="http://schemas.android.com/tools"
19-
package="androidx.ads.identifier.test">
18+
xmlns:tools="http://schemas.android.com/tools">
2019

2120
<application>
2221
<service

‎ads/ads-identifier/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest package="androidx.ads.identifier"
17-
xmlns:android="http://schemas.android.com/apk/res/android">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
</manifest>

‎annotation/annotation-experimental/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ androidx {
3737
"conjunction with the Experimental annotation lint checks, this annotation provides " +
3838
"functional parity with Kotlin's Experimental annotation."
3939
}
40+
41+
android {
42+
namespace "androidx.annotation.experimental"
43+
}

‎annotation/annotation-experimental/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<manifest package="androidx.annotation.experimental" />
17+
<manifest />

‎appcompat/appcompat-benchmark/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ dependencies {
3030
androidTestImplementation(libs.testRules)
3131
androidTestImplementation(libs.kotlinStdlib)
3232
}
33+
34+
android {
35+
namespace "androidx.appcompat.benchmark"
36+
}

‎appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<manifest
18-
xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="androidx.appcompat.benchmark.test">
18+
xmlns:android="http://schemas.android.com/apk/res/android">
2019
<application>
2120
<!-- enable profiling by shell for non-intrusive profiling tools -->
2221
<profileable android:shell="true"/>

‎appcompat/appcompat-benchmark/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="androidx.appcompat.benchmark"/>
17+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

‎appcompat/appcompat-resources/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ android {
5151
additionalParameters "--no-version-vectors"
5252
noCompress "ttf"
5353
}
54+
namespace "androidx.appcompat.resources"
5455
}
5556

5657
androidx {

‎appcompat/appcompat-resources/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="androidx.appcompat.resources.test">
17+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<application
2120
android:theme="@android:style/Theme">

‎appcompat/appcompat-resources/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest package="androidx.appcompat.resources"/>
16+
<manifest />

‎appcompat/appcompat/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ android {
8585
useLibrary "android.test.runner"
8686
useLibrary "android.test.base"
8787
useLibrary "android.test.mock"
88+
namespace "androidx.appcompat"
8889
}
8990

9091
androidx {

‎appcompat/appcompat/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
limitations under the License.
1616
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
xmlns:tools="http://schemas.android.com/tools"
19-
package="androidx.appcompat.test">
18+
xmlns:tools="http://schemas.android.com/tools">
2019

2120
<uses-sdk
2221
android:minSdkVersion="14"

‎appcompat/appcompat/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<manifest package="androidx.appcompat"/>
16+
<manifest />

‎appcompat/integration-tests/receive-content-testapp/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ android {
2323
defaultConfig {
2424
minSdkVersion 21
2525
}
26+
namespace "androidx.appcompat.demo.receivecontent"
2627
}
2728

2829
dependencies {

‎appcompat/integration-tests/receive-content-testapp/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="androidx.appcompat.demo.receivecontent">
17+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<application
2120
android:allowBackup="true"

‎appsearch/appsearch-builtin-types/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ androidx {
4646
'apps, as well as structured parameters for semantic intents should use these ' +
4747
'built-in types as appropriate.'
4848
}
49+
50+
android {
51+
namespace "androidx.appsearch.builtintypes"
52+
}

‎appsearch/appsearch-builtin-types/src/androidTest/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
limitations under the License
1515
-->
1616

17-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="androidx.appsearch.builtintypes.test"/>
17+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

‎appsearch/appsearch-builtin-types/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
limitations under the License.
1515
-->
1616

17-
<manifest package="androidx.appsearch.builtintypes"/>
17+
<manifest />

0 commit comments

Comments
 (0)