Skip to content

Commit 28c7362

Browse files
authored
Merge branch 'main' into dependabot/gradle/truth-1.4.4
2 parents 94b76c2 + 043bdc0 commit 28c7362

File tree

7 files changed

+55
-7
lines changed

7 files changed

+55
-7
lines changed

.github/workflows/dataconnect.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ jobs:
217217
if-no-files-found: warn
218218
compression-level: 9
219219

220-
- name: Check test result
220+
- name: Verify "Gradle connectedCheck" step was successful
221221
if: steps.connectedCheck.outcome != 'success'
222222
run: |
223-
echo "Failing the job since the connectedCheck step failed"
223+
echo 'Failing because the outcome of the "Gradle connectedCheck" step ("${{ steps.connectedCheck.outcome }}") was not successful'
224224
exit 1
225225
226226
# Check this yml file with "actionlint": https://github.com/rhysd/actionlint

firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,17 @@ private Task<Void> setDefaultsWithStringsMapAsync(Map<String, String> defaultsSt
656656
* Asynchronously changes the custom signals for this {@link FirebaseRemoteConfig} instance.
657657
*
658658
* <p>Custom signals are subject to limits on the size of key/value pairs and the total
659-
* number of signals. Any calls that exceed these limits will be discarded.
659+
* number of signals. Any calls that exceed these limits will be discarded. See <a
660+
* href="https://firebase.google.com/docs/remote-config/parameters?template_type=client#custom-signal-limits">Custom
661+
* Signal Limits</a>.
660662
*
661663
* @param customSignals The custom signals to set for this instance.
662-
* <ol>
664+
* <ul>
663665
* <li>New keys will add new key-value pairs in the custom signals.
664666
* <li>Existing keys with new values will update the corresponding signals.
665667
* <li>Setting a key's value to {@code null} will remove the associated signal.
666-
* </ol>
668+
* </ul>
667669
*/
668-
// TODO(b/385028620): Add link to documentation about custom signal limits.
669670
@NonNull
670671
public Task<Void> setCustomSignals(@NonNull CustomSignals customSignals) {
671672
return Tasks.call(

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package com.google.firebase.vertexai.type
1818

19+
import com.google.firebase.vertexai.ImagenModel
1920
import kotlinx.serialization.Serializable
2021

2122
/**
22-
* Represents a response from a call to [ImagenModel#generateImages]
23+
* Represents a response from a call to [ImagenModel.generateImages]
2324
*
2425
* @param images contains the generated images
2526
* @param filteredReason if fewer images were generated than were requested, this field will contain
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.firebase.gradle.plugins
18+
19+
import org.gradle.api.DefaultTask
20+
import org.gradle.api.file.RegularFileProperty
21+
import org.gradle.api.tasks.InputFile
22+
import org.gradle.api.tasks.OutputFile
23+
import org.gradle.api.tasks.TaskAction
24+
25+
abstract class CopyApiTask : DefaultTask() {
26+
@get:InputFile abstract val apiTxtFile: RegularFileProperty
27+
@get:OutputFile abstract val output: RegularFileProperty
28+
29+
@TaskAction
30+
fun run() {
31+
output.get().asFile.writeText(apiTxtFile.get().asFile.readText())
32+
}
33+
}

plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() {
160160
.getLatestReleasedVersion()
161161
)
162162
}
163+
164+
project.tasks.register<CopyApiTask>("copyApiTxtFile") {
165+
apiTxtFile.set(project.file("api.txt"))
166+
output.set(project.file("previous_api.txt"))
167+
}
163168
}
164169

165170
private fun setupApiInformationAnalysis(project: Project, android: LibraryExtension) {

plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
103103

104104
dependsOn("copyPreviousArtifacts")
105105
}
106+
107+
project.tasks.register<CopyApiTask>("copyApiTxtFile") {
108+
apiTxtFile.set(project.file("api.txt"))
109+
output.set(project.file("previous_api.txt"))
110+
}
106111
}
107112

108113
private fun setupApiInformationAnalysis(project: Project) {

plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,9 @@ constructor(val project: Project, val type: LibraryType) {
241241
val version: String
242242
get() = project.version.toString()
243243

244+
val previousVersion: String
245+
get() = project.properties["latestReleasedVersion"].toString()
246+
244247
val path: String = project.path
245248

246249
val runtimeClasspath: String =

0 commit comments

Comments
 (0)