Skip to content

Commit ea229c4

Browse files
github-actions[bot]github-actions[bot]
authored
Merge 49d934e into 95bbf92 
2 parents 95bbf92 + 49d934e commit ea229c4

File tree

8 files changed

+361
-9
lines changed

8 files changed

+361
-9
lines changed

‎firebase-crashlytics-ndk/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Unreleased
2-
2+
* [changed] Updated `firebase-crashlytics` dependency to v19.4.1
33

44
# 19.3.0
55
* [changed] Updated `firebase-crashlytics` dependency to v19.3.0

‎firebase-crashlytics/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Unreleased
2-
2+
* [changed] Updated `firebase-sessions` dependency to v2.0.9
33

44
# 19.4.0
55
* [feature] Added an overload for `recordException` that allows logging additional custom

‎firebase-vertexai/api.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,11 @@ package com.google.firebase.vertexai.type {
428428
public static final class ImagenGenerationConfig.Builder {
429429
ctor public ImagenGenerationConfig.Builder();
430430
method public com.google.firebase.vertexai.type.ImagenGenerationConfig build();
431+
method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setAddWatermark(boolean addWatermark);
432+
method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setAspectRatio(com.google.firebase.vertexai.type.ImagenAspectRatio aspectRatio);
433+
method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setImageFormat(com.google.firebase.vertexai.type.ImagenImageFormat imageFormat);
434+
method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setNegativePrompt(String negativePrompt);
435+
method public com.google.firebase.vertexai.type.ImagenGenerationConfig.Builder setNumberOfImages(int numberOfImages);
431436
field public Boolean? addWatermark;
432437
field public com.google.firebase.vertexai.type.ImagenAspectRatio? aspectRatio;
433438
field public com.google.firebase.vertexai.type.ImagenImageFormat? imageFormat;
@@ -453,6 +458,8 @@ package com.google.firebase.vertexai.type {
453458
@com.google.firebase.vertexai.type.PublicPreviewAPI public final class ImagenImageFormat {
454459
method public Integer? getCompressionQuality();
455460
method public String getMimeType();
461+
method public static com.google.firebase.vertexai.type.ImagenImageFormat jpeg(Integer? compressionQuality = null);
462+
method public static com.google.firebase.vertexai.type.ImagenImageFormat png();
456463
property public final Integer? compressionQuality;
457464
property public final String mimeType;
458465
field public static final com.google.firebase.vertexai.type.ImagenImageFormat.Companion Companion;

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

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ package com.google.firebase.vertexai.type
2626
* @param imageFormat The file format/compression of the generated images.
2727
* @param addWatermark Adds an invisible watermark to mark the image as AI generated.
2828
*/
29+
import kotlin.jvm.JvmField
30+
2931
@PublicPreviewAPI
3032
public class ImagenGenerationConfig(
3133
public val negativePrompt: String? = null,
@@ -39,13 +41,6 @@ public class ImagenGenerationConfig(
3941
*
4042
* This is mainly intended for Java interop. For Kotlin, use [imagenGenerationConfig] for a more
4143
* idiomatic experience.
42-
*
43-
* @property negativePrompt See [ImagenGenerationConfig.negativePrompt].
44-
* @property numberOfImages See [ImagenGenerationConfig.numberOfImages].
45-
* @property aspectRatio See [ImagenGenerationConfig.aspectRatio].
46-
* @property imageFormat See [ImagenGenerationConfig.imageFormat]
47-
* @property addWatermark See [ImagenGenerationConfig.addWatermark]
48-
* @see [imagenGenerationConfig]
4944
*/
5045
public class Builder {
5146
@JvmField public var negativePrompt: String? = null
@@ -54,6 +49,31 @@ public class ImagenGenerationConfig(
5449
@JvmField public var imageFormat: ImagenImageFormat? = null
5550
@JvmField public var addWatermark: Boolean? = null
5651

52+
/** See [ImagenGenerationConfig.negativePrompt]. */
53+
public fun setNegativePrompt(negativePrompt: String): Builder = apply {
54+
this.negativePrompt = negativePrompt
55+
}
56+
57+
/** See [ImagenGenerationConfig.numberOfImages]. */
58+
public fun setNumberOfImages(numberOfImages: Int): Builder = apply {
59+
this.numberOfImages = numberOfImages
60+
}
61+
62+
/** See [ImagenGenerationConfig.aspectRatio]. */
63+
public fun setAspectRatio(aspectRatio: ImagenAspectRatio): Builder = apply {
64+
this.aspectRatio = aspectRatio
65+
}
66+
67+
/** See [ImagenGenerationConfig.imageFormat]. */
68+
public fun setImageFormat(imageFormat: ImagenImageFormat): Builder = apply {
69+
this.imageFormat = imageFormat
70+
}
71+
72+
/** See [ImagenGenerationConfig.addWatermark]. */
73+
public fun setAddWatermark(addWatermark: Boolean): Builder = apply {
74+
this.addWatermark = addWatermark
75+
}
76+
5777
/**
5878
* Alternative casing for [ImagenGenerationConfig.Builder]:
5979
* ```

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ private constructor(public val mimeType: String, public val compressionQuality:
4141
* @param compressionQuality an int (1-100) representing the quality of the image; a lower
4242
* number means the image is permitted to be lower quality to reduce size.
4343
*/
44+
@JvmStatic
4445
public fun jpeg(compressionQuality: Int? = null): ImagenImageFormat {
4546
return ImagenImageFormat("image/jpeg", compressionQuality)
4647
}
4748

4849
/** An [ImagenImageFormat] representing a PNG image */
50+
@JvmStatic
4951
public fun png(): ImagenImageFormat {
5052
return ImagenImageFormat("image/png", null)
5153
}

‎release.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "m160",
3+
"libraries": [
4+
":firebase-functions",
5+
":firebase-functions:ktx",
6+
":firebase-crashlytics",
7+
":firebase-crashlytics-ndk",
8+
":firebase-sessions",
9+
":firebase-crashlytics:ktx",
10+
":firebase-vertexai"
11+
]
12+
}

‎release_report.json

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
{
2+
"changesByLibraryName": {
3+
"firebase-functions": [
4+
{
5+
"commitId": "f6b59f69458c288509c64065aa3b5db0a8401d77",
6+
"prId": "6694",
7+
"author": "emilypgoogle",
8+
"message": "Add functions changelog (#6694)\n\nChangelog entry should be picked up for the next release",
9+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/f6b59f69458c288509c64065aa3b5db0a8401d77",
10+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6694"
11+
},
12+
{
13+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
14+
"prId": "6671",
15+
"author": "emilypgoogle",
16+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
17+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
18+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
19+
}
20+
],
21+
"firebase-functions/ktx": [
22+
{
23+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
24+
"prId": "6671",
25+
"author": "emilypgoogle",
26+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
27+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
28+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
29+
}
30+
],
31+
"firebase-crashlytics": [
32+
{
33+
"commitId": "f80ba894db04a3b0c328b192700a97889e5dcfba",
34+
"prId": "6691",
35+
"author": "Matthew Robertson",
36+
"message": "Fix deprecated message in KeyValueBuilder to render properly (#6691)\n\nFix deprecated message in KeyValueBuilder to render properly",
37+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/f80ba894db04a3b0c328b192700a97889e5dcfba",
38+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6691"
39+
},
40+
{
41+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
42+
"prId": "6671",
43+
"author": "emilypgoogle",
44+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
45+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
46+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
47+
}
48+
],
49+
"firebase-crashlytics-ndk": [
50+
{
51+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
52+
"prId": "6671",
53+
"author": "emilypgoogle",
54+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
55+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
56+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
57+
}
58+
],
59+
"firebase-sessions": [
60+
{
61+
"commitId": "ed5621e59a3d470d511179f5a04aed9973d6f9b2",
62+
"prId": "6701",
63+
"author": "Matthew Robertson",
64+
"message": "Followup to #6699 (#6701)\n\n",
65+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/ed5621e59a3d470d511179f5a04aed9973d6f9b2",
66+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6701"
67+
},
68+
{
69+
"commitId": "de931047365e273fa24cb8162ee04b77f9a0f353",
70+
"prId": "6699",
71+
"author": "Matthew Robertson",
72+
"message": "Make AQS resilient to background init in multi-process apps (#6699)\n\n",
73+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/de931047365e273fa24cb8162ee04b77f9a0f353",
74+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6699"
75+
},
76+
{
77+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
78+
"prId": "6671",
79+
"author": "emilypgoogle",
80+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
81+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
82+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
83+
}
84+
],
85+
"firebase-crashlytics/ktx": [
86+
{
87+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
88+
"prId": "6671",
89+
"author": "emilypgoogle",
90+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
91+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
92+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
93+
}
94+
],
95+
"firebase-vertexai": [
96+
{
97+
"commitId": "95bbf92efb794ee8f7ec2acc6fde823a9cfa4958",
98+
"prId": "6607",
99+
"author": "David Motsonashvili",
100+
"message": "Initial implementation to API spec (#6607)\n\nAdded support for querying imagen models to generate images both in gcs\r\nand inline. Documentation incoming in a separate PR for readability\r\n\r\n---------\r\n\r\nCo-authored-by: David Motsonashvili <[email protected]>\r\nCo-authored-by: rachelsaunders <[email protected]>\r\nCo-authored-by: Daymon <[email protected]>",
101+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/95bbf92efb794ee8f7ec2acc6fde823a9cfa4958",
102+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6607"
103+
},
104+
{
105+
"commitId": "e125fb7ff1ac3248fffae32e9d4b2d815505eb4f",
106+
"prId": "6681",
107+
"author": "Rosário P. Fernandes",
108+
"message": "docs: update ImagePart refdocs (#6681)\n\nThe current refdocs are somewhat confusing and may lead to assume that\nthe conversion happens server-side, when it's actually client side.",
109+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/e125fb7ff1ac3248fffae32e9d4b2d815505eb4f",
110+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6681"
111+
},
112+
{
113+
"commitId": "2d1905ec53b25f0d5861f30e7ac89a080cfd5aa9",
114+
"prId": "6695",
115+
"author": "Rodrigo Lazo",
116+
"message": "Make token count details fields non-nullable (#6695)\n\nIf missing, they'll default to empty.",
117+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/2d1905ec53b25f0d5861f30e7ac89a080cfd5aa9",
118+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6695"
119+
},
120+
{
121+
"commitId": "301d37a384ccfd68a9d39754abeae6e048f0a08a",
122+
"prId": "6685",
123+
"author": "David Motsonashvili",
124+
"message": "Add support for new FinishReason and BlockReason values (#6685)\n\nCo-authored-by: David Motsonashvili <[email protected]>\r\nCo-authored-by: Rodrigo Lazo <[email protected]>",
125+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/301d37a384ccfd68a9d39754abeae6e048f0a08a",
126+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6685"
127+
},
128+
{
129+
"commitId": "d9baf9e7ad7f5bf6c41cd0e40204895a63d27ce2",
130+
"prId": "6658",
131+
"author": "Rodrigo Lazo",
132+
"message": "Add support for token-based usage metrics (#6658)\n\nToken measurement is broken down by modaliy, with separate counters for\nimage, audio, etc.\n\nTests are in version 6.*, so this change also includes bumping\nupdate_responses.sh",
133+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/d9baf9e7ad7f5bf6c41cd0e40204895a63d27ce2",
134+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6658"
135+
},
136+
{
137+
"commitId": "92f448f94f84c769cae00a78397bb0625031f092",
138+
"prId": "6671",
139+
"author": "emilypgoogle",
140+
"message": "Update Metalava and api.txt files (#6671)\n\nThis includes adding vertex ai api.txt which we were lacking until now",
141+
"commitLink": "https://github.com/firebase/firebase-android-sdk/commit/92f448f94f84c769cae00a78397bb0625031f092",
142+
"prLink": "https://github.com/firebase/firebase-android-sdk/pull/6671"
143+
}
144+
]
145+
},
146+
"changedLibrariesWithNoChangelog": [
147+
":firebase-abt",
148+
":firebase-appdistribution",
149+
":firebase-appdistribution-api",
150+
":firebase-appdistribution-api:ktx",
151+
":firebase-common",
152+
":firebase-common:ktx",
153+
":firebase-components",
154+
":firebase-config",
155+
":firebase-config:ktx",
156+
":firebase-config-interop",
157+
":firebase-database",
158+
":firebase-database:ktx",
159+
":firebase-database-collection",
160+
":firebase-dataconnect",
161+
":firebase-datatransport",
162+
":firebase-dynamic-links",
163+
":firebase-dynamic-links:ktx",
164+
":firebase-firestore",
165+
":firebase-firestore:ktx",
166+
":firebase-inappmessaging",
167+
":firebase-inappmessaging-display",
168+
":firebase-inappmessaging:ktx",
169+
":firebase-inappmessaging-display:ktx",
170+
":firebase-installations",
171+
":firebase-installations:ktx",
172+
":firebase-installations-interop",
173+
":firebase-messaging",
174+
":firebase-messaging-directboot",
175+
":firebase-messaging:ktx",
176+
":firebase-ml-modeldownloader",
177+
":firebase-ml-modeldownloader:ktx",
178+
":firebase-perf",
179+
":firebase-perf:ktx",
180+
":firebase-storage",
181+
":firebase-storage:ktx",
182+
":protolite-well-known-types",
183+
":appcheck:firebase-appcheck",
184+
":appcheck:firebase-appcheck-debug",
185+
":appcheck:firebase-appcheck-debug-testing",
186+
":appcheck:firebase-appcheck-playintegrity",
187+
":appcheck:firebase-appcheck:ktx",
188+
":appcheck:firebase-appcheck-interop",
189+
":encoders:firebase-decoders-json",
190+
":encoders:firebase-encoders-json",
191+
":encoders:firebase-encoders-reflective",
192+
":firebase-components:firebase-dynamic-module-support",
193+
":transport:transport-api",
194+
":transport:transport-backend-cct",
195+
":transport:transport-runtime"
196+
]
197+
}

0 commit comments

Comments
 (0)