Skip to content

Commit 401d7e5

Browse files
TWiStErRobsjudd
TWiStErRob
authored and
sjudd
committed
Migrate <manifest package="..." in AndroidManifest.xml to namespace '...' in build.gradle.
1 parent 49ddc01 commit 401d7e5

File tree

60 files changed

+62
-85
lines changed

Some content is hidden

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

60 files changed

+62
-85
lines changed

‎annotation/compiler/test/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ afterEvaluate {
2727
}
2828

2929
android {
30+
namespace 'com.bumptech.glide.annotation.compiler.test'
3031
compileSdk libs.versions.compile.sdk.version.get()
3132

3233
defaultConfig {

‎annotation/compiler/test/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.annotation.compiler.test">
4-
</manifest>
2+
<manifest />

‎annotation/ksp/integrationtest/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins {
1515
}
1616

1717
android {
18+
namespace 'com.bumptech.glide.annotation.ksp.integrationtest'
1819
compileSdkVersion libs.versions.compile.sdk.version.get()
1920

2021
defaultConfig {

‎annotation/ksp/integrationtest/src/main/AndroidManifest.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.annotation.ksp.integrationtest">
4-
5-
</manifest>
2+
<manifest />

‎annotation/ksp/test/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
android {
7+
namespace 'com.bumptech.glide.annotation.ksp.test'
78
compileSdkVersion libs.versions.compile.sdk.version.get()
89

910
defaultConfig {

‎annotation/ksp/test/src/main/AndroidManifest.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.bumptech.glide.annotation.ksp.test">
5-
</manifest>
2+
<manifest />

‎benchmark/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
android {
7+
namespace 'com.bumptech.glide.benchmark'
78
compileSdkVersion libs.versions.compile.sdk.version.get()
89

910
buildToolsVersion "30.0.3"

‎benchmark/src/androidTest/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="com.bumptech.glide.benchmark">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<!--
76
Important: disable debugging for accurate performance results

‎benchmark/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.bumptech.glide.benchmark">
3-
</manifest>
2+
<manifest />

‎instrumentation/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ dependencies {
3030
}
3131

3232
android {
33+
namespace 'com.bumptech.glide.instrumentation'
3334
compileSdkVersion libs.versions.compile.sdk.version.get()
3435

3536
defaultConfig {
36-
applicationId 'com.bumptech.glide.instrumentation'
3737
minSdk libs.versions.min.sdk.version.get() as int
3838
targetSdk libs.versions.target.sdk.version.get() as int
3939
versionCode 1

‎instrumentation/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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="com.bumptech.glide.instrumentation">
3+
xmlns:tools="http://schemas.android.com/tools">
4+
55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
66
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
77
<application

‎integration/avif/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
}
1010

1111
android {
12+
namespace 'com.bumptech.glide.integration.avif'
1213
compileSdkVersion libs.versions.compile.sdk.version.get()
1314

1415
defaultConfig {

‎integration/avif/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.avif" />
2+
<manifest />

‎integration/compose/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
android {
7+
namespace 'com.bumptech.glide.integration.compose'
78
compileSdk 33
89

910
defaultConfig {

‎integration/compose/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.compose">
4-
</manifest>
2+
<manifest />

‎integration/concurrent/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
}
1515

1616
android {
17+
namespace 'com.bumptech.glide.integration.concurrent'
1718
compileSdkVersion libs.versions.compile.sdk.version.get()
1819

1920
defaultConfig {

‎integration/concurrent/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
package="com.bumptech.glide.integration.concurrent">
4-
</manifest>
2+
<manifest />

‎integration/cronet/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
}
1717

1818
android {
19+
namespace 'com.bumptech.glide.integration.cronet'
1920
compileSdkVersion libs.versions.compile.sdk.version.get()
2021

2122
defaultConfig {

‎integration/cronet/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.cronet">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
44
<application>
55
<meta-data
66
android:name="com.bumptech.glide.integration.cronet.CronetGlideModule"

‎integration/cronet/src/test/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.cronet">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
54
</manifest>

‎integration/gifencoder/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
}
1515

1616
android {
17+
namespace 'com.bumptech.glide.integration.gifencoder'
1718
compileSdkVersion libs.versions.compile.sdk.version.get()
1819

1920
sourceSets {

‎integration/gifencoder/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
package="com.bumptech.glide.integration.gifencoder">
4-
</manifest>
2+
<manifest />

‎integration/ktx/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
android {
7+
namespace 'com.bumptech.glide.integration.ktx'
78
compileSdkVersion libs.versions.compile.sdk.version.get()
89

910
defaultConfig {

‎integration/ktx/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.bumptech.glide.integration.ktx" />
2+
<manifest />

‎integration/okhttp/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
}
1010

1111
android {
12+
namespace 'com.bumptech.glide.integration.okhttp'
1213
compileSdkVersion libs.versions.compile.sdk.version.get()
1314

1415
defaultConfig {

‎integration/okhttp/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
package="com.bumptech.glide.integration.okhttp">
4-
</manifest>
2+
<manifest />

‎integration/okhttp3/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
}
1010

1111
android {
12+
namespace 'com.bumptech.glide.integration.okhttp'
1213
compileSdkVersion libs.versions.compile.sdk.version.get()
1314

1415
defaultConfig {

‎integration/okhttp3/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.okhttp">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application>
65
<meta-data

‎integration/okhttp4/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
}
1010

1111
android {
12+
namespace 'com.bumptech.glide.integration.okhttp'
1213
compileSdkVersion libs.versions.compile.sdk.version.get()
1314

1415
defaultConfig {

‎integration/okhttp4/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
package="com.bumptech.glide.integration.okhttp">
4-
</manifest>
2+
<manifest />

‎integration/recyclerview/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dependencies {
77
}
88

99
android {
10+
namespace 'com.bumptech.glide.integration.recyclerview'
1011
compileSdkVersion libs.versions.compile.sdk.version.get()
1112

1213
defaultConfig {

‎integration/recyclerview/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
package="com.bumptech.glide.integration.recyclerview">
4-
</manifest>
2+
<manifest />

‎integration/sqljournaldiskcache/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
android {
7+
namespace 'com.bumptech.glide.integration.sqljournaldiskcache'
78
compileSdkVersion libs.versions.compile.sdk.version.get()
89

910
defaultConfig {

‎integration/sqljournaldiskcache/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.sqljournaldiskcache">
4-
</manifest>
2+
<manifest />

‎integration/volley/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies {
1818
}
1919

2020
android {
21+
namespace 'com.bumptech.glide.integration.volley'
2122
compileSdkVersion libs.versions.compile.sdk.version.get()
2223

2324
defaultConfig {

‎integration/volley/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.integration.volley">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application>
65
<meta-data

‎library/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ if (project.plugins.hasPlugin('net.ltgt.errorprone')) {
5959
}
6060

6161
android {
62+
namespace 'com.bumptech.glide'
6263
compileSdkVersion libs.versions.compile.sdk.version.get()
6364

6465
defaultConfig {

‎library/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide">
4-
</manifest>
2+
<manifest />

‎library/test/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ android.testOptions.unitTests.all { Test testTask ->
4040
}
4141

4242
android {
43+
namespace 'com.bumptech.glide.test'
4344
compileSdkVersion libs.versions.compile.sdk.version.get()
4445

4546
defaultConfig {

‎library/test/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.bumptech.glide.test">
3-
</manifest>
2+
<manifest />

‎mocks/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies {
88
}
99

1010
android {
11+
namespace 'com.bumptech.glide.mocks'
1112
compileSdkVersion libs.versions.compile.sdk.version.get()
1213

1314
defaultConfig {

‎mocks/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.mocks">
4-
</manifest>
2+
<manifest />

‎samples/contacturi/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ dependencies {
77
}
88

99
android {
10+
namespace 'com.bumptech.glide.samples.contacturi'
1011
compileSdkVersion libs.versions.compile.sdk.version.get()
1112

1213
defaultConfig {
13-
applicationId 'com.bumptech.glide.samples.contacturi'
1414
minSdk libs.versions.min.sdk.version.get() as int
1515
targetSdk libs.versions.target.sdk.version.get() as int
1616

‎samples/contacturi/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.samples.contacturi" >
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.READ_CONTACTS" />
65

‎samples/flickr/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ dependencies {
1313
}
1414

1515
android {
16+
namespace 'com.bumptech.glide.samples.flickr'
1617
compileSdkVersion libs.versions.compile.sdk.version.get()
1718

1819
defaultConfig {
19-
applicationId 'com.bumptech.glide.samples.flickr'
2020
minSdk libs.versions.min.sdk.version.get() as int
2121
targetSdk libs.versions.target.sdk.version.get() as int
2222

‎samples/flickr/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="com.bumptech.glide.samples.flickr">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET"/>
76
<!--

‎samples/gallery/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ kotlin {
2929
}
3030

3131
android {
32+
namespace 'com.bumptech.glide.samples.gallery'
3233
compileSdk 34
3334

3435
defaultConfig {
35-
applicationId 'com.bumptech.glide.samples.gallery'
3636
minSdk 29
3737
targetSdk 34
3838
versionCode 1

‎samples/gallery/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.samples.gallery">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-sdk
65
android:minSdkVersion="29"

‎samples/giphy/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ dependencies {
1212
}
1313

1414
android {
15+
namespace 'com.bumptech.glide.samples.giphy'
1516
compileSdkVersion libs.versions.compile.sdk.version.get()
1617

1718
defaultConfig {
18-
applicationId 'com.bumptech.glide.samples.giphy'
1919
minSdk libs.versions.min.sdk.version.get() as int
2020
targetSdk libs.versions.target.sdk.version.get() as int
2121
versionCode 1

‎samples/giphy/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide.samples.giphy">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.INTERNET"/>
65
<!--

0 commit comments

Comments
 (0)