Skip to content

Commit cb2c8ee

Browse files
authored
Merge cc09fdb into 6c391a2
2 parents 6c391a2 + cc09fdb commit cb2c8ee

File tree

249 files changed

+8173
-2009
lines changed

Some content is hidden

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

249 files changed

+8173
-2009
lines changed

.github/workflows/create_releases.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Create release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
name:
7+
description: 'Release name'
8+
required: true
9+
type: string
10+
11+
jobs:
12+
create-branches:
13+
runs-on: ubuntu-latest
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
steps:
17+
- name: Create base branch
18+
uses: peterjgrainger/[email protected]
19+
with:
20+
branch: '${{ inputs.name }}'
21+
- name: Create release branch
22+
uses: peterjgrainger/[email protected]
23+
with:
24+
branch: '${{ inputs.name }}.release'
25+
26+
create-pull-request:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v3
30+
31+
- name: Create release configuration template
32+
run: |
33+
git config user.name 'Create Release GA'
34+
git config user.email '[email protected]'
35+
echo "[release]" > release.cfg
36+
echo "name = ${{ inputs.name }}" >> release.cfg
37+
echo "mode = RELEASE" >> release.cfg
38+
echo "" >> release.cfg
39+
echo "[modules]" >> release.cfg
40+
echo "" >> release.cfg
41+
git add release.cfg
42+
git commit -a -m 'Create release config'
43+
44+
- name: Create Pull Request
45+
uses: peter-evans/create-pull-request@v4
46+
with:
47+
base: '${{ inputs.name }}'
48+
branch: '${{ inputs.name }}.release'
49+
title: '${{ inputs.name}} release'
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Unreleased
2+
3+
# 16.1.0
4+
* [unchanged] Updated to accommodate the release of the updated
5+
[app_check] Kotlin extensions library.
6+
7+
# 16.0.1
8+
* [changed] Updated dependency of `play-services-basement` to its latest
9+
version (v18.1.0).
10+
11+
# 16.0.0
12+
* [changed] [app_check] has exited beta and is now generally available for
13+
use.
14+
15+
# 16.0.0-beta06
16+
* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
17+
custom provider.
18+
19+
# 16.0.0-beta05
20+
* [changed] Internal improvements.
21+
22+
# 16.0.0-beta04
23+
* [changed] Improved error handling logic by minimizing the amount of requests
24+
that are unlikely to succeed.
25+
26+
* [fixed] Fixed heartbeat reporting.
27+
28+
# 16.0.0-beta03
29+
* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
30+
[app_check] network calls.
31+
32+
# 16.0.0-beta02
33+
* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
34+
[`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
35+
and associated setters and removers for developers to request and observe
36+
changes to the [app_check] token.
37+
38+
# 16.0.0-beta01
39+
* [feature] Initial beta release of the [app_check] Debug Testing SDK with
40+
abuse reduction features.
41+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.2
2-
latestReleasedVersion=16.0.1
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Unreleased
2+
3+
# 16.1.0
4+
* [unchanged] Updated to accommodate the release of the updated
5+
[app_check] Kotlin extensions library.
6+
7+
# 16.0.1
8+
* [changed] Updated dependency of `play-services-basement` to its latest
9+
version (v18.1.0).
10+
11+
# 16.0.0
12+
* [changed] [app_check] has exited beta and is now generally available for
13+
use.
14+
15+
# 16.0.0-beta06
16+
* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
17+
custom provider.
18+
19+
# 16.0.0-beta05
20+
* [changed] Internal improvements.
21+
22+
# 16.0.0-beta04
23+
* [changed] Improved error handling logic by minimizing the amount of requests
24+
that are unlikely to succeed.
25+
26+
* [fixed] Fixed heartbeat reporting.
27+
28+
# 16.0.0-beta03
29+
* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
30+
[app_check] network calls.
31+
32+
# 16.0.0-beta02
33+
* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
34+
[`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
35+
and associated setters and removers for developers to request and observe
36+
changes to the [app_check] token.
37+
38+
# 16.0.0-beta01
39+
* [feature] Initial beta release of the [app_check] Debug SDK with abuse
40+
reduction features.
41+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.2
2-
latestReleasedVersion=16.0.1
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
*/
3030
@KeepForSdk
3131
public class FirebaseAppCheckDebugRegistrar implements ComponentRegistrar {
32+
private static final String LIBRARY_NAME = "fire-app-check-debug";
3233

3334
@Override
3435
public List<Component<?>> getComponents() {
35-
return Arrays.asList(
36-
LibraryVersionComponent.create("fire-app-check-debug", BuildConfig.VERSION_NAME));
36+
return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
3737
}
3838
}

appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
import org.mockito.MockitoAnnotations;
4444
import org.robolectric.RobolectricTestRunner;
4545
import org.robolectric.annotation.Config;
46+
import org.robolectric.annotation.LooperMode;
4647

4748
/** Tests for {@link DebugAppCheckProvider}. */
4849
@RunWith(RobolectricTestRunner.class)
4950
@Config(manifest = Config.NONE)
51+
@LooperMode(LooperMode.Mode.LEGACY)
5052
public class DebugAppCheckProviderTest {
5153

5254
private static final String DEBUG_SECRET = "debugSecret";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.2
2-
latestReleasedVersion=16.0.1
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Unreleased
2+
3+
# 16.1.0
4+
* [unchanged] Updated to accommodate the release of the updated
5+
[app_check] Kotlin extensions library.
6+
7+
# 16.0.1
8+
* [changed] Updated dependency of `play-services-basement` to its latest
9+
version (v18.1.0).
10+
11+
# 16.0.0
12+
* [feature] Added support for
13+
[Play Integrity](https://developer.android.com/google/play/integrity) as an
14+
attestation provider.
15+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.2
2-
latestReleasedVersion=16.0.1
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
*/
3030
@KeepForSdk
3131
public class FirebaseAppCheckPlayIntegrityRegistrar implements ComponentRegistrar {
32+
private static final String LIBRARY_NAME = "fire-app-check-play-integrity";
3233

3334
@Override
3435
public List<Component<?>> getComponents() {
35-
return Arrays.asList(
36-
LibraryVersionComponent.create("fire-app-check-play-integrity", BuildConfig.VERSION_NAME));
36+
return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
3737
}
3838
}

appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProviderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@
4747
import org.mockito.MockitoAnnotations;
4848
import org.robolectric.RobolectricTestRunner;
4949
import org.robolectric.annotation.Config;
50+
import org.robolectric.annotation.LooperMode;
5051

5152
/** Tests for {@link PlayIntegrityAppCheckProvider}. */
5253
@RunWith(RobolectricTestRunner.class)
5354
@Config(manifest = Config.NONE)
55+
@LooperMode(LooperMode.Mode.LEGACY)
5456
public class PlayIntegrityAppCheckProviderTest {
5557

5658
private static final String PROJECT_NUMBER = "123456";
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Unreleased
2+
3+
# 16.1.0
4+
* [unchanged] Updated to accommodate the release of the updated
5+
[app_check] Kotlin extensions library.
6+
7+
# 16.0.1
8+
* [changed] Updated dependency of `play-services-basement` to its latest
9+
version (v18.1.0).
10+
11+
# 16.0.0
12+
* [changed] [app_check] has exited beta and is now generally available for
13+
use.
14+
15+
# 16.0.0-beta06
16+
* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
17+
custom provider.
18+
19+
# 16.0.0-beta05
20+
* [changed] Internal improvements.
21+
22+
# 16.0.0-beta04
23+
* [changed] Improved error handling logic by minimizing the amount of requests
24+
that are unlikely to succeed.
25+
26+
* [fixed] Fixed heartbeat reporting.
27+
28+
# 16.0.0-beta03
29+
* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
30+
[app_check] network calls.
31+
32+
# 16.0.0-beta02
33+
* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
34+
[`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
35+
and associated setters and removers for developers to request and observe
36+
changes to the [app_check] token.
37+
38+
# 16.0.0-beta01
39+
* [feature] Initial beta release of the [app_check] SafetyNet SDK with abuse
40+
reduction features.
41+
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
version=16.0.2
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/FirebaseAppCheckSafetyNetRegistrar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
*/
3030
@KeepForSdk
3131
public class FirebaseAppCheckSafetyNetRegistrar implements ComponentRegistrar {
32+
private static final String LIBRARY_NAME = "fire-app-check-safety-net";
3233

3334
@Override
3435
public List<Component<?>> getComponents() {
35-
return Arrays.asList(
36-
LibraryVersionComponent.create("fire-app-check-safety-net", BuildConfig.VERSION_NAME));
36+
return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
3737
}
3838
}

appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
/**
2424
* Implementation of an {@link AppCheckProviderFactory} that builds {@link
2525
* SafetyNetAppCheckProvider}s. This is the default implementation.
26+
*
27+
* @deprecated Use {@code PlayIntegrityAppCheckProviderFactory} instead.
2628
*/
29+
@Deprecated
2730
public class SafetyNetAppCheckProviderFactory implements AppCheckProviderFactory {
2831

2932
private static final SafetyNetAppCheckProviderFactory instance =
@@ -34,7 +37,10 @@ private SafetyNetAppCheckProviderFactory() {}
3437
/**
3538
* Gets an instance of this class for installation into a {@link
3639
* com.google.firebase.appcheck.FirebaseAppCheck} instance.
40+
*
41+
* @deprecated Use {@code PlayIntegrityAppCheckProviderFactory#getInstance} instead.
3742
*/
43+
@Deprecated
3844
@NonNull
3945
public static SafetyNetAppCheckProviderFactory getInstance() {
4046
return instance;

appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@
4646
import org.mockito.MockitoAnnotations;
4747
import org.robolectric.RobolectricTestRunner;
4848
import org.robolectric.annotation.Config;
49+
import org.robolectric.annotation.LooperMode;
4950

5051
/** Tests for {@link SafetyNetAppCheckProvider}. */
5152
@RunWith(RobolectricTestRunner.class)
5253
@Config(manifest = Config.NONE)
54+
@LooperMode(LooperMode.Mode.LEGACY)
5355
public class SafetyNetAppCheckProviderTest {
5456

5557
private static final String API_KEY = "apiKey";
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Unreleased
2+
3+
# 16.1.0
4+
* [unchanged] Updated to accommodate the release of the updated
5+
[app_check] Kotlin extensions library.
6+
7+
8+
## Kotlin
9+
The Kotlin extensions library transitively includes the updated
10+
`firebase-appcheck` library. The Kotlin extensions library has the following
11+
additional updates:
12+
13+
* [feature] Firebase now supports Kotlin coroutines.
14+
With this release, we added
15+
[`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
16+
to `firebase-appcheck-ktx` as a transitive dependency, which exposes the
17+
`Task<T>.await()` suspend function to convert a
18+
[`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
19+
coroutine.
20+
21+
# 16.0.1
22+
* [changed] Updated dependency of `play-services-basement` to its latest
23+
version (v18.1.0).
24+
25+
# 16.0.0
26+
* [changed] [app_check] has exited beta and is now generally available for
27+
use.
28+
29+
* [feature] Added support for
30+
[Play Integrity](https://developer.android.com/google/play/integrity) as an
31+
attestation provider.
32+
33+
# 16.0.0-beta06
34+
* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
35+
custom provider.
36+
37+
# 16.0.0-beta05
38+
* [changed] Internal improvements.
39+
40+
# 16.0.0-beta04
41+
* [changed] Improved error handling logic by minimizing the amount of requests
42+
that are unlikely to succeed.
43+
44+
* [fixed] Fixed heartbeat reporting.
45+
46+
# 16.0.0-beta03
47+
* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
48+
[app_check] network calls.
49+
50+
# 16.0.0-beta02
51+
* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
52+
[`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
53+
and associated setters and removers for developers to request and observe
54+
changes to the [app_check] token.
55+
56+
# 16.0.0-beta01
57+
* [feature] Initial beta release of the [app_check] SDK with abuse reduction
58+
features.
59+

appcheck/firebase-appcheck/firebase-appcheck.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,14 @@ dependencies {
5656
testImplementation "com.google.truth:truth:$googleTruthVersion"
5757
testImplementation 'androidx.test:core:1.2.0'
5858
testImplementation 'androidx.test:rules:1.2.0'
59+
60+
androidTestImplementation project(':appcheck:firebase-appcheck')
61+
androidTestImplementation project(':integ-testing')
62+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
63+
androidTestImplementation 'androidx.test:runner:1.2.0'
64+
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
65+
androidTestImplementation 'junit:junit:4.12'
66+
androidTestImplementation "androidx.annotation:annotation:1.0.0"
67+
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
68+
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
5969
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.0.2
2-
latestReleasedVersion=16.0.1
1+
version=16.1.1
2+
latestReleasedVersion=16.1.0

0 commit comments

Comments
 (0)