Skip to content
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion firebase-firestore/firebase-firestore.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ tasks.withType(Test) {
dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'

api project(':protolite-well-known-types')
api "com.google.firebase:protolite-well-known-types:18.0.0"
api 'com.google.android.gms:play-services-tasks:18.0.1'
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
Expand Down
2 changes: 1 addition & 1 deletion firebase-inappmessaging/firebase-inappmessaging.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ dependencies {
exclude group: "javax.inject", module: "javax.inject"
}

api project(':protolite-well-known-types')
api "com.google.firebase:protolite-well-known-types:18.0.0"
api 'com.google.android.gms:play-services-tasks:18.0.1'
api('com.google.firebase:firebase-abt:21.1.1') {
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion protolite-well-known-types/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Unreleased

* [fixed] Fixed an issue that caused protolite to break when used alongside protolite `4.27.0`.

This file was deleted.

4 changes: 1 addition & 3 deletions protolite-well-known-types/protolite-well-known-types.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ protobuf {
}
generateProtoTasks {
all().each { task ->

task.addIncludeDir(files('fix-javalite/proto'))

task.builtins {
java {
option "lite"
Expand Down Expand Up @@ -66,5 +63,6 @@ dependencies {
exclude group: "com.google.protobuf", module: "protobuf-java"
}

// TODO(b/343482773): Migrate to 4.27+
implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
}
Loading