Skip to content

Commit 1bc6201

Browse files
Daeda88Daeda88
committed
Small dependency fixes
Requires GitLiveApp/firebase-java-sdk#65
1 parent 8844930 commit 1bc6201

File tree

4 files changed

+80
-16
lines changed

4 files changed

+80
-16
lines changed

‎firebase-auth/src/appleMain/kotlin/dev/gitlive/firebase/auth/auth.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ public actual class AuthTokenResult(internal val ios: FIRAuthTokenResult) {
154154
internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also {
155155
it.setURL(NSURL.URLWithString(url))
156156
androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) }
157-
it.setDynamicLinkDomain(dynamicLinkDomain)
158157
it.setLinkDomain(linkDomain)
159158
it.setHandleCodeInApp(canHandleCodeInApp)
160159
iOSBundleId?.run { it.setIOSBundleID(this) }

‎firebase-common/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ kotlin {
153153
if (supportedPlatforms.contains(TargetPlatform.Js)) {
154154
getByName("jsMain") {
155155
dependencies {
156-
api(npm("firebase", "10.12.2"))
156+
api(npm("firebase", libs.versions.firebase.npm.get()))
157157
}
158158
}
159159
}

‎firebase-firestore/api/jvm/firebase-firestore.api‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ public final class dev/gitlive/firebase/firestore/DocumentReference {
142142
public static synthetic fun set$default (Ldev/gitlive/firebase/firestore/DocumentReference;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;[Ldev/gitlive/firebase/firestore/FieldPath;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
143143
public static synthetic fun set$default (Ldev/gitlive/firebase/firestore/DocumentReference;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;[Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
144144
public final fun setEncoded (Ldev/gitlive/firebase/internal/EncodedObject;Ldev/gitlive/firebase/firestore/internal/SetOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
145+
public final fun snapshots (Ldev/gitlive/firebase/firestore/SnapshotListenOptions;)Lkotlinx/coroutines/flow/Flow;
145146
public final fun snapshots (Z)Lkotlinx/coroutines/flow/Flow;
146-
public static synthetic fun snapshots$default (Ldev/gitlive/firebase/firestore/DocumentReference;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
147+
public static synthetic fun snapshots$default (Ldev/gitlive/firebase/firestore/DocumentReference;Ldev/gitlive/firebase/firestore/SnapshotListenOptions;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
147148
public fun toString ()Ljava/lang/String;
148149
public final fun update (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
149150
public final fun update (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -443,6 +444,14 @@ public final class dev/gitlive/firebase/firestore/GeoPointSerializer : kotlinx/s
443444
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
444445
}
445446

447+
public final class dev/gitlive/firebase/firestore/ListenSource : java/lang/Enum {
448+
public static final field CACHE Ldev/gitlive/firebase/firestore/ListenSource;
449+
public static final field DEFAULT Ldev/gitlive/firebase/firestore/ListenSource;
450+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
451+
public static fun valueOf (Ljava/lang/String;)Ldev/gitlive/firebase/firestore/ListenSource;
452+
public static fun values ()[Ldev/gitlive/firebase/firestore/ListenSource;
453+
}
454+
446455
public abstract interface class dev/gitlive/firebase/firestore/LocalCacheSettings {
447456
}
448457

@@ -525,6 +534,14 @@ public final class dev/gitlive/firebase/firestore/MemoryGarbageCollectorSettings
525534
public final fun newBuilder ()Ldev/gitlive/firebase/firestore/MemoryGarbageCollectorSettings$LRUGC$Builder;
526535
}
527536

537+
public final class dev/gitlive/firebase/firestore/MetadataChanges : java/lang/Enum {
538+
public static final field EXCLUDE Ldev/gitlive/firebase/firestore/MetadataChanges;
539+
public static final field INCLUDE Ldev/gitlive/firebase/firestore/MetadataChanges;
540+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
541+
public static fun valueOf (Ljava/lang/String;)Ldev/gitlive/firebase/firestore/MetadataChanges;
542+
public static fun values ()[Ldev/gitlive/firebase/firestore/MetadataChanges;
543+
}
544+
528545
public class dev/gitlive/firebase/firestore/Query {
529546
public static final field Companion Ldev/gitlive/firebase/firestore/Query$Companion;
530547
public final fun aggregate (Ldev/gitlive/firebase/firestore/AggregateField;[Ldev/gitlive/firebase/firestore/AggregateField;)Ldev/gitlive/firebase/firestore/AggregateQuery;
@@ -546,8 +563,9 @@ public class dev/gitlive/firebase/firestore/Query {
546563
public final fun orderBy (Ljava/lang/String;Lcom/google/firebase/firestore/Query$Direction;)Ldev/gitlive/firebase/firestore/Query;
547564
public static synthetic fun orderBy$default (Ldev/gitlive/firebase/firestore/Query;Ldev/gitlive/firebase/firestore/FieldPath;Lcom/google/firebase/firestore/Query$Direction;ILjava/lang/Object;)Ldev/gitlive/firebase/firestore/Query;
548565
public static synthetic fun orderBy$default (Ldev/gitlive/firebase/firestore/Query;Ljava/lang/String;Lcom/google/firebase/firestore/Query$Direction;ILjava/lang/Object;)Ldev/gitlive/firebase/firestore/Query;
566+
public final fun snapshots (Ldev/gitlive/firebase/firestore/SnapshotListenOptions;)Lkotlinx/coroutines/flow/Flow;
549567
public final fun snapshots (Z)Lkotlinx/coroutines/flow/Flow;
550-
public static synthetic fun snapshots$default (Ldev/gitlive/firebase/firestore/Query;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
568+
public static synthetic fun snapshots$default (Ldev/gitlive/firebase/firestore/Query;Ldev/gitlive/firebase/firestore/SnapshotListenOptions;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
551569
public final fun startAfter (Ldev/gitlive/firebase/firestore/DocumentSnapshot;)Ldev/gitlive/firebase/firestore/Query;
552570
public final fun startAfter ([Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Query;
553571
public final fun startAfter ([Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ldev/gitlive/firebase/firestore/Query;
@@ -587,6 +605,42 @@ public final class dev/gitlive/firebase/firestore/ServerTimestampSerializer : ko
587605
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
588606
}
589607

608+
public final class dev/gitlive/firebase/firestore/SnapshotListenOptions {
609+
public fun <init> (Ldev/gitlive/firebase/firestore/ListenSource;Ldev/gitlive/firebase/firestore/MetadataChanges;Landroid/app/Activity;Ljava/util/concurrent/Executor;)V
610+
public final fun component1 ()Ldev/gitlive/firebase/firestore/ListenSource;
611+
public final fun component2 ()Ldev/gitlive/firebase/firestore/MetadataChanges;
612+
public final fun component3 ()Landroid/app/Activity;
613+
public final fun component4 ()Ljava/util/concurrent/Executor;
614+
public final fun copy (Ldev/gitlive/firebase/firestore/ListenSource;Ldev/gitlive/firebase/firestore/MetadataChanges;Landroid/app/Activity;Ljava/util/concurrent/Executor;)Ldev/gitlive/firebase/firestore/SnapshotListenOptions;
615+
public static synthetic fun copy$default (Ldev/gitlive/firebase/firestore/SnapshotListenOptions;Ldev/gitlive/firebase/firestore/ListenSource;Ldev/gitlive/firebase/firestore/MetadataChanges;Landroid/app/Activity;Ljava/util/concurrent/Executor;ILjava/lang/Object;)Ldev/gitlive/firebase/firestore/SnapshotListenOptions;
616+
public fun equals (Ljava/lang/Object;)Z
617+
public final fun getActivity ()Landroid/app/Activity;
618+
public final fun getAndroid ()Lcom/google/firebase/firestore/SnapshotListenOptions;
619+
public final fun getExecutor ()Ljava/util/concurrent/Executor;
620+
public final fun getListenSource ()Ldev/gitlive/firebase/firestore/ListenSource;
621+
public final fun getMetadataChanges ()Ldev/gitlive/firebase/firestore/MetadataChanges;
622+
public fun hashCode ()I
623+
public fun toString ()Ljava/lang/String;
624+
}
625+
626+
public final class dev/gitlive/firebase/firestore/SnapshotListenOptions$Builder {
627+
public fun <init> ()V
628+
public final fun build ()Ldev/gitlive/firebase/firestore/SnapshotListenOptions;
629+
public final fun getActivity ()Landroid/app/Activity;
630+
public final fun getExecutor ()Ljava/util/concurrent/Executor;
631+
public final fun getListenSource ()Ldev/gitlive/firebase/firestore/ListenSource;
632+
public final fun getMetadataChanges ()Ldev/gitlive/firebase/firestore/MetadataChanges;
633+
public final fun setActivity (Landroid/app/Activity;)V
634+
public final fun setExecutor (Ljava/util/concurrent/Executor;)V
635+
public final fun setListenSource (Ldev/gitlive/firebase/firestore/ListenSource;)V
636+
public final fun setMetadataChanges (Ldev/gitlive/firebase/firestore/MetadataChanges;)V
637+
}
638+
639+
public final class dev/gitlive/firebase/firestore/SnapshotListenOptionsKt {
640+
public static final fun snapshotListenOptions (Lkotlin/jvm/functions/Function1;)Ldev/gitlive/firebase/firestore/SnapshotListenOptions;
641+
public static synthetic fun snapshotListenOptions$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/gitlive/firebase/firestore/SnapshotListenOptions;
642+
}
643+
590644
public final class dev/gitlive/firebase/firestore/SnapshotMetadata {
591645
public fun <init> (Lcom/google/firebase/firestore/SnapshotMetadata;)V
592646
public final fun getHasPendingWrites ()Z

‎gradle/libs.versions.toml‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,38 @@
11
[versions]
2-
agp = "8.12.3"
3-
androidx-test-core = "1.7.0"
4-
androidx-test-junit = "1.3.0"
5-
androidx-test-runner = "1.7.0"
6-
ben-manes-versions = "0.53.0"
7-
firebase-bom = "34.6.0"
8-
gitlive-firebase-java-sdk = "0.6.3"
9-
gson = "2.13.2"
10-
junit = "4.13.2"
2+
#Kotlin
113
kotlin = "2.2.21"
124
kotlinx-coroutines = "1.10.2"
135
kotlinx-serialization = "1.9.0"
146
kotlinx-binarycompatibilityvalidator = "0.18.1"
157
kotlinx-datetime = "0.7.1"
16-
kotlinter = "5.3.0"
178
settings-api = "2.2"
189
settings-language = "2.2"
19-
firebase-cocoapods = "12.6.0"
20-
firebase-npm = "12.6.0"
10+
11+
#Android
12+
agp = "8.12.3"
13+
androidx-test-core = "1.7.0"
14+
androidx-test-junit = "1.3.0"
15+
androidx-test-runner = "1.7.0"
16+
17+
# Apple
2118
ios-deploymentTarget = "15.0"
2219
tvos-deploymentTarget = "15.0"
2320
macos-deploymentTarget = "10.15"
21+
22+
# Firebase
23+
firebase-bom = "34.6.0"
24+
gitlive-firebase-java-sdk = "0.6.4"
25+
firebase-cocoapods = "12.6.0"
26+
firebase-npm = "12.6.0"
27+
28+
# Testing
29+
gson = "2.13.2"
30+
junit = "4.13.2"
2431
test-logger-plugin = "4.0.0"
32+
33+
# Meta
34+
ben-manes-versions = "0.53.0"
35+
kotlinter = "5.3.0"
2536
dokka = "2.1.0"
2637
publish = "0.35.0"
2738

0 commit comments

Comments
 (0)