Remove kotlinx.datetime.Instant support

Author: eranl

firebase-firestore/firebase-firestore.gradle

@@ -147,7 +147,6 @@ dependencies {
 
     compileOnly libs.autovalue.annotations
     compileOnly libs.javax.annotation.jsr250
-    compileOnly libs.kotlinx.datetime
 
     annotationProcessor libs.autovalue
 
@@ -165,7 +164,6 @@ dependencies {
     testImplementation libs.hamcrest.junit
     testImplementation libs.mockito.core
     testImplementation libs.robolectric
-    testImplementation libs.kotlinx.datetime
 
     testCompileOnly libs.protobuf.java
 

firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java

@@ -183,10 +183,6 @@ private static <T> Object serialize(T o, ErrorPath path) {
     } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && o instanceof Instant) {
       Instant instant = (Instant) o;
       return new Timestamp(instant.getEpochSecond(), instant.getNano());
-    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-        && o instanceof kotlinx.datetime.Instant) {
-      kotlinx.datetime.Instant instant = (kotlinx.datetime.Instant) o;
-      return new Timestamp(instant.getEpochSeconds(), instant.getNanosecondsOfSecond());
     } else if (o instanceof Uri || o instanceof URI || o instanceof URL) {
       return o.toString();
     } else {
@@ -250,9 +246,6 @@ private static <T> T deserializeToClass(Object o, Class<T> clazz, DeserializeCon
     } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
         && Instant.class.isAssignableFrom(clazz)) {
       return (T) convertInstant(o, context);
-    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-        && kotlinx.datetime.Instant.class.isAssignableFrom(clazz)) {
-      return (T) new kotlinx.datetime.Instant(convertInstant(o, context));
     } else if (Blob.class.isAssignableFrom(clazz)) {
       return (T) convertBlob(o, context);
     } else if (GeoPoint.class.isAssignableFrom(clazz)) {
@@ -965,8 +958,7 @@ private void applyFieldAnnotations(Field field) {
         Class<?> fieldType = field.getType();
         if (fieldType != Date.class
             && fieldType != Timestamp.class
-            && !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-                && (fieldType == Instant.class || fieldType == kotlinx.datetime.Instant.class))) {
+            && !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && fieldType == Instant.class)) {
           throw new IllegalArgumentException(
               "Field "
                   + field.getName()
@@ -989,8 +981,7 @@ private void applyGetterAnnotations(Method method) {
         Class<?> returnType = method.getReturnType();
         if (returnType != Date.class
             && returnType != Timestamp.class
-            && !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-                && (returnType == Instant.class || returnType == kotlinx.datetime.Instant.class))) {
+            && !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && returnType == Instant.class)) {
           throw new IllegalArgumentException(
               "Method "
                   + method.getName()

firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java

@@ -102,7 +102,6 @@ private static class TimeBean {
     public Timestamp timestamp;
     public Date date;
     public Instant instant;
-    public kotlinx.datetime.Instant instantKt;
 
     @Override
     public boolean equals(Object o) {
@@ -112,13 +111,12 @@ public boolean equals(Object o) {
       TimeBean timeBean = (TimeBean) o;
       return Objects.equals(timestamp, timeBean.timestamp)
           && Objects.equals(date, timeBean.date)
-          && Objects.equals(instant, timeBean.instant)
-          && Objects.equals(instantKt, timeBean.instantKt);
+          && Objects.equals(instant, timeBean.instant);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(timestamp, date, instant, instantKt);
+      return Objects.hash(timestamp, date, instant);
     }
 
     @Override
@@ -130,8 +128,6 @@ public String toString() {
           + timestamp
           + ", _instant="
           + instant
-          + ", _instantKt="
-          + instantKt
           + '}';
     }
   }
@@ -1523,17 +1519,8 @@ public void serializeTimeBean() {
     bean.instant = Instant.ofEpochSecond(1234, 5678);
     bean.timestamp = new Timestamp(bean.instant);
     bean.date = new Date(1234);
-    bean.instantKt = new kotlinx.datetime.Instant(bean.instant);
     assertEquals(
-        Map.of(
-            "timestamp",
-            bean.timestamp,
-            "date",
-            bean.date,
-            "instant",
-            bean.timestamp,
-            "instantKt",
-            bean.timestamp),
+        Map.of("timestamp", bean.timestamp, "date", bean.date, "instant", bean.timestamp),
         serialize(bean));
   }
 
@@ -1543,19 +1530,10 @@ public void deserializeTimeBean() {
     bean.instant = Instant.ofEpochSecond(1234, 5678);
     bean.timestamp = new Timestamp(bean.instant);
     bean.date = new Date(1234);
-    bean.instantKt = new kotlinx.datetime.Instant(bean.instant);
     assertEquals(
         bean,
         convertToCustomClass(
-            Map.of(
-                "timestamp",
-                bean.timestamp,
-                "date",
-                bean.date,
-                "instant",
-                bean.timestamp,
-                "instantKt",
-                bean.timestamp),
+            Map.of("timestamp", bean.timestamp, "date", bean.date, "instant", bean.timestamp),
             TimeBean.class));
   }