Skip to content

Commit 7f141d1

Browse files
ehsannasehsannas
authored
Merge branch 'master' into ehsann/in-expansion-2
2 parents 56344f9 + 6071e9d commit 7f141d1

File tree

54 files changed

+633
-342
lines changed

Some content is hidden

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

54 files changed

+633
-342
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck-safetynet/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

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

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

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ buildscript {
3939
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
4040
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
4141
classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
42-
classpath 'com.google.gms:google-services:4.3.3'
42+
classpath 'com.google.gms:google-services:4.3.15'
4343
classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
4444
}
4545
}
@@ -54,6 +54,7 @@ ext {
5454
robolectricVersion = libs.versions.robolectric.get()
5555
protocVersion = libs.versions.protoc.get()
5656
javaliteVersion = libs.versions.javalite.get()
57+
protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
5758
}
5859

5960
apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin

‎buildSrc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ dependencies {
6262
implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
6363

6464
implementation("com.google.code.gson:gson:2.8.9")
65-
implementation("com.android.tools.build:gradle:7.4.0")
66-
implementation("com.android.tools.build:builder-test-api:7.4.0")
65+
implementation("com.android.tools.build:gradle:7.2.2")
66+
implementation("com.android.tools.build:builder-test-api:7.2.2")
6767
implementation("gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9")
6868

6969
testImplementation("junit:junit:4.13.2")

‎buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.function.Consumer;
2424
import org.gradle.api.GradleException;
2525

26+
// TODO(b/267668143): With modernization efforts
2627
public class ShellExecutor {
2728
private final Runtime runtime;
2829
private final File cwd;

0 commit comments

Comments
 (0)