fix after merge

Author: tom-andersen

firebase-firestore/src/main/java/com/google/firebase/firestore/Pipeline.kt

@@ -131,7 +131,7 @@ class Pipeline
 private constructor(
   firestore: FirebaseFirestore,
   userDataReader: UserDataReader,
-  stages: FluentIterable<Stage<*>>
+  stages: FluentIterable<BaseStage<*>>
 ) : AbstractPipeline(firestore, userDataReader, stages) {
   internal constructor(
     firestore: FirebaseFirestore,
@@ -760,15 +760,15 @@ class RealtimePipeline
 internal constructor(
   firestore: FirebaseFirestore,
   userDataReader: UserDataReader,
-  stages: FluentIterable<Stage<*>>
+  stages: FluentIterable<BaseStage<*>>
 ) : AbstractPipeline(firestore, userDataReader, stages) {
   internal constructor(
     firestore: FirebaseFirestore,
     userDataReader: UserDataReader,
-    stage: Stage<*>
+    stage: BaseStage<*>
   ) : this(firestore, userDataReader, FluentIterable.of(stage))
 
-  private fun append(stage: Stage<*>): RealtimePipeline {
+  private fun append(stage: BaseStage<*>): RealtimePipeline {
     return RealtimePipeline(firestore, userDataReader, stages.append(stage))
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.kt

@@ -663,14 +663,17 @@ internal object Values {
     )
   }
 
+  @JvmStatic
+  fun encodeValue(value: Timestamp): Value = Value.newBuilder().setTimestampValue(value).build()
+
   @JvmField
-  val TRUE: Value = Value.newBuilder().setBooleanValue(true).build()
+  val TRUE_VALUE: Value = Value.newBuilder().setBooleanValue(true).build()
 
   @JvmField
-  val FALSE: Value = Value.newBuilder().setBooleanValue(false).build()
+  val FALSE_VALUE: Value = Value.newBuilder().setBooleanValue(false).build()
 
   @JvmStatic
-  fun encodeValue(value: Boolean): Value = if (value) TRUE else FALSE
+  fun encodeValue(value: Boolean): Value = if (value) TRUE_VALUE else FALSE_VALUE
 
   @JvmStatic
   fun encodeValue(geoPoint: GeoPoint): Value =

firebase-firestore/src/main/java/com/google/firebase/firestore/pipeline/expressions.kt

@@ -2954,7 +2954,8 @@ abstract class Expr internal constructor() {
      * @return A new [BooleanExpr] representing the ifError operation.
      */
     @JvmStatic
-    fun ifError(tryExpr: BooleanExpr, catchExpr: BooleanExpr): BooleanExpr = BooleanExpr("if_error", tryExpr, catchExpr)
+    fun ifError(tryExpr: BooleanExpr, catchExpr: BooleanExpr): BooleanExpr =
+      BooleanExpr("if_error", notImplemented, tryExpr, catchExpr)
 
     /**
      * Creates an expression that returns the [catchValue] argument if there is an error, else
@@ -4217,9 +4218,10 @@ internal constructor(name: String, function: EvaluateFunction, params: Array<out
   ) : this(name, function, arrayOf(param))
   internal constructor(
     name: String,
+    function: EvaluateFunction,
     param1: Expr,
     param2: Any
-  ) : this(name, arrayOf(param1, toExprOrConstant(param2)))
+  ) : this(name, function, arrayOf(param1, toExprOrConstant(param2)))
   internal constructor(
     name: String,
     function: EvaluateFunction,