Back to PR remarks

Daeda88 · Daeda88 · commit 3aac20e935e0 · 2025-07-11T12:43:47.000+02:00
diff --git a/firebase-common-internal/api/android/firebase-common-internal.api b/firebase-common-internal/api/android/firebase-common-internal.api
@@ -31,6 +31,8 @@ public final class dev/gitlive/firebase/internal/EncodeDecodeSettingsBuilderImpl
 public final class dev/gitlive/firebase/internal/EncodeDecodeSettingsKt {
 	public static final fun buildDecodeSettings (Ldev/gitlive/firebase/DecodeSettings$Builder;)Ldev/gitlive/firebase/DecodeSettings;
 	public static final fun buildEncodeSettings (Ldev/gitlive/firebase/EncodeSettings$Builder;)Ldev/gitlive/firebase/EncodeSettings;
+	public static final fun copyFrom (Ldev/gitlive/firebase/DecodeSettings$Builder;Ldev/gitlive/firebase/DecodeSettings$Builder;)V
+	public static final fun copyFrom (Ldev/gitlive/firebase/EncodeSettings$Builder;Ldev/gitlive/firebase/EncodeSettings$Builder;)V
 }
 
 public final class dev/gitlive/firebase/internal/EncodeSettingsImpl : dev/gitlive/firebase/EncodeSettings {
diff --git a/firebase-common-internal/api/jvm/firebase-common-internal.api b/firebase-common-internal/api/jvm/firebase-common-internal.api
@@ -31,6 +31,8 @@ public final class dev/gitlive/firebase/internal/EncodeDecodeSettingsBuilderImpl
 public final class dev/gitlive/firebase/internal/EncodeDecodeSettingsKt {
 	public static final fun buildDecodeSettings (Ldev/gitlive/firebase/DecodeSettings$Builder;)Ldev/gitlive/firebase/DecodeSettings;
 	public static final fun buildEncodeSettings (Ldev/gitlive/firebase/EncodeSettings$Builder;)Ldev/gitlive/firebase/EncodeSettings;
+	public static final fun copyFrom (Ldev/gitlive/firebase/DecodeSettings$Builder;Ldev/gitlive/firebase/DecodeSettings$Builder;)V
+	public static final fun copyFrom (Ldev/gitlive/firebase/EncodeSettings$Builder;Ldev/gitlive/firebase/EncodeSettings$Builder;)V
 }
 
 public final class dev/gitlive/firebase/internal/EncodeSettingsImpl : dev/gitlive/firebase/EncodeSettings {
diff --git a/firebase-common-internal/src/commonMain/kotlin/dev/gitlive/firebase/internal/EncodeDecodeSettings.kt b/firebase-common-internal/src/commonMain/kotlin/dev/gitlive/firebase/internal/EncodeDecodeSettings.kt
@@ -42,3 +42,12 @@ internal fun EncodeSettings.Builder.buildEncodeSettings(): EncodeSettings = Enco
 
 @PublishedApi
 internal fun DecodeSettings.Builder.buildDecodeSettings(): DecodeSettings = DecodeSettingsImpl(serializersModule)
+
+public fun EncodeSettings.Builder.copyFrom(other: EncodeSettings.Builder) {
+    encodeDefaults = other.encodeDefaults
+    serializersModule = other.serializersModule
+}
+
+public fun DecodeSettings.Builder.copyFrom(other: DecodeSettings.Builder) {
+    serializersModule = other.serializersModule
+}
diff --git a/firebase-common/api/android/firebase-common.api b/firebase-common/api/android/firebase-common.api
@@ -13,11 +13,6 @@ public abstract interface class dev/gitlive/firebase/EncodeDecodeSettings {
 public abstract interface class dev/gitlive/firebase/EncodeDecodeSettingsBuilder : dev/gitlive/firebase/DecodeSettings$Builder, dev/gitlive/firebase/EncodeSettings$Builder {
 }
 
-public final class dev/gitlive/firebase/EncodeDecodeSettingsKt {
-	public static final fun copyFrom (Ldev/gitlive/firebase/DecodeSettings$Builder;Ldev/gitlive/firebase/DecodeSettings$Builder;)V
-	public static final fun copyFrom (Ldev/gitlive/firebase/EncodeSettings$Builder;Ldev/gitlive/firebase/EncodeSettings$Builder;)V
-}
-
 public abstract interface class dev/gitlive/firebase/EncodeSettings : dev/gitlive/firebase/EncodeDecodeSettings {
 	public abstract fun getEncodeDefaults ()Z
 }
diff --git a/firebase-common/api/jvm/firebase-common.api b/firebase-common/api/jvm/firebase-common.api
@@ -13,11 +13,6 @@ public abstract interface class dev/gitlive/firebase/EncodeDecodeSettings {
 public abstract interface class dev/gitlive/firebase/EncodeDecodeSettingsBuilder : dev/gitlive/firebase/DecodeSettings$Builder, dev/gitlive/firebase/EncodeSettings$Builder {
 }
 
-public final class dev/gitlive/firebase/EncodeDecodeSettingsKt {
-	public static final fun copyFrom (Ldev/gitlive/firebase/DecodeSettings$Builder;Ldev/gitlive/firebase/DecodeSettings$Builder;)V
-	public static final fun copyFrom (Ldev/gitlive/firebase/EncodeSettings$Builder;Ldev/gitlive/firebase/EncodeSettings$Builder;)V
-}
-
 public abstract interface class dev/gitlive/firebase/EncodeSettings : dev/gitlive/firebase/EncodeDecodeSettings {
 	public abstract fun getEncodeDefaults ()Z
 }
diff --git a/firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/EncodeDecodeSettings.kt b/firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/EncodeDecodeSettings.kt
@@ -27,11 +27,6 @@ public interface EncodeSettings : EncodeDecodeSettings {
     }
 }
 
-public fun EncodeSettings.Builder.copyFrom(other: EncodeSettings.Builder) {
-    encodeDefaults = other.encodeDefaults
-    serializersModule = other.serializersModule
-}
-
 /**
  * [EncodeDecodeSettings] used when decoding an object
  * @param serializersModule the [SerializersModule] to use for deserialization. This allows for polymorphic serialization on runtime
@@ -43,10 +38,6 @@ public interface DecodeSettings : EncodeDecodeSettings {
     }
 }
 
-public fun DecodeSettings.Builder.copyFrom(other: DecodeSettings.Builder) {
-    serializersModule = other.serializersModule
-}
-
 public interface EncodeDecodeSettingsBuilder :
     EncodeSettings.Builder,
     DecodeSettings.Builder
diff --git a/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/FieldValuesDSL.kt b/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/FieldValuesDSL.kt
@@ -1,7 +1,7 @@
 package dev.gitlive.firebase.firestore
 
 import dev.gitlive.firebase.EncodeSettings
-import dev.gitlive.firebase.copyFrom
+import dev.gitlive.firebase.internal.copyFrom
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule
diff --git a/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/FieldsAndValuesUpdateDSL.kt b/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/FieldsAndValuesUpdateDSL.kt
@@ -1,8 +1,8 @@
 package dev.gitlive.firebase.firestore
 
 import dev.gitlive.firebase.EncodeSettings
-import dev.gitlive.firebase.copyFrom
 import dev.gitlive.firebase.firestore.internal.FieldAndValue
+import dev.gitlive.firebase.internal.copyFrom
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule
diff --git a/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/Filter.kt b/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/Filter.kt
@@ -1,7 +1,7 @@
 package dev.gitlive.firebase.firestore
 
 import dev.gitlive.firebase.EncodeSettings
-import dev.gitlive.firebase.copyFrom
+import dev.gitlive.firebase.internal.copyFrom
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ public final class dev/gitlive/firebase/internal/EncodeDecodeSettingsBuilderImpl`
`31`	`31`	`public final class dev/gitlive/firebase/internal/EncodeDecodeSettingsKt {`
`32`	`32`	`public static final fun buildDecodeSettings (Ldev/gitlive/firebase/DecodeSettings$Builder;)Ldev/gitlive/firebase/DecodeSettings;`
`33`	`33`	`public static final fun buildEncodeSettings (Ldev/gitlive/firebase/EncodeSettings$Builder;)Ldev/gitlive/firebase/EncodeSettings;`
	`34`	`+ public static final fun copyFrom (Ldev/gitlive/firebase/DecodeSettings$Builder;Ldev/gitlive/firebase/DecodeSettings$Builder;)V`
	`35`	`+ public static final fun copyFrom (Ldev/gitlive/firebase/EncodeSettings$Builder;Ldev/gitlive/firebase/EncodeSettings$Builder;)V`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public final class dev/gitlive/firebase/internal/EncodeSettingsImpl : dev/gitlive/firebase/EncodeSettings {`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,6 @@ public abstract interface class dev/gitlive/firebase/EncodeDecodeSettings {`
`13`	`13`	`public abstract interface class dev/gitlive/firebase/EncodeDecodeSettingsBuilder : dev/gitlive/firebase/DecodeSettings$Builder, dev/gitlive/firebase/EncodeSettings$Builder {`
`14`	`14`	`}`
`15`	`15`
`16`		`-public final class dev/gitlive/firebase/EncodeDecodeSettingsKt {`
`17`		`- public static final fun copyFrom (Ldev/gitlive/firebase/DecodeSettings$Builder;Ldev/gitlive/firebase/DecodeSettings$Builder;)V`
`18`		`- public static final fun copyFrom (Ldev/gitlive/firebase/EncodeSettings$Builder;Ldev/gitlive/firebase/EncodeSettings$Builder;)V`
`19`		`-}`
`20`		`-`
`21`	`16`	`public abstract interface class dev/gitlive/firebase/EncodeSettings : dev/gitlive/firebase/EncodeDecodeSettings {`
`22`	`17`	`public abstract fun getEncodeDefaults ()Z`
`23`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,6 @@ public interface EncodeSettings : EncodeDecodeSettings {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-public fun EncodeSettings.Builder.copyFrom(other: EncodeSettings.Builder) {`
`31`		`- encodeDefaults = other.encodeDefaults`
`32`		`- serializersModule = other.serializersModule`
`33`		`-}`
`34`		`-`
`35`	`30`	`/**`
`36`	`31`	`* [EncodeDecodeSettings] used when decoding an object`
`37`	`32`	`* @param serializersModule the [SerializersModule] to use for deserialization. This allows for polymorphic serialization on runtime`
`@@ -43,10 +38,6 @@ public interface DecodeSettings : EncodeDecodeSettings {`
`43`	`38`	`}`
`44`	`39`	`}`
`45`	`40`
`46`		`-public fun DecodeSettings.Builder.copyFrom(other: DecodeSettings.Builder) {`
`47`		`- serializersModule = other.serializersModule`
`48`		`-}`
`49`		`-`
`50`	`41`	`public interface EncodeDecodeSettingsBuilder :`
`51`	`42`	`EncodeSettings.Builder,`
`52`	`43`	`DecodeSettings.Builder`