Skip to content

Commit 887b3c8

Browse files
committed
Build: upgrade to Kotlin 1.9.23 and other dependencies
1 parent b7c726e commit 887b3c8

File tree

8 files changed

+24
-27
lines changed

8 files changed

+24
-27
lines changed

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ buildscript {
88

99
versions = [
1010
// Kotlin multiplatform versions.
11-
kotlin:'1.9.21',
12-
serialization:'1.6.1',
13-
coroutines:'1.7.3',
14-
datetime:'0.4.1',
11+
kotlin:'1.9.23',
12+
serialization:'1.6.3',
13+
coroutines:'1.8.0',
14+
datetime:'0.5.0',
1515

1616
// JVM versions.
1717
jvmTarget:'1.8',
18-
dokkaPlugin:'1.8.10',
18+
dokkaPlugin:'1.9.20',
1919
reflections:'0.10.2',
2020

2121
// JS versions.
22-
nodePlugin:'7.0.1',
22+
nodePlugin:'7.0.2',
2323
bigJs:'6.2.1',
2424

2525
// DevOps versions.
26-
detektPlugin:'1.23.1',
26+
detektPlugin:'1.23.5',
2727
detektVerifyImplementation:'1.2.5',
2828
nexusPublishPlugin:'1.3.0',
29-
apacheCommons:'2.11.0'
29+
apacheCommons:'2.15.1'
3030
]
3131

3232
commonModule = subprojects.find { it.name == 'carp.common' }

carp.common/src/commonMain/kotlin/dk/cachet/carp/common/infrastructure/serialization/Serialization.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ val COMMON_SERIAL_MODULE = SerializersModule {
3131
subclass( HeartRate::class )
3232
subclass( InterbeatInterval::class )
3333
subclass( NonGravitationalAcceleration::class )
34-
// HACK: explicit serializer needs to be registered for object declarations due to limitation of the JS legacy backend.
35-
// https://github.com/Kotlin/kotlinx.serialization/issues/1138#issuecomment-707989920
36-
// This can likely be removed once we upgrade to the new IR backend.
37-
subclass( NoData::class, NoData.serializer() )
34+
subclass( NoData::class )
3835
subclass( PPG::class )
3936
subclass( SignalStrength::class )
4037
subclass( SensorSkinContact::class )
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
declare module "@cachet/Kotlin-DateTime-library-kotlinx-datetime-js-ir"
1+
declare module "@cachet/Kotlin-DateTime-library-kotlinx-datetime"
22
{
33
namespace $_$
44
{
55
interface System
66
{
77
// now
8-
l1e(): Instant_0
8+
q13(): Instant_0
99
}
1010
function System_getInstance(): System
1111

1212
interface Instant_0
1313
{
1414
// toEpochMilliseconds
15-
y1e(): number
15+
d14(): number
1616
}
1717
}
1818
}

typescript-declarations/carp-kotlinx-datetime/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="Kotlin-DateTime-library-kotlinx-datetime-js-ir.d.ts" />
2-
import extend from "@cachet/Kotlin-DateTime-library-kotlinx-datetime-js-ir"
1+
/// <reference path="Kotlin-DateTime-library-kotlinx-datetime.d.ts" />
2+
import extend from "@cachet/Kotlin-DateTime-library-kotlinx-datetime"
33

44

55
// Facade with better method names and type conversions for internal types.
@@ -21,7 +21,7 @@ export namespace kotlinx.datetime
2121

2222

2323
// Augment internal types to implement facade.
24-
declare module "@cachet/Kotlin-DateTime-library-kotlinx-datetime-js-ir"
24+
declare module "@cachet/Kotlin-DateTime-library-kotlinx-datetime"
2525
{
2626
namespace $_$
2727
{
@@ -34,8 +34,8 @@ declare module "@cachet/Kotlin-DateTime-library-kotlinx-datetime-js-ir"
3434

3535

3636
// Implement base interfaces in internal types.
37-
extend.$_$.System.prototype.now = function(): kotlinx.datetime.Instant { return this.l1e(); };
38-
extend.$_$.Instant_0.prototype.toEpochMilliseconds = function(): number { return this.y1e(); };
37+
extend.$_$.System.prototype.now = function(): kotlinx.datetime.Instant { return this.q13(); };
38+
extend.$_$.Instant_0.prototype.toEpochMilliseconds = function(): number { return this.d14(); };
3939

4040

4141
// Export facade.

typescript-declarations/carp-kotlinx-serialization/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import extendJson from "@cachet/kotlinx-serialization-kotlinx-serialization-json
77
// Facade with better method names and type conversions for internal types.
88
export namespace kotlinx.serialization
99
{
10-
export function getSerializer( type: any ) { return type.Companion.c16() }
10+
export function getSerializer( type: any ) { return type.Companion.t16() }
1111
}
1212
export namespace kotlinx.serialization.json
1313
{
@@ -44,12 +44,12 @@ declare module "@cachet/kotlinx-serialization-kotlinx-serialization-json"
4444
extendJson.$_$.JsonImpl.prototype.encodeToString =
4545
function( serializer: any, value: any ): string
4646
{
47-
return this.t13( serializer, value );
47+
return this.i14( serializer, value );
4848
};
4949
extendJson.$_$.JsonImpl.prototype.decodeFromString =
5050
function( serializer: any, string: string ): any
5151
{
52-
return this.u13( serializer, string );
52+
return this.j14( serializer, string );
5353
};
5454

5555

typescript-declarations/carp-kotlinx-serialization/kotlinx-serialization-kotlinx-serialization-json.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ declare module "@cachet/kotlinx-serialization-kotlinx-serialization-json"
55
interface JsonImpl
66
{
77
// encodeToString
8-
t13( serializer: any, instance: any ): string
8+
i14( serializer: any, instance: any ): string
99

1010
// decodeFromString
11-
u13( serializer: any, string: string ): string
11+
j14( serializer: any, string: string ): string
1212
}
1313
function Default_getInstance(): JsonImpl
1414
}

typescript-declarations/tests/carp-kotlinx-datetime-test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ describe( "kotlinx-datetime", () => {
1313
]
1414

1515
const moduleVerifier = new VerifyModule(
16-
'@cachet/Kotlin-DateTime-library-kotlinx-datetime-js-ir',
17-
'./carp-kotlinx-datetime/Kotlin-DateTime-library-kotlinx-datetime-js-ir.d.ts',
16+
'@cachet/Kotlin-DateTime-library-kotlinx-datetime',
17+
'./carp-kotlinx-datetime/Kotlin-DateTime-library-kotlinx-datetime.d.ts',
1818
instances
1919
)
2020
await moduleVerifier.verify()

0 commit comments

Comments
 (0)