diff --git a/realm/realm-library/src/androidTest/java/io/realm/RealmResultsTests.java b/realm/realm-library/src/androidTest/java/io/realm/RealmResultsTests.java index de9dca6e33..9577cfaadb 100644 --- a/realm/realm-library/src/androidTest/java/io/realm/RealmResultsTests.java +++ b/realm/realm-library/src/androidTest/java/io/realm/RealmResultsTests.java @@ -33,6 +33,7 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Calendar; import java.util.Collection; @@ -1939,7 +1940,7 @@ public void setValue_specificType_internalNameOnDynamicRealms() { @Test public void asJSON() throws JSONException { - Date date = Calendar.getInstance().getTime(); + Date date = Date.from(Calendar.getInstance().getTime().toInstant().truncatedTo(ChronoUnit.SECONDS)); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); // Core return dates in UTC time String now = sdf.format(date); @@ -2144,7 +2145,7 @@ public void asJSON_withEscaping() throws JSONException { @Test public void asJSON_cycles() throws JSONException { - Date date = Calendar.getInstance().getTime(); + Date date = Date.from(Calendar.getInstance().getTime().toInstant().truncatedTo(ChronoUnit.SECONDS)); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); // Core return dates in UTC time String now = sdf.format(date); diff --git a/realm/realm-library/src/main/cpp/realm-core b/realm/realm-library/src/main/cpp/realm-core index fb5bdccba1..96b1fd7165 160000 --- a/realm/realm-library/src/main/cpp/realm-core +++ b/realm/realm-library/src/main/cpp/realm-core @@ -1 +1 @@ -Subproject commit fb5bdccba1daad0bd6e65757a6a1596dc98cebf4 +Subproject commit 96b1fd71657d5bfb8c35908c67766e52b41bf4a5