Skip to content

Commit 9a15c5f

Browse files
davidmotsondavidmotson
authored
Merge branch 'master' into davidmotson.project_dep_release
2 parents 24d3dc5 + d4a56bb commit 9a15c5f

File tree

15 files changed

+146
-81
lines changed

15 files changed

+146
-81
lines changed

‎buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import java.io.File
2727
import org.gradle.api.JavaVersion
2828
import org.gradle.api.Project
2929
import org.gradle.api.attributes.Attribute
30+
import org.gradle.api.publish.tasks.GenerateModuleMetadata
3031
import org.gradle.api.tasks.Copy
3132
import org.gradle.kotlin.dsl.apply
3233
import org.gradle.kotlin.dsl.create
@@ -178,6 +179,7 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
178179
android: LibraryExtension
179180
) {
180181
android.publishing.singleVariant("release") { withSourcesJar() }
182+
project.tasks.withType<GenerateModuleMetadata> { isEnabled = false }
181183

182184
configurePublishing(project, firebaseLibrary)
183185
}

‎buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import org.gradle.kotlin.dsl.register
6161
* - [PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK][registerPublishReleasingLibrariesToMavenLocalTask]
6262
* - [SEMVER_CHECK_TASK][registerSemverCheckForReleaseTask]
6363
* - [PUBLISH_ALL_TO_BUILD_TASK][registerPublishAllToBuildDir]
64+
* - [LIBRARY_GROUPS_TASK][registerLibraryGroupsTask]
6465
*
6566
* Additionally, this plugin registers the [PostReleasePlugin] via [registerPostReleasePlugin] for
6667
* each releasing library.
@@ -105,7 +106,7 @@ abstract class PublishingPlugin : Plugin<Project> {
105106
registerSemverCheckForReleaseTask(project, releasingProjects)
106107
registerPublishAllToBuildDir(project, allFirebaseLibraries)
107108
registerPostReleasePlugin(releasingProjects)
108-
registerLibraryGroupsTaks(project, libraryGroups)
109+
registerLibraryGroupsTask(project, libraryGroups)
109110

110111
val buildMavenZip =
111112
project.tasks.register<Zip>(BUILD_MAVEN_ZIP_TASK) {
@@ -155,11 +156,11 @@ abstract class PublishingPlugin : Plugin<Project> {
155156
}
156157
}
157158

158-
protected fun registerLibraryGroupsTaks(
159+
private fun registerLibraryGroupsTask(
159160
project: Project,
160161
libraryGroups: Map<String, List<FirebaseLibraryExtension>>
161162
) {
162-
project.tasks.register("libraryGroups") {
163+
project.tasks.register(LIBRARY_GROUPS_TASK) {
163164
for (libraryGroup in libraryGroups) {
164165
println(
165166
"${libraryGroup.key} -> ${libraryGroup.value.joinToString(" | ") { it.artifactName }}"
@@ -555,6 +556,7 @@ abstract class PublishingPlugin : Plugin<Project> {
555556
const val SEMVER_CHECK_TASK = "semverCheckForRelease"
556557
const val RELEASE_GENEATOR_TASK = "generateReleaseConfig"
557558
const val VALIDATE_POM_TASK = "validatePomForRelease"
559+
const val LIBRARY_GROUPS_TASK = "libraryGroups"
558560
const val PUBLISH_RELEASING_LIBS_TO_BUILD_TASK = "publishReleasingLibrariesToBuildDir"
559561
const val PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK = "publishReleasingLibrariesToMavenLocal"
560562
const val GENERATE_KOTLINDOC_FOR_RELEASE_TASK = "generateKotlindocForRelease"

‎firebase-components/CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unreleased
2-
* [changed] Internal changes to ensure only one interface is provided for
3-
kotlinx.coroutines.CoroutineDispatcher interfaces when both firebase-common and
4-
firebase-common-ktx provide them.
5-
62

73

4+
# 17.1.2
5+
* [changed] Internal changes to ensure only one interface is provided for
6+
kotlinx.coroutines.CoroutineDispatcher interfaces when both firebase-common and
7+
firebase-common-ktx provide them.

‎firebase-components/gradle.properties

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

15-
version=17.1.1
15+
version=17.1.3
1616
latestReleasedVersion=17.1.0

‎firebase-crashlytics-ndk/CHANGELOG.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
# Unreleased
2+
3+
4+
# 18.4.3
5+
* [changed] Updated `firebase-crashlytics` dependency to v18.4.3
6+
7+
# 18.4.2
28
* [changed] Updated `firebase-crashlytics` dependency to v18.4.2
39

410
# 18.4.1
@@ -16,8 +22,8 @@
1622
# 18.3.5
1723
* [fixed] Updated `firebase-common` to its latest version (v20.3.0) to fix an
1824
issue that was causing a nondeterministic crash on startup.
19-
2025
* [changed] Updated `firebase-crashlytics` dependency to v18.3.5.
26+
2127
# 18.3.4
2228
<aside class="caution">This version of <code>firebase-crashlytics-ndk</code> can
2329
cause a nondeterministic crash on startup. For more information, see
@@ -78,27 +84,23 @@ using the latest version of the SDK (v18.3.1+ or [bom] v31.0.1+).**
7884
change, disabling tagged pointers is no longer required, so the following can
7985
be removed from your manifest's `application` tag:
8086
`android:allowNativeHeapPointerTagging=false`.
81-
8287
* [changed] Updated `firebase-crashlytics` dependency to v18.2.6.
8388

8489
# 18.2.5
8590
* [changed] Internal improvements to [crashlytics] file management, to
8691
ensure consistent creation and removal of intermediate [crashlytics] files.
87-
8892
* [changed] Updated `firebase-crashlytics` dependency to v18.2.5.
8993

9094
# 18.2.4
9195
* [changed] Added an obfuscation exclusion for
9296
`com.google.firebase.crashlytics.ndk.FirebaseCrashlyticsNdk` to the Proguard
9397
configuration for this AAR, to avoid potential reflection errors when
9498
obfuscating NDK-enabled apps.
95-
9699
* [changed] Updated `firebase-crashlytics` dependency to v18.2.4.
97100

98101
# 18.2.3
99102
* [changed] Internal changes to support upcoming Unity crash reporting
100103
improvements.
101-
102104
* [changed] Updated `firebase-crashlytics` dependency to v18.2.3.
103105

104106
# 18.2.1
@@ -108,7 +110,6 @@ using the latest version of the SDK (v18.3.1+ or [bom] v31.0.1+).**
108110
module to consistently report native crashes for all supported Android
109111
versions. [crashlytics] will now report native crashes when used as a
110112
dependency of a feature module.
111-
112113
* [changed] Updated `firebase-crashlytics` dependency to v18.2.1.
113114

114115
# 18.2.0
@@ -124,7 +125,6 @@ using the latest version of the SDK (v18.3.1+ or [bom] v31.0.1+).**
124125

125126
# 18.0.0
126127
* [changed] Internal changes to support dynamic feature modules.
127-
128128
* [changed] Updated `firebase-crashlytics` dependency to v18.0.0.
129129

130130
# 17.4.1
@@ -153,7 +153,6 @@ using this version of the [crashlytics] NDK SDK and above.
153153
# 17.2.1
154154
* [fixed] Fixed signal handler to properly release storage on app exit.
155155
([Github Issue #1749](https://github.com/firebase/firebase-android-sdk/issues/1749))
156-
157156
* [changed] Updated `firebase-crashlytics` dependency to v17.2.1.
158157

159158
# 17.1.1
@@ -168,7 +167,6 @@ using this version of the [crashlytics] NDK SDK and above.
168167
# 17.0.0
169168
* [changed] The [firebase_crashlytics] SDK for NDK is now generally
170169
available.
171-
172170
* [changed] Updated `firebase-crashlytics` dependency to v17.0.0.
173171

174172
# 17.0.0-beta04
@@ -177,11 +175,8 @@ using this version of the [crashlytics] NDK SDK and above.
177175
# 17.0.0-beta03
178176
* [fixed] Updated package name in `AndroidManifest.xml` to reflect new
179177
[firebase_crashlytics] NDK package name.
180-
181178
* [changed] Improved debug logging.
182-
183179
* [changed] Released new `crashlytics.h` with updated C++ APIs.
184-
185180
* [changed] Added ProGuard rules files to avoid obfuscating public APIs called
186181
from C++.
187182

@@ -216,3 +211,4 @@ change. The following release notes describe changes in the new SDK.
216211
uploading symbol files to [crashlytics] servers. See the
217212
[[crashlytics] Gradle plugin documentation](/docs/crashlytics/ndk-reports-new-sdk)
218213
for more information.
214+

‎firebase-crashlytics-ndk/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=18.4.2
1+
version=18.4.4
22
latestReleasedVersion=18.4.1

‎firebase-crashlytics/CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
11
# Unreleased
2+
3+
4+
# 18.4.3
5+
* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions library. [#5337]
6+
7+
8+
## Kotlin
9+
The Kotlin extensions library transitively includes the updated
10+
`firebase-crashlytics` library. The Kotlin extensions library has no additional
11+
updates.
12+
13+
# 18.4.2
214
* [feature] Expanded `firebase-sessions` library integration to work with NDK crashes and ANRs.
315
* [changed] Improved reliability when reporting memory usage.
416

17+
18+
## Kotlin
19+
The Kotlin extensions library transitively includes the updated
20+
`firebase-crashlytics` library. The Kotlin extensions library has no additional
21+
updates.
22+
523
# 18.4.1
624
* [changed] Updated `firebase-sessions` dependency to v1.0.2
725

826
# 18.4.0
927
* [feature] Integrated with Firebase sessions library to enable upcoming features related to
1028
session-based crash metrics.
1129

30+
1231
## Kotlin
1332
The Kotlin extensions library transitively includes the updated
1433
`firebase-crashlytics` library. The Kotlin extensions library has no additional
@@ -482,3 +501,4 @@ The following release notes describe changes in the new SDK.
482501
from your `AndroidManifest.xml` file.
483502
* [removed] The `fabric.properties` and `crashlytics.properties` files are no
484503
longer supported. Remove them from your app.
504+

‎firebase-crashlytics/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=18.4.2
1+
version=18.4.4
22
latestReleasedVersion=18.4.1

‎firebase-firestore/CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
11
# Unreleased
2+
3+
4+
# 24.8.1
5+
* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions library. [#5337]
6+
7+
8+
## Kotlin
9+
The Kotlin extensions library transitively includes the updated
10+
`firebase-firestore` library. The Kotlin extensions library has no additional
11+
updates.
12+
13+
# 24.8.0
214
* [feature] Added the option to allow the SDK to create cache indexes automatically to
315
improve query execution locally. See
416
[`db.getPersistentCacheIndexManager().enableIndexAutoCreation()`](/docs/reference/android/com/google/firebase/firestore/PersistentCacheIndexManager#enableIndexAutoCreation())
517
([GitHub [#4987](//github.com/firebase/firebase-android-sdk/pull/4987){: .external}).
618

19+
20+
## Kotlin
21+
The Kotlin extensions library transitively includes the updated
22+
`firebase-firestore` library. The Kotlin extensions library has no additional
23+
updates.
24+
725
# 24.7.1
826
* [fixed] Implement equals method on Filter class. [#5210](//github.com/firebase/firebase-android-sdk/issues/5210)
927

@@ -822,3 +840,4 @@ updates.
822840
or
823841
[`FieldValue.serverTimestamp()`](/docs/reference/android/com/google/firebase/firestore/FieldValue.html#serverTimestamp())
824842
values.
843+

‎firebase-firestore/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=24.8.0
1+
version=24.8.2
22
latestReleasedVersion=24.7.1

‎firebase-inappmessaging-display/CHANGELOG.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
# Unreleased
2+
3+
4+
# 20.3.5
5+
* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions library. [#5337]
6+
7+
8+
## Kotlin
9+
The Kotlin extensions library transitively includes the updated
10+
`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
11+
updates.
12+
13+
# 20.3.4
214
* [changed] Updated internal logging backend.
315

16+
17+
## Kotlin
18+
The Kotlin extensions library transitively includes the updated
19+
`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
20+
updates.
21+
422
# 20.3.3
523
* [unchanged] Updated internal Dagger dependency.
624

@@ -29,9 +47,7 @@ updates.
2947
# 20.3.0
3048
* [changed] Migrated [inappmessaging] Display to use standard Firebase
3149
executors.
32-
3350
* [changed] Moved Task continuations off the main thread.
34-
3551
* [feature] Added a new API for
3652
[removing a dismiss listener](/docs/reference/android/com/google/firebase/inappmessaging/FirebaseInAppMessaging#removeDismissListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener)).
3753
(GitHub
@@ -154,7 +170,6 @@ additional updates.
154170
# 19.1.1
155171
* [fixed] Improved link handling on devices without any browser installed
156172
or without Chrome installed.
157-
158173
* [feature] Added the ability to register a dismiss listener that reacts to
159174
message dismissal.
160175

@@ -171,7 +186,6 @@ additional updates.
171186
No developer action is necessary.
172187

173188

174-
175189
## Kotlin
176190
The Kotlin extensions library transitively includes the updated
177191
`firebase-inappmessaging-display` library. The Kotlin extensions library has no
@@ -181,14 +195,12 @@ additional updates.
181195
* [fixed] Improved handling of activity transitions.
182196
(GitHub [Issue #1410](//github.com/firebase/firebase-android-sdk/issues/1410)
183197
and [Issue #1092](//github.com/firebase/firebase-android-sdk/issues/1092))
184-
185198
* [changed] Migrated to use the [firebase_installations] service _directly_
186199
instead of using an indirect dependency via the Firebase Instance ID SDK.
187200

188201
{% include "docs/reference/android/client/_includes/_iid-indirect-dependency-solutions.html" %}
189202

190203

191-
192204
## Kotlin
193205
The Kotlin extensions library transitively includes the updated
194206
`firebase-inappmessaging-display` library. The Kotlin extensions library has no
@@ -216,11 +228,9 @@ additional updates.
216228

217229
# 19.0.4
218230
* [fixed] Fixed issue with messages not being fetched on app first open.
219-
220231
* [fixed] Fixed issue with first foreground trigger not being picked up.
221232

222233

223-
224234
## Kotlin
225235
The Kotlin extensions library transitively includes the updated
226236
`firebase-inappmessaging-display` library. The Kotlin extensions library has no
@@ -230,7 +240,6 @@ additional updates.
230240
* [changed] Internal changes to enable future SDK improvements.
231241

232242

233-
234243
## Kotlin
235244
The Kotlin extensions library transitively includes the updated
236245
`firebase-inappmessaging-display` library. The Kotlin extensions library has no
@@ -292,3 +301,4 @@ additional updates.
292301

293302
# 17.0.0
294303
* [feature] The initial public beta release of the Firebase In-App Messaging Display SDK for Android is now available. To learn more, see the [Firebase In-App Messaging documentation](/docs/in-app-messaging).
304+

‎firebase-inappmessaging-display/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=20.3.4
1+
version=20.3.6
22
latestReleasedVersion=20.3.3

0 commit comments

Comments
 (0)