Skip to content

Commit 0c8e817

Browse files
committed
update
1 parent 3d4aa7a commit 0c8e817

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

firebase-messaging/firebase-messaging.gradle

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@ android {
5757
timeOutInMs 60 * 1000
5858
}
5959

60-
sourceSets {
61-
main {
62-
proto {
63-
srcDir 'src/main/proto'
64-
}
65-
java {
66-
}
67-
}
68-
}
6960

7061
lintOptions {
7162
abortOnError false
@@ -98,20 +89,22 @@ dependencies {
9889
implementation project(':encoders:firebase-encoders')
9990
implementation project(':encoders:firebase-encoders-json')
10091
implementation project(":encoders:firebase-encoders-proto")
92+
implementation project(":firebase-installations")
10193
annotationProcessor project(":encoders:firebase-encoders-processor")
10294

10395
implementation 'androidx.annotation:annotation:1.2.0'
104-
implementation 'com.google.protobuf:protobuf-java-util:3.11.0'
10596
implementation "com.google.android.gms:play-services-tasks:17.2.1"
10697
implementation "com.google.android.gms:play-services-basement:17.6.0"
10798
implementation 'com.google.android.gms:play-services-base:17.6.0'
99+
implementation 'com.google.android.gms:play-services-stats:17.0.1'
108100
implementation 'com.google.firebase:firebase-measurement-connector:19.0.0'
109101
implementation "com.google.firebase:firebase-iid-interop:17.1.0"
110102
implementation 'com.google.android.gms:play-services-cloud-messaging:17.0.0'
111103
implementation ("com.google.firebase:firebase-iid:21.1.0") {
112104
exclude group: "com.google.firebase", module: "firebase-common"
113105
exclude group: "com.google.firebase", module: "firebase-components"
114106
exclude group: "com.google.firebase", module: "firebase-installations-interop"
107+
exclude group: "com.google.firebase", module: "firebase-installations"
115108
}
116109
implementation ("com.google.api-client:google-api-client:1.30.9") {
117110
exclude group: "org.apache.httpcomponents", module: "httpclient"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sdk=19
1+
sdk=19

tools/lint/src/main/kotlin/NonAndroidxNullabilityDetector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private val NULLABLE_ANNOTATIONS = listOf("Nullable", "CheckForNull")
3636
private val NOT_NULL_ANNOTATIONS = listOf("NonNull", "NotNull", "Nonnull")
3737

3838
private val ANDROIDX_ANNOTATIONS = listOf(
39-
"androidx.annotation.Nullable",
39+
"android.support.annotation.NonNull",
4040
"androidx.annotation.NonNull",
4141
"android.support.annotation.Nullable",
4242
"androidx.annotation.NonNull")

0 commit comments

Comments
 (0)