Skip to content

Commit 08a19a8

Browse files
davidmotsondavidmotson
authored
Merge branch 'master' into davidmotson.release_job_fix
2 parents 2522c35 + 658fc46 commit 08a19a8

File tree

114 files changed

+11566
-818
lines changed

Some content is hidden

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

114 files changed

+11566
-818
lines changed

‎.github/workflows/api-information.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fetch-depth: 2
1313
submodules: true
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
java-version: 11
1818
distribution: temurin

‎.github/workflows/build-src-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/[email protected]
1717
- name: Set up JDK 11
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v3
1919
with:
2020
java-version: 11
2121
distribution: temurin

‎.github/workflows/ci_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
submodules: true
2323

2424
- name: Set up JDK 11
25-
uses: actions/setup-java@v2
25+
uses: actions/setup-java@v3
2626
with:
2727
java-version: 11
2828
distribution: temurin
@@ -50,7 +50,7 @@ jobs:
5050
submodules: true
5151

5252
- name: Set up JDK 11
53-
uses: actions/setup-java@v2
53+
uses: actions/setup-java@v3
5454
with:
5555
java-version: 11
5656
distribution: temurin
@@ -100,7 +100,7 @@ jobs:
100100
submodules: true
101101

102102
- name: Set up JDK 11
103-
uses: actions/setup-java@v2
103+
uses: actions/setup-java@v3
104104
with:
105105
java-version: 11
106106
distribution: temurin

‎.github/workflows/fireperf-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
2929
path: firebase-android-buildtools
3030
- name: Set up JDK 11
31-
uses: actions/setup-java@v2
31+
uses: actions/setup-java@v3
3232
with:
3333
java-version: 11
3434
distribution: temurin

‎.github/workflows/health-metrics.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 2
3030
submodules: true
3131
- name: Set up JDK 11
32-
uses: actions/setup-java@v2
32+
uses: actions/setup-java@v3
3333
with:
3434
java-version: 11
3535
distribution: temurin
@@ -64,7 +64,7 @@ jobs:
6464
fetch-depth: 2
6565
submodules: true
6666
- name: Set up JDK 11
67-
uses: actions/setup-java@v2
67+
uses: actions/setup-java@v3
6868
with:
6969
java-version: 11
7070
distribution: temurin
@@ -99,7 +99,7 @@ jobs:
9999
fetch-depth: 2
100100
submodules: true
101101
- name: Set up JDK 11
102-
uses: actions/setup-java@v2
102+
uses: actions/setup-java@v3
103103
with:
104104
java-version: 11
105105
distribution: temurin

‎.github/workflows/make-bom.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
python-version: '3.10'
1414
- uses: actions/[email protected]
1515
- name: Set up JDK 11
16-
uses: actions/setup-java@v2
16+
uses: actions/setup-java@v3
1717
with:
1818
java-version: 11
1919
distribution: temurin

‎.github/workflows/smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fetch-depth: 2
1313
submodules: true
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
java-version: 11
1818
distribution: temurin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.3
1+
version=17.0.0
22
latestReleasedVersion=16.1.2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.3
1+
version=17.0.0
22
latestReleasedVersion=16.1.2

‎appcheck/firebase-appcheck-interop/api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.google.firebase.appcheck {
33

44
public abstract class AppCheckTokenResult {
55
ctor public AppCheckTokenResult();
6-
method @Nullable public abstract com.google.firebase.FirebaseException getError();
6+
method @Nullable public abstract Exception getError();
77
method @NonNull public abstract String getToken();
88
}
99

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation 'com.google.firebase:firebase-common:20.3.1'
46-
implementation 'com.google.firebase:firebase-components:17.1.0'
4745
implementation 'com.google.android.gms:play-services-base:18.0.1'
4846
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
4947

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.2
1+
version=17.0.0
22
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616

1717
import androidx.annotation.NonNull;
1818
import androidx.annotation.Nullable;
19-
import com.google.firebase.FirebaseException;
2019

2120
/**
2221
* Class to hold the result emitted by a Firebase App Check service application verification
2322
* attempt. The result will always contain a token, which will either be a valid raw JWT attesting
24-
* application identity, or a dummy value. The result may optionally contain a {@link
25-
* FirebaseException} if application verification does not succeed.
23+
* application identity, or a dummy value. The result may optionally contain an {@link Exception} if
24+
* application verification does not succeed.
2625
*/
2726
public abstract class AppCheckTokenResult {
2827

@@ -34,9 +33,9 @@ public abstract class AppCheckTokenResult {
3433
public abstract String getToken();
3534

3635
/**
37-
* Returns the {@link FirebaseException} if the {@link
38-
* com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider} failed to obtain a token.
36+
* Returns the {@link Exception} if the {@link
37+
* com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider} failed to obtain a token.
3938
*/
4039
@Nullable
41-
public abstract FirebaseException getError();
40+
public abstract Exception getError();
4241
}

‎appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java renamed to ‎appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.google.firebase.appcheck.AppCheckTokenResult;
2020

2121
/** @hide */
22-
public interface InternalAppCheckTokenProvider {
22+
public interface InteropAppCheckTokenProvider {
2323

2424
/**
2525
* Requests an {@link AppCheckTokenResult} from the installed {@code AppCheckFactory}. This will

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.3
1+
version=17.0.0
22
latestReleasedVersion=16.1.2

‎appcheck/firebase-appcheck/api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package com.google.firebase.appcheck {
1515
method @NonNull public abstract String getToken();
1616
}
1717

18-
public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider {
18+
public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider {
1919
ctor public FirebaseAppCheck();
2020
method public abstract void addAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
2121
method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);

‎appcheck/firebase-appcheck/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.3
1+
version=17.0.0
22
latestReleasedVersion=16.1.2

‎appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import androidx.test.ext.junit.runners.AndroidJUnit4;
1919
import com.google.firebase.FirebaseApp;
2020
import com.google.firebase.FirebaseOptions;
21-
import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
21+
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
2222
import com.google.firebase.testing.integ.StrictModeRule;
2323
import org.junit.Rule;
2424
import org.junit.Test;
@@ -43,7 +43,7 @@ public void initializingFirebaseAppcheck_shouldNotViolateStrictMode() {
4343
.build(),
4444
"hello");
4545
app.get(FirebaseAppCheck.class);
46-
app.get(InternalAppCheckTokenProvider.class);
46+
app.get(InteropAppCheckTokenProvider.class);
4747
});
4848
}
4949
}

‎appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.google.android.gms.tasks.Task;
2020
import com.google.firebase.FirebaseApp;
2121
import com.google.firebase.appcheck.interop.AppCheckTokenListener;
22-
import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
22+
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
2323

24-
public abstract class FirebaseAppCheck implements InternalAppCheckTokenProvider {
24+
public abstract class FirebaseAppCheck implements InteropAppCheckTokenProvider {
2525

2626
/** Gets the default instance of {@code FirebaseAppCheck}. */
2727
@NonNull

‎appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.firebase.annotations.concurrent.Lightweight;
2222
import com.google.firebase.annotations.concurrent.UiThread;
2323
import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
24-
import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
24+
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
2525
import com.google.firebase.components.Component;
2626
import com.google.firebase.components.ComponentRegistrar;
2727
import com.google.firebase.components.Dependency;
@@ -53,7 +53,7 @@ public List<Component<?>> getComponents() {
5353
Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
5454

5555
return Arrays.asList(
56-
Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
56+
Component.builder(FirebaseAppCheck.class, (InteropAppCheckTokenProvider.class))
5757
.name(LIBRARY_NAME)
5858
.add(Dependency.required(FirebaseApp.class))
5959
.add(Dependency.required(uiExecutor))

‎appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public String getToken() {
5858

5959
@Nullable
6060
@Override
61-
public FirebaseException getError() {
61+
public Exception getError() {
6262
return error;
6363
}
6464
}

‎buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
*/
5050
public class MultiProjectReleasePlugin implements Plugin<Project> {
5151

52+
// TODO() - Will be removed once migrated to Kotlin
53+
private static String findStringProperty(Project p, String property) {
54+
Object value = p.findProperty(property);
55+
return value != null ? value.toString() : null;
56+
}
57+
5258
@Override
5359
public void apply(Project project) {
5460
project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));
@@ -73,10 +79,10 @@ public void apply(Project project) {
7379
ReleaseGenerator.class,
7480
task -> {
7581
task.getCurrentRelease()
76-
.convention(project.property("currentRelease").toString());
77-
task.getPastRelease().convention(project.property("pastRelease").toString());
82+
.convention(findStringProperty(project, "currentRelease"));
83+
task.getPastRelease().convention(findStringProperty(project, "pastRelease"));
7884
task.getPrintReleaseConfig()
79-
.convention(project.property("printOutput").toString());
85+
.convention(findStringProperty(project, "printOutput"));
8086
task.getReleaseConfigFile()
8187
.convention(project.getLayout().getBuildDirectory().file("release.cfg"));
8288
task.getReleaseReportFile()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public class BomGeneratorTask extends DefaultTask {
5656
"com.google.firebase:firebase-appcheck-debug-testing",
5757
"com.google.firebase:firebase-appcheck-ktx",
5858
"com.google.firebase:firebase-appcheck-playintegrity",
59-
"com.google.firebase:firebase-appcheck-safetynet",
6059
"com.google.firebase:firebase-appcheck",
6160
"com.google.firebase:firebase-auth",
6261
"com.google.firebase:firebase-auth-ktx",
@@ -104,6 +103,7 @@ public class BomGeneratorTask extends DefaultTask {
104103
"firebase-analytics-license",
105104
"firebase-annotations",
106105
"firebase-appcheck-interop",
106+
"firebase-appcheck-safetynet",
107107
"firebase-appdistribution-gradle",
108108
"firebase-appindexing-license",
109109
"firebase-appindexing",

0 commit comments

Comments
 (0)