Skip to content

Commit 5f7366f

Browse files
dkhalanskyjbdkhalanskyjb
committed
Deprecate Instant while ensuring binary compatibility
1 parent 2b05779 commit 5f7366f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2727
-1032
lines changed

‎core/api/kotlinx-datetime.api

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@ public final class kotlinx/datetime/Clock$System : kotlinx/datetime/Clock {
1212
}
1313

1414
public final class kotlinx/datetime/ClockKt {
15-
public static final fun asClock (Lkotlin/time/TimeSource;Lkotlinx/datetime/Instant;)Lkotlinx/datetime/Clock;
15+
public static final fun asClock (Lkotlin/time/TimeSource;Lkotlinx/time/Instant;)Lkotlinx/time/Clock;
1616
public static final fun asTimeSource (Lkotlinx/datetime/Clock;)Lkotlin/time/TimeSource$WithComparableMarks;
17+
public static final fun asTimeSource (Lkotlinx/time/Clock;)Lkotlin/time/TimeSource$WithComparableMarks;
18+
public static final fun toDeprecatedClock (Lkotlinx/time/Clock;)Lkotlinx/datetime/Clock;
19+
public static final fun toStdlibClock (Lkotlinx/datetime/Clock;)Lkotlinx/time/Clock;
1720
public static final fun todayAt (Lkotlinx/datetime/Clock;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/LocalDate;
21+
public static final fun todayAt (Lkotlinx/time/Clock;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/LocalDate;
1822
public static final fun todayIn (Lkotlinx/datetime/Clock;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/LocalDate;
23+
public static final fun todayIn (Lkotlinx/time/Clock;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/LocalDate;
1924
}
2025

2126
public final class kotlinx/datetime/ConvertersKt {
@@ -240,19 +245,30 @@ public final class kotlinx/datetime/Instant$Companion {
240245

241246
public final class kotlinx/datetime/InstantJvmKt {
242247
public static final fun minus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
248+
public static final fun minus (Lkotlinx/time/Instant;ILkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
243249
public static final fun periodUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/DateTimePeriod;
250+
public static final fun periodUntil (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/DateTimePeriod;
244251
public static final fun plus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
245252
public static final fun plus (Lkotlinx/datetime/Instant;JLkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
246253
public static final fun plus (Lkotlinx/datetime/Instant;JLkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
247254
public static final fun plus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimePeriod;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
248255
public static final fun plus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
256+
public static final fun plus (Lkotlinx/time/Instant;ILkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
257+
public static final fun plus (Lkotlinx/time/Instant;JLkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/time/Instant;
258+
public static final fun plus (Lkotlinx/time/Instant;JLkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
259+
public static final fun plus (Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimePeriod;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
260+
public static final fun plus (Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
249261
public static final fun until (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)J
262+
public static final fun until (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)J
250263
}
251264

252265
public final class kotlinx/datetime/InstantKt {
253266
public static final fun daysUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)I
267+
public static final fun daysUntil (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)I
254268
public static final fun format (Lkotlinx/datetime/Instant;Lkotlinx/datetime/format/DateTimeFormat;Lkotlinx/datetime/UtcOffset;)Ljava/lang/String;
269+
public static final fun format (Lkotlinx/time/Instant;Lkotlinx/datetime/format/DateTimeFormat;Lkotlinx/datetime/UtcOffset;)Ljava/lang/String;
255270
public static synthetic fun format$default (Lkotlinx/datetime/Instant;Lkotlinx/datetime/format/DateTimeFormat;Lkotlinx/datetime/UtcOffset;ILjava/lang/Object;)Ljava/lang/String;
271+
public static synthetic fun format$default (Lkotlinx/time/Instant;Lkotlinx/datetime/format/DateTimeFormat;Lkotlinx/datetime/UtcOffset;ILjava/lang/Object;)Ljava/lang/String;
256272
public static final fun isDistantFuture (Lkotlinx/datetime/Instant;)Z
257273
public static final fun isDistantPast (Lkotlinx/datetime/Instant;)Z
258274
public static final fun minus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
@@ -264,12 +280,29 @@ public final class kotlinx/datetime/InstantKt {
264280
public static final fun minus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)J
265281
public static final fun minus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)J
266282
public static final fun minus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/DateTimePeriod;
283+
public static final fun minus (Lkotlinx/time/Instant;ILkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/time/Instant;
284+
public static final fun minus (Lkotlinx/time/Instant;JLkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/time/Instant;
285+
public static final fun minus (Lkotlinx/time/Instant;JLkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
286+
public static final fun minus (Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimePeriod;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
287+
public static final fun minus (Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/time/Instant;
288+
public static final fun minus (Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/time/Instant;
289+
public static final fun minus (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)J
290+
public static final fun minus (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)J
291+
public static final fun minus (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/DateTimePeriod;
267292
public static final fun monthsUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)I
293+
public static final fun monthsUntil (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)I
294+
public static final fun parse (Lkotlinx/time/Instant$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;)Lkotlinx/time/Instant;
268295
public static final fun plus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
269296
public static final fun plus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
297+
public static final fun plus (Lkotlinx/time/Instant;ILkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/time/Instant;
298+
public static final fun plus (Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/time/Instant;
299+
public static final fun toDeprecatedInstant (Lkotlinx/time/Instant;)Lkotlinx/datetime/Instant;
270300
public static final fun toInstant (Ljava/lang/String;)Lkotlinx/datetime/Instant;
301+
public static final fun toStdlibInstant (Lkotlinx/datetime/Instant;)Lkotlinx/time/Instant;
271302
public static final fun until (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)J
303+
public static final fun until (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)J
272304
public static final fun yearsUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)I
305+
public static final fun yearsUntil (Lkotlinx/time/Instant;Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)I
273306
}
274307

275308
public final class kotlinx/datetime/LocalDate : java/io/Serializable, java/lang/Comparable {
@@ -474,6 +507,9 @@ public final class kotlinx/datetime/MonthKt {
474507
public static final fun getNumber (Lkotlinx/datetime/Month;)I
475508
}
476509

510+
public final class kotlinx/datetime/OverloadMarker {
511+
}
512+
477513
public final class kotlinx/datetime/Ser : java/io/Externalizable {
478514
public static final field Companion Lkotlinx/datetime/Ser$Companion;
479515
public static final field DATE_TAG I
@@ -495,7 +531,10 @@ public class kotlinx/datetime/TimeZone {
495531
public final fun getId ()Ljava/lang/String;
496532
public fun hashCode ()I
497533
public final fun toInstant (Lkotlinx/datetime/LocalDateTime;)Lkotlinx/datetime/Instant;
534+
public final fun toInstant (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/OverloadMarker;)Lkotlinx/time/Instant;
535+
public static synthetic fun toInstant$default (Lkotlinx/datetime/TimeZone;Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/OverloadMarker;ILjava/lang/Object;)Lkotlinx/time/Instant;
498536
public final fun toLocalDateTime (Lkotlinx/datetime/Instant;)Lkotlinx/datetime/LocalDateTime;
537+
public final fun toLocalDateTime (Lkotlinx/time/Instant;)Lkotlinx/datetime/LocalDateTime;
499538
public fun toString ()Ljava/lang/String;
500539
}
501540

@@ -509,11 +548,21 @@ public final class kotlinx/datetime/TimeZone$Companion {
509548

510549
public final class kotlinx/datetime/TimeZoneKt {
511550
public static final fun atStartOfDayIn (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
551+
public static final fun atStartOfDayIn (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/TimeZone;Lkotlinx/datetime/OverloadMarker;)Lkotlinx/time/Instant;
552+
public static synthetic fun atStartOfDayIn$default (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/TimeZone;Lkotlinx/datetime/OverloadMarker;ILjava/lang/Object;)Lkotlinx/time/Instant;
512553
public static final fun offsetAt (Lkotlinx/datetime/TimeZone;Lkotlinx/datetime/Instant;)Lkotlinx/datetime/UtcOffset;
554+
public static final fun offsetAt (Lkotlinx/datetime/TimeZone;Lkotlinx/time/Instant;)Lkotlinx/datetime/UtcOffset;
513555
public static final fun offsetIn (Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/UtcOffset;
556+
public static final fun offsetIn (Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/UtcOffset;
514557
public static final fun toInstant (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
558+
public static final fun toInstant (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;Lkotlinx/datetime/OverloadMarker;)Lkotlinx/time/Instant;
515559
public static final fun toInstant (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/UtcOffset;)Lkotlinx/datetime/Instant;
560+
public static final fun toInstant (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/UtcOffset;Lkotlinx/datetime/OverloadMarker;)Lkotlinx/time/Instant;
561+
public static synthetic fun toInstant$default (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;Lkotlinx/datetime/OverloadMarker;ILjava/lang/Object;)Lkotlinx/time/Instant;
562+
public static synthetic fun toInstant$default (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/UtcOffset;Lkotlinx/datetime/OverloadMarker;ILjava/lang/Object;)Lkotlinx/time/Instant;
516563
public static final fun toLocalDateTime (Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/LocalDateTime;
564+
public static final fun toLocalDateTime (Lkotlinx/datetime/Instant;Lkotlinx/datetime/UtcOffset;)Lkotlinx/datetime/LocalDateTime;
565+
public static final fun toLocalDateTime (Lkotlinx/time/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/LocalDateTime;
517566
}
518567

519568
public final class kotlinx/datetime/UtcOffset : java/io/Serializable {
@@ -586,6 +635,7 @@ public final class kotlinx/datetime/format/DateTimeComponents {
586635
public final fun setDateTime (Lkotlinx/datetime/LocalDateTime;)V
587636
public final fun setDateTimeOffset (Lkotlinx/datetime/Instant;Lkotlinx/datetime/UtcOffset;)V
588637
public final fun setDateTimeOffset (Lkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/UtcOffset;)V
638+
public final fun setDateTimeOffset (Lkotlinx/time/Instant;Lkotlinx/datetime/UtcOffset;)V
589639
public final fun setDay (Ljava/lang/Integer;)V
590640
public final fun setDayOfMonth (Ljava/lang/Integer;)V
591641
public final fun setDayOfWeek (Lkotlinx/datetime/DayOfWeek;)V
@@ -606,6 +656,8 @@ public final class kotlinx/datetime/format/DateTimeComponents {
606656
public final fun setTimeZoneId (Ljava/lang/String;)V
607657
public final fun setYear (Ljava/lang/Integer;)V
608658
public final fun toInstantUsingOffset ()Lkotlinx/datetime/Instant;
659+
public final fun toInstantUsingOffset (Lkotlinx/datetime/OverloadMarker;)Lkotlinx/time/Instant;
660+
public static synthetic fun toInstantUsingOffset$default (Lkotlinx/datetime/format/DateTimeComponents;Lkotlinx/datetime/OverloadMarker;ILjava/lang/Object;)Lkotlinx/time/Instant;
609661
public final fun toLocalDate ()Lkotlinx/datetime/LocalDate;
610662
public final fun toLocalDateTime ()Lkotlinx/datetime/LocalDateTime;
611663
public final fun toLocalTime ()Lkotlinx/datetime/LocalTime;

0 commit comments

Comments
 (0)