Skip to content

Commit 35e7e74

Browse files
authored
Merge branch 'main' into dependabot/gradle/glide-4.16.0
2 parents 8597888 + 5aff679 commit 35e7e74

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

ci/fireci/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies = [
1414
"pandas==1.5.3",
1515
"PyGithub==1.58.2",
1616
"pystache==0.6.0",
17-
"requests==2.31.0",
17+
"requests==2.32.2",
1818
"seaborn==0.12.2",
1919
"PyYAML==6.0.1",
2020
"termcolor==2.4.0",

firebase-config/bandwagoner/src/main/AndroidManifest.xml

+18-19
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717

1818
<!-- The first number in the version name distinguishes this as the 3P app version. -->
1919
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
20-
package="com.googletest.firebase.remoteconfig.bandwagoner"
21-
android:versionCode="1"
22-
android:versionName="3.0.0">
20+
android:versionCode="1"
21+
android:versionName="3.0.0">
2322

2423

2524
<!--Needed for Firebase Installations getToken method.-->
@@ -30,22 +29,22 @@
3029
<uses-permission android:name="android.permission.WAKE_LOCK"/>
3130

3231
<application
33-
android:name=".MainApplication"
34-
android:label="Bandwagoner"
35-
android:theme="@style/LightNoActionBarTheme">
36-
37-
<activity android:exported="true" android:name=".MainActivity">
38-
<intent-filter>
39-
<action android:name="android.intent.action.MAIN" />
40-
<category android:name="android.intent.category.LAUNCHER" />
41-
</intent-filter>
42-
</activity>
43-
44-
<service android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
45-
<meta-data
46-
android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar"
47-
android:value="com.google.firebase.components.ComponentRegistrar"/>
48-
</service>
32+
android:name=".MainApplication"
33+
android:label="Bandwagoner"
34+
android:theme="@style/LightNoActionBarTheme">
35+
36+
<activity android:exported="true" android:name=".MainActivity">
37+
<intent-filter>
38+
<action android:name="android.intent.action.MAIN" />
39+
<category android:name="android.intent.category.LAUNCHER" />
40+
</intent-filter>
41+
</activity>
42+
43+
<service android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
44+
<meta-data
45+
android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar"
46+
android:value="com.google.firebase.components.ComponentRegistrar"/>
47+
</service>
4948

5049
</application>
5150

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ hamcrest = "2.2"
3737
hamcrestJunit = "2.0.0.0"
3838
hamcrestLibrary = "2.2"
3939
httpclientAndroid = "4.3.5.1"
40-
integrity = "1.2.0"
40+
integrity = "1.4.0"
4141
jacksonCore = "2.13.1"
4242
jacksonDatabind = "2.18.2"
4343
javalite = "3.25.5"

0 commit comments

Comments
 (0)