Skip to content

Commit c61d5c5

Browse files
mrobermrober
committed
Merge branch 'master' into firebase-sessions
2 parents e06b5ce + bbc9ca2 commit c61d5c5

File tree

156 files changed

+11935
-2739
lines changed

Some content is hidden

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

156 files changed

+11935
-2739
lines changed

‎.github/workflows/build-release-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Perform gradle build
2626
run: |
27-
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
27+
./gradlew firebasePublish
2828
2929
- name: Generate release notes
3030
run: |

‎.github/workflows/check-head-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414

1515
- name: Perform gradle build
1616
run: |
17-
./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
17+
./gradlew checkHeadDependencies

‎.github/workflows/create_releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
base: 'releases/${{ inputs.name }}'
4141
branch: 'releases/${{ inputs.name }}.release'
42-
add-paths: release.cfg
42+
add-paths: release.json,release_report.md
4343
title: '${{ inputs.name}} release'
4444
body: 'Auto-generated PR for release ${{ inputs.name}}'
4545
commit-message: 'Create release config for ${{ inputs.name }}'

‎.github/workflows/health-metrics.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ jobs:
9191
if: |
9292
(github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
9393
|| (github.event_name == 'pull_request'
94-
&& github.event.pull_request.head.repo.full_name == github.repository)
94+
&& github.event.pull_request.head.repo.full_name == github.repository
95+
&& github.event.pull_request.base.ref == 'master')
9596
runs-on: ubuntu-latest
9697
steps:
9798
- uses: actions/checkout@v3

‎.github/workflows/semver-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414

1515
- name: Perform gradle build
1616
run: |
17-
./gradlew semverCheckForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
17+
./gradlew semverCheckForRelease

‎.github/workflows/validate-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414

1515
- name: Perform gradle build
1616
run: |
17-
./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
17+
./gradlew validatePomForRelease

‎appcheck/firebase-appcheck-debug-testing/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# Unreleased
22

3+
# 17.0.0
4+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
5+
36
# 16.1.2
47
* [unchanged] Updated to keep [app_check] SDK versions aligned.
58

69
# 16.1.1
7-
* [changed] Integrated the [app_check] Debug Testing SDK with Firebase Components. (#4436)
10+
* [changed] Integrated the [app_check] Debug Testing SDK with Firebase
11+
components.
12+
(GitHub [#4436](//github.com/firebase/firebase-android-sdk/issues/4436){: .external})
813

914
# 16.1.0
1015
* [unchanged] Updated to accommodate the release of the updated

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies {
4949
implementation 'com.google.firebase:firebase-components:17.1.0'
5050
implementation project(':appcheck:firebase-appcheck')
5151
implementation project(':appcheck:firebase-appcheck-debug')
52-
implementation project(':appcheck:firebase-appcheck-interop')
52+
implementation 'com.google.firebase:firebase-appcheck-interop:17.0.0'
5353
implementation 'com.google.android.gms:play-services-base:18.0.1'
5454
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
5555
implementation 'androidx.test:core:1.2.0'

‎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=17.0.0
2-
latestReleasedVersion=16.1.2
1+
version=17.0.1
2+
latestReleasedVersion=17.0.0

‎appcheck/firebase-appcheck-debug/CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
# Unreleased
22

3+
# 17.0.0
4+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
5+
36
# 16.1.2
47
* [unchanged] Updated to keep [app_check] SDK versions aligned.
58

69
# 16.1.1
7-
* [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
8-
* [changed] Integrated the [app_check] Debug SDK with Firebase Components. (#4436)
9-
* [changed] Moved Task continuations off the main thread. (#4453)
10+
* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
11+
(GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}
12+
and
13+
[#4449](//github.com/firebase/firebase-android-sdk/issues/4449){: .external})
14+
15+
* [changed] Integrated the [app_check] Debug SDK with Firebase components.
16+
(GitHub [#4436](//github.com/firebase/firebase-android-sdk/issues/4436){: .external})
17+
18+
* [changed] Moved Task continuations off the main thread.
19+
(GitHub [#4453](//github.com/firebase/firebase-android-sdk/issues/4453){: .external})
1020

1121
# 16.1.0
1222
* [unchanged] Updated to accommodate the release of the updated

‎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=17.0.0
2-
latestReleasedVersion=16.1.2
1+
version=17.0.1
2+
latestReleasedVersion=17.0.0

‎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=17.0.0
2-
latestReleasedVersion=16.1.1
1+
version=17.0.1
2+
latestReleasedVersion=17.0.0

‎appcheck/firebase-appcheck-playintegrity/CHANGELOG.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
# Unreleased
22

3+
4+
# 17.0.0
5+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
6+
37
# 16.1.2
48
* [unchanged] Updated to keep [app_check] SDK versions aligned.
59

610
# 16.1.1
7-
* [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
8-
* [changed] Integrated the [app_check] Play Integrity SDK with Firebase Components. (#4436)
9-
* [changed] Moved Task continuations off the main thread. (#4453)
11+
* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
12+
(GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}
13+
and
14+
[#4449](//github.com/firebase/firebase-android-sdk/issues/4449){: .external})
15+
16+
* [changed] Integrated the [app_check] Play integrity SDK with Firebase
17+
components.
18+
(GitHub [#4436](//github.com/firebase/firebase-android-sdk/issues/4436){: .external})
19+
20+
* [changed] Moved Task continuations off the main thread.
21+
(GitHub [#4453](//github.com/firebase/firebase-android-sdk/issues/4453){: .external})
1022

1123
# 16.1.0
1224
* [unchanged] Updated to accommodate the release of the updated

‎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=17.0.0
2-
latestReleasedVersion=16.1.2
1+
version=17.0.1
2+
latestReleasedVersion=17.0.0

‎appcheck/firebase-appcheck/CHANGELOG.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
# Unreleased
2-
* [feature] Added `getLimtedUseAppCheckToken()` for obtaining limited-use tokens
3-
for protecting non-Firebase backends.
2+
3+
4+
# 17.0.0
5+
* [feature] Added [`getLimitedUseAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getLimitedUseAppCheckToken())
6+
for obtaining limited-use tokens for protecting non-Firebase backends.
7+
8+
9+
## Kotlin
10+
The Kotlin extensions library transitively includes the updated
11+
`firebase-appcheck` library. The Kotlin extensions library has no additional
12+
updates.
413

514
# 16.1.2
615
* [unchanged] Updated to keep [app_check] SDK versions aligned.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
implementation 'com.google.firebase:firebase-annotations:16.2.0'
4747
implementation 'com.google.firebase:firebase-common:20.3.1'
4848
implementation 'com.google.firebase:firebase-components:17.1.0'
49-
implementation project(':appcheck:firebase-appcheck-interop')
49+
implementation 'com.google.firebase:firebase-appcheck-interop:17.0.0'
5050
implementation 'com.google.android.gms:play-services-base:18.0.1'
5151
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
5252

‎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=17.0.0
2-
latestReleasedVersion=16.1.2
1+
version=17.0.1
2+
latestReleasedVersion=17.0.0

‎build.gradle

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

15-
import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
16-
import com.google.firebase.gradle.MultiProjectReleasePlugin
17-
1815
buildscript {
1916
// TODO: remove once all sdks have migrated to version catalog
2017
ext.kotlinVersion = libs.versions.kotlin.get()
@@ -58,11 +55,10 @@ ext {
5855
protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
5956
}
6057

61-
apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin
6258
apply plugin: com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin
6359
apply plugin: com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin
6460

65-
apply plugin: MultiProjectReleasePlugin
61+
apply plugin: com.google.firebase.gradle.plugins.PublishingPlugin
6662

6763
firebaseContinuousIntegration {
6864
ignorePaths = [

‎buildSrc/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
plugins {
1616
id("com.ncorti.ktfmt.gradle") version "0.11.0"
1717
id("com.github.sherter.google-java-format") version "0.9"
18+
kotlin("plugin.serialization") version "1.7.10"
1819
`kotlin-dsl`
1920
}
2021

@@ -67,6 +68,7 @@ dependencies {
6768

6869
implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
6970

71+
implementation(libs.kotlinx.serialization.json)
7072
implementation("com.google.code.gson:gson:2.8.9")
7173
implementation("com.android.tools.build:gradle:7.2.2")
7274
implementation("com.android.tools.build:builder-test-api:7.2.2")
@@ -90,7 +92,7 @@ gradlePlugin {
9092
}
9193
register("publishingPlugin") {
9294
id = "PublishingPlugin"
93-
implementationClass = "com.google.firebase.gradle.plugins.publish.PublishingPlugin"
95+
implementationClass = "com.google.firebase.gradle.plugins.PublishingPlugin"
9496
}
9597
register("firebaseLibraryPlugin") {
9698
id = "firebase-library"

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

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎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)