Skip to content

Commit 0650da9

Browse files
dkhalanskyjbdkhalanskyjb
committed
Update the API dump and restore binary compatibility
1 parent 3ba120e commit 0650da9

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

‎core/api/kotlinx-datetime.api

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ public final class kotlinx/datetime/InstantKt {
256256
public static final fun isDistantFuture (Lkotlinx/datetime/Instant;)Z
257257
public static final fun isDistantPast (Lkotlinx/datetime/Instant;)Z
258258
public static final fun minus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
259+
public static final fun minus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
259260
public static final fun minus (Lkotlinx/datetime/Instant;JLkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
260261
public static final fun minus (Lkotlinx/datetime/Instant;JLkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
261262
public static final fun minus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimePeriod;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
@@ -265,10 +266,17 @@ public final class kotlinx/datetime/InstantKt {
265266
public static final fun minus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)J
266267
public static final fun minus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/DateTimePeriod;
267268
public static final fun monthsUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)I
269+
public static final fun periodUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/DateTimePeriod;
268270
public static final fun plus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
271+
public static final fun plus (Lkotlinx/datetime/Instant;ILkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
272+
public static final fun plus (Lkotlinx/datetime/Instant;JLkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
273+
public static final fun plus (Lkotlinx/datetime/Instant;JLkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
274+
public static final fun plus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimePeriod;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
269275
public static final fun plus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)Lkotlinx/datetime/Instant;
276+
public static final fun plus (Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)Lkotlinx/datetime/Instant;
270277
public static final fun toInstant (Ljava/lang/String;)Lkotlinx/datetime/Instant;
271278
public static final fun until (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit$TimeBased;)J
279+
public static final fun until (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/DateTimeUnit;Lkotlinx/datetime/TimeZone;)J
272280
public static final fun yearsUntil (Lkotlinx/datetime/Instant;Lkotlinx/datetime/Instant;Lkotlinx/datetime/TimeZone;)I
273281
}
274282

‎core/jvm/src/Instant.kt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package kotlinx.datetime
99
import kotlinx.datetime.format.*
1010
import kotlinx.datetime.internal.safeMultiply
1111
import kotlinx.datetime.internal.*
12+
import kotlinx.datetime.plus
1213
import kotlinx.datetime.serializers.*
1314
import kotlinx.serialization.Serializable
1415
import java.time.DateTimeException
@@ -107,3 +108,34 @@ internal actual fun Instant.plus(secondsToAdd: Long, nanosToAdd: Long): Instant
107108
} catch (e: DateTimeException) {
108109
throw IllegalArgumentException(e)
109110
}
111+
112+
@JvmName("minus") @PublishedApi internal fun minusJvm(instant: Instant, value: Int, unit: DateTimeUnit, timeZone: TimeZone): Instant =
113+
instant.minus(value, unit, timeZone)
114+
115+
@JvmName("periodUntil") @PublishedApi internal fun periodUntilJvm(
116+
start: Instant, end: Instant, timeZone: TimeZone
117+
): DateTimePeriod = start.periodUntil(end, timeZone)
118+
119+
@JvmName("plus") @PublishedApi internal fun plusJvm(
120+
instant: Instant, value: Int, unit: DateTimeUnit, timeZone: TimeZone
121+
): Instant = instant.plus(value, unit, timeZone)
122+
123+
@JvmName("plus") @PublishedApi internal fun plusJvm(
124+
instant: Instant, value: Long, unit: DateTimeUnit.TimeBased
125+
): Instant = instant.plus(value, unit)
126+
127+
@JvmName("plus") @PublishedApi internal fun plusJvm(
128+
instant: Instant, value: Long, unit: DateTimeUnit, timeZone: TimeZone
129+
): Instant = instant.plus(value, unit, timeZone)
130+
131+
@JvmName("plus") @PublishedApi internal fun plusJvm(
132+
instant: Instant, period: DateTimePeriod, timeZone: TimeZone
133+
): Instant = instant.plus(period, timeZone)
134+
135+
@JvmName("plus") @PublishedApi internal fun plusJvm(
136+
instant: Instant, unit: DateTimeUnit, timeZone: TimeZone
137+
): Instant = instant.plus(1, unit, timeZone)
138+
139+
@JvmName("until") @PublishedApi internal fun untilJvm(
140+
start: Instant, end: Instant, unit: DateTimeUnit, timeZone: TimeZone
141+
): Long = start.until(end, unit, timeZone)

0 commit comments

Comments
 (0)