Skip to content

Commit cf57e95

Browse files
committed
Revert problematic fixes
1 parent bebceaf commit cf57e95

File tree

8 files changed

+19
-11
lines changed

8 files changed

+19
-11
lines changed

core/common/test/ClockTimeSourceTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ClockTimeSourceTest {
4646
assertEquals(1.days, mark.elapsedNow())
4747

4848
clock.instant -= 2.days
49-
assertEquals((-1).days, mark.elapsedNow())
49+
assertEquals(-1.days, mark.elapsedNow())
5050

5151
clock.instant = Instant.MAX
5252
assertEquals(Duration.INFINITE, mark.elapsedNow())
@@ -126,3 +126,4 @@ class ClockTimeSourceTest {
126126
assertEquals(clock1.now(), clock3.now())
127127
}
128128
}
129+

core/common/test/DeprecatedClockTimeSourceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class DeprecatedClockTimeSourceTest {
4343
assertEquals(1.days, mark.elapsedNow())
4444

4545
clock.instant -= 2.days
46-
assertEquals((-1).days, mark.elapsedNow())
46+
assertEquals(-1.days, mark.elapsedNow())
4747

4848
clock.instant = Instant.fromEpochSeconds(Long.MAX_VALUE)
4949
assertEquals(Duration.INFINITE, mark.elapsedNow())

core/common/test/assertions.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,27 @@ import kotlinx.datetime.DateTimeFormatException
99
import kotlin.test.assertFailsWith
1010
import kotlin.test.fail
1111

12-
inline fun <T> assertArithmeticFails(message: String? = null, f: () -> T) {
12+
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
13+
@kotlin.internal.InlineOnly
14+
internal inline fun <T> assertArithmeticFails(message: String? = null, f: () -> T) {
1315
assertFailsWith<DateTimeArithmeticException>(message) {
1416
val result = f()
1517
fail(result.toString())
1618
}
1719
}
1820

19-
inline fun <T> assertInvalidFormat(message: String? = null, f: () -> T) {
21+
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
22+
@kotlin.internal.InlineOnly
23+
internal inline fun <T> assertInvalidFormat(message: String? = null, f: () -> T) {
2024
assertFailsWith<DateTimeFormatException>(message) {
2125
val result = f()
2226
fail(result.toString())
2327
}
2428
}
2529

26-
inline fun <T> assertIllegalArgument(message: String? = null, f: () -> T) {
30+
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
31+
@kotlin.internal.InlineOnly
32+
internal inline fun <T> assertIllegalArgument(message: String? = null, f: () -> T) {
2733
assertFailsWith<IllegalArgumentException>(message) {
2834
val result = f()
2935
fail(result.toString())
@@ -33,4 +39,4 @@ inline fun <T> assertIllegalArgument(message: String? = null, f: () -> T) {
3339
/**
3440
* The number of iterations to perform in nondeterministic tests.
3541
*/
36-
const val STRESS_TEST_ITERATIONS = 1000
42+
const val STRESS_TEST_ITERATIONS = 1000

core/commonKotlin/src/UtcOffset.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ public actual class UtcOffset private constructor(public actual val totalSeconds
9797
@ThreadLocal
9898
private var utcOffsetCache: MutableMap<Int, UtcOffset> = mutableMapOf()
9999

100-
public actual fun UtcOffset(hours: Int?, minutes: Int?, seconds: Int?): UtcOffset =
100+
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // for IDE quickhelp in platform-specific user sourcesets + Dokka
101+
public actual fun UtcOffset(hours: Int? = null, minutes: Int? = null, seconds: Int? = null): UtcOffset =
101102
when {
102103
hours != null ->
103104
UtcOffset.ofHoursMinutesSeconds(hours, minutes ?: 0, seconds ?: 0)

core/jvm/src/UtcOffsetJvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public actual class UtcOffset(
5858
private fun writeReplace(): Any = Ser(Ser.UTC_OFFSET_TAG, this)
5959
}
6060

61-
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
61+
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") // for IDE quickhelp in platform-specific user sourcesets + Dokka
6262
public actual fun UtcOffset(hours: Int? = null, minutes: Int? = null, seconds: Int? = null): UtcOffset =
6363
try {
6464
when {

integration-testing/js-without-timezones/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ kotlin {
2222
sourceSets.all {
2323
val suffixIndex = name.indexOfLast { it.isUpperCase() }
2424
val targetName = name.substring(0, suffixIndex)
25-
val suffix = name.substring(suffixIndex).lowercase(Locale.ROOT).takeIf { it != "main" }
25+
val suffix = name.substring(suffixIndex).lowercase().takeIf { it != "main" }
2626
kotlin.srcDir("$targetName/${suffix ?: "src"}")
2727
resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}")
2828
}

integration-testing/serialization/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ kotlin {
7777
sourceSets.all {
7878
val suffixIndex = name.indexOfLast { it.isUpperCase() }
7979
val targetName = name.substring(0, suffixIndex)
80-
val suffix = name.substring(suffixIndex).lowercase(Locale.ROOT).takeIf { it != "main" }
80+
val suffix = name.substring(suffixIndex).lowercase().takeIf { it != "main" }
8181
kotlin.srcDir("$targetName/${suffix ?: "src"}")
8282
resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}")
8383
}

timezones/full/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ kotlin {
6565
sourceSets.all {
6666
val suffixIndex = name.indexOfLast { it.isUpperCase() }
6767
val targetName = name.substring(0, suffixIndex)
68-
val suffix = name.substring(suffixIndex).lowercase(Locale.ROOT).takeIf { it != "main" }
68+
val suffix = name.substring(suffixIndex).lowercase().takeIf { it != "main" }
6969
kotlin.srcDir("$targetName/${suffix ?: "src"}")
7070
resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}")
7171
}

0 commit comments

Comments
 (0)