Skip to content

Commit 9aa45a5

Browse files
rlazorlazo
authored
Update AGP to version 7.3.1 (#5114)
* Update AGP to version 7.3.1 * Use namespace in gradle file instead of package in AndroidManifest * Organize namespace more consistently * Update protolite-well-known-types.gradle
1 parent e747aba commit 9aa45a5

File tree

144 files changed

+168
-204
lines changed

Some content is hidden

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

144 files changed

+168
-204
lines changed

‎appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ android {
2727
timeOutInMs 60 * 1000
2828
}
2929

30+
namespace "com.google.firebase.appcheck.debug.testing"
3031
compileSdkVersion project.targetSdkVersion
3132
defaultConfig {
3233
targetSdkVersion project.targetSdkVersion

‎appcheck/firebase-appcheck-debug-testing/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.appcheck.debug.testing">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1918
<!--<uses-sdk android:minSdkVersion="16"/>-->
2019
<application>

‎appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
timeOutInMs 60 * 1000
2727
}
2828

29+
namespace "com.google.firebase.appcheck.debug"
2930
compileSdkVersion project.targetSdkVersion
3031
defaultConfig {
3132
targetSdkVersion project.targetSdkVersion

‎appcheck/firebase-appcheck-debug/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.appcheck.debug">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1918
<!--<uses-sdk android:minSdkVersion="16"/>-->
2019
<application>

‎appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
timeOutInMs 60 * 1000
2727
}
2828

29+
namespace "com.google.firebase.appcheck.interop"
2930
compileSdkVersion project.targetSdkVersion
3031
defaultConfig {
3132
targetSdkVersion project.targetSdkVersion

‎appcheck/firebase-appcheck-interop/src/main/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
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="com.google.firebase.appcheck.interop">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1918
<!--<uses-sdk android:minSdkVersion="16"/>-->
2019
<application />
21-
</manifest>
20+
</manifest>

‎appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
timeOutInMs 60 * 1000
2727
}
2828

29+
namespace "com.google.firebase.appcheck.playintegrity"
2930
compileSdkVersion project.targetSdkVersion
3031
defaultConfig {
3132
targetSdkVersion project.targetSdkVersion

‎appcheck/firebase-appcheck-playintegrity/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.appcheck.playintegrity">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1918
<!--<uses-sdk android:minSdkVersion="16"/>-->
2019
<application>

‎appcheck/firebase-appcheck/firebase-appcheck.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
timeOutInMs 60 * 1000
2727
}
2828

29+
namespace "com.google.firebase.appcheck"
2930
compileSdkVersion project.targetSdkVersion
3031
defaultConfig {
3132
targetSdkVersion project.targetSdkVersion

‎appcheck/firebase-appcheck/ktx/ktx.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ firebaseLibrary {
2525
}
2626

2727
android {
28+
namespace "com.google.firebase.appcheck.ktx"
2829
compileSdkVersion project.targetSdkVersion
2930
defaultConfig {
3031
minSdkVersion 16

‎appcheck/firebase-appcheck/ktx/src/androidTest/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.google.firebase.appcheck.ktx">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
43
<!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
54
<uses-permission android:name="android.permission.INTERNET"/>
@@ -10,4 +9,4 @@
109
<instrumentation
1110
android:name="androidx.test.runner.AndroidJUnitRunner"
1211
android:targetPackage="com.google.firebase.appcheck.ktx" />
13-
</manifest>
12+
</manifest>

‎appcheck/firebase-appcheck/ktx/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
<!-- See the License for the specific language governing permissions and -->
1313
<!-- limitations under the License. -->
1414

15-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
16-
package="com.google.firebase.appcheck.ktx">
15+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1716
<uses-sdk android:minSdkVersion="16"/>
1817

1918
<application>

‎appcheck/firebase-appcheck/src/androidTest/java/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.appcheck">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817

1918
<application>
2019
<uses-library android:name="android.test.runner"/>

‎appcheck/firebase-appcheck/src/main/AndroidManifest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
1313
<!-- See the License for the specific language governing permissions and -->
1414
<!-- limitations under the License. -->
15-
<manifest
16-
xmlns:android="http://schemas.android.com/apk/res/android"
17-
package="com.google.firebase.appcheck">
15+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1816
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1917
<!--<uses-sdk android:minSdkVersion="16"/>-->
2018
<application>
@@ -24,4 +22,4 @@
2422
android:value="com.google.firebase.components.ComponentRegistrar" />
2523
</service>
2624
</application>
27-
</manifest>
25+
</manifest>

‎buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies {
7070

7171
implementation(libs.kotlinx.serialization.json)
7272
implementation("com.google.code.gson:gson:2.8.9")
73-
implementation("com.android.tools.build:gradle:7.2.2")
73+
implementation("com.android.tools.build:gradle:7.3.1")
7474
implementation("com.android.tools.build:builder-test-api:7.2.2")
7575
implementation("gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9")
7676

‎encoders/firebase-decoders-json/firebase-decoders-json.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ firebaseLibrary {
2222
}
2323

2424
android {
25+
namespace "com.google.firebase.decoders.json"
2526
compileSdkVersion project.targetSdkVersion
2627
defaultConfig {
2728
minSdkVersion project.minSdkVersion
@@ -55,4 +56,4 @@ dependencies {
5556

5657
tasks.withType(JavaCompile) {
5758
options.compilerArgs << "-Werror"
58-
}
59+
}

‎encoders/firebase-decoders-json/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
<!-- See the License for the specific language governing permissions and -->
1313
<!-- limitations under the License. -->
1414

15-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
16-
package="com.google.firebase.decoders.json" />
15+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

‎encoders/firebase-encoders-json/firebase-encoders-json.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ firebaseLibrary {
2323
}
2424

2525
android {
26+
namespace "com.google.firebase.encoders.json"
2627
compileSdkVersion project.targetSdkVersion
2728
defaultConfig {
2829
minSdkVersion project.minSdkVersion

‎encoders/firebase-encoders-json/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.encoders.json">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1918
<!--<uses-sdk android:minSdkVersion="14"/>-->
2019
</manifest>

‎encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ firebaseLibrary {
2222
}
2323

2424
android {
25+
namespace "com.google.firebase.encoders.reflective"
2526
compileSdkVersion project.targetSdkVersion
2627
defaultConfig {
2728
minSdkVersion project.minSdkVersion

‎encoders/firebase-encoders-reflective/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.encoders.reflective">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
1918
<!--<uses-sdk android:minSdkVersion="14"/>-->
2019
</manifest>

‎firebase-abt/firebase-abt.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ android {
2828
abortOnError false
2929
}
3030

31+
namespace "com.google.firebase.abt"
3132
compileSdkVersion project.targetSdkVersion
3233
defaultConfig {
3334
minSdkVersion project.minSdkVersion

‎firebase-abt/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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.google.firebase.abt">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
54
<!--<uses-sdk android:minSdkVersion="14"/>-->
65
<application>

‎firebase-appdistribution-api/firebase-appdistribution-api.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ firebaseLibrary {
2121
}
2222

2323
android {
24+
namespace "com.google.firebase.appdistribution"
2425
compileSdkVersion project.targetSdkVersion
25-
26+
2627
defaultConfig {
2728
minSdkVersion 16
2829
targetSdkVersion project.targetSdkVersion
@@ -54,4 +55,4 @@ dependencies {
5455
androidTestImplementation "org.mockito:mockito-android:3.4.0"
5556
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
5657
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
57-
}
58+
}

‎firebase-appdistribution-api/ktx/ktx.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ firebaseLibrary {
2525
}
2626

2727
android {
28+
namespace "com.google.firebase.appdistribution.ktx"
2829
compileSdkVersion project.targetSdkVersion
2930
defaultConfig {
3031
minSdkVersion 16

‎firebase-appdistribution-api/ktx/src/androidTest/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.google.firebase.appdistribution.ktx">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
43
<!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
54
<uses-permission android:name="android.permission.INTERNET"/>
@@ -10,4 +9,4 @@
109
<instrumentation
1110
android:name="androidx.test.runner.AndroidJUnitRunner"
1211
android:targetPackage="com.google.firebase.appdistribution.ktx" />
13-
</manifest>
12+
</manifest>

‎firebase-appdistribution-api/ktx/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
<!-- See the License for the specific language governing permissions and -->
1313
<!-- limitations under the License. -->
1414

15-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
16-
package="com.google.firebase.appdistribution.ktx">
15+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1716
<uses-sdk android:minSdkVersion="16"/>
1817

1918
<application>

‎firebase-appdistribution-api/src/main/AndroidManifest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +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="com.google.firebase.appdistribution">
18-
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1917
<application>
2018
<service
2119
android:name="com.google.firebase.components.ComponentDiscoveryService"
@@ -25,4 +23,4 @@
2523
android:value="com.google.firebase.components.ComponentRegistrar" />
2624
</service>
2725
</application>
28-
</manifest>
26+
</manifest>

‎firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ firebaseLibrary {
2222
}
2323

2424
android {
25+
namespace "com.google.firebase.appdistribution.impl"
2526
compileSdkVersion project.targetSdkVersion
2627

2728
defaultConfig {

‎firebase-appdistribution/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase.appdistribution.test">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817

1918
<application>
2019
<uses-library android:name="android.test.runner"/>

‎firebase-appdistribution/src/main/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
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="com.google.firebase.appdistribution.impl">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1817

1918
<uses-permission android:name="android.permission.INTERNET" />
2019
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
@@ -66,4 +65,4 @@
6665
android:resource="@xml/firebase_app_distribution_provider_paths" />
6766
</provider>
6867
</application>
69-
</manifest>
68+
</manifest>

‎firebase-common/data-collection-tests/data-collection-tests.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ android {
2020
val targetSdkVersion : Int by rootProject
2121
val minSdkVersion : Int by rootProject
2222
compileSdk = targetSdkVersion
23+
namespace = "com.google.firebase.datacollectiontests"
2324
defaultConfig {
2425
minSdk = minSdkVersion
2526
targetSdk = targetSdkVersion

‎firebase-common/data-collection-tests/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +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" package="com.google.firebase.datacollectiontests">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1717
<application>
1818
<meta-data android:name="firebase_data_collection_default_enabled"
1919
android:value="false" />

‎firebase-common/firebase-common.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ android {
2727
val minSdkVersion : Int by rootProject
2828

2929
compileSdk = targetSdkVersion
30+
namespace = "com.google.firebase"
3031
defaultConfig {
3132
minSdk = minSdkVersion
3233
targetSdk = targetSdkVersion

‎firebase-common/ktx/ktx.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ android {
2525
val targetSdkVersion : Int by rootProject
2626
val minSdkVersion : Int by rootProject
2727
compileSdk = targetSdkVersion
28+
namespace = "com.google.firebase.ktx"
2829
defaultConfig {
2930
minSdk = minSdkVersion
3031
targetSdk = targetSdkVersion

‎firebase-common/ktx/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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.google.firebase.ktx">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
54
<!--<uses-sdk android:minSdkVersion="14"/>-->
65
<application>

‎firebase-common/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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.google.firebase.test">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-sdk android:minSdkVersion="16" tools:overrideLibrary="com.google.firebase.auth"/>
76
<application>

‎firebase-common/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
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="com.google.firebase">
17+
xmlns:tools="http://schemas.android.com/tools">
1918
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
2019
<!--<uses-sdk android:minSdkVersion="14"/>-->
2120
<application>

‎firebase-common/src/test/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +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" package="com.google.firebase.tests">
16+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1717
<application>
1818

1919
<service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">

0 commit comments

Comments
 (0)