Skip to content

Commit d250c64

Browse files
committed
core: add unit and kotlin adapters to osrd error adapter
1 parent e21379d commit d250c64

File tree

4 files changed

+24
-91
lines changed

4 files changed

+24
-91
lines changed

core/kt-osrd-utils/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ dependencies {
1818
// PLEASE ADD AND UPDATE DEPENDENCIES USING libs.versions.toml
1919
implementation project(':kt-fast-collections')
2020
ksp project(':kt-fast-collections-generator')
21-
api project(':osrd-reporting')
2221

2322
// JSON parsing
2423
implementation libs.moshi

core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/DiscreteEventSimulation.kt

-88
This file was deleted.

core/osrd-reporting/build.gradle

+16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'java'
33
id 'jacoco'
4+
alias(libs.plugins.kotlin.jvm)
45
}
56

67
repositories {
@@ -15,10 +16,14 @@ java {
1516

1617
dependencies {
1718
// PLEASE ADD AND UPDATE DEPENDENCIES USING libs.versions.toml
19+
api project(':kt-osrd-utils')
20+
21+
implementation libs.kotlin.stdlib
1822

1923
//moshi
2024
implementation libs.moshi
2125
implementation libs.moshi.adapters
26+
implementation libs.moshi.kotlin
2227

2328
//class-graph
2429
implementation libs.classgraph
@@ -39,3 +44,14 @@ test {
3944
includeEngines 'jqwik', 'junit-jupiter'
4045
}
4146
}
47+
48+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
49+
kotlinOptions {
50+
freeCompilerArgs += [
51+
"-opt-in=kotlin.RequiresOptIn",
52+
"-opt-in=kotlin.ExperimentalUnsignedTypes",
53+
"-opt-in=kotlin.time.ExperimentalTime",
54+
"-opt-in=kotlin.contracts.ExperimentalContracts",
55+
]
56+
}
57+
}

core/osrd-reporting/src/main/java/fr/sncf/osrd/reporting/exceptions/OSRDError.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package fr.sncf.osrd.reporting.exceptions;
22

3-
import com.squareup.moshi.*;
43
import com.squareup.moshi.JsonAdapter;
4+
import com.squareup.moshi.KotlinJsonAdapterFactory;
5+
import com.squareup.moshi.Moshi;
56
import fr.sncf.osrd.reporting.ErrorContext;
67
import fr.sncf.osrd.reporting.warnings.DiagnosticRecorder;
78
import fr.sncf.osrd.reporting.warnings.Warning;
9+
import fr.sncf.osrd.utils.json.UnitAdapterFactory;
810
import java.io.IOException;
911
import java.io.ObjectInputStream;
1012
import java.io.Serial;
@@ -456,7 +458,11 @@ public String getMessage() {
456458
public static final JsonAdapter<OSRDError> adapter;
457459

458460
static {
459-
Moshi moshi = new Moshi.Builder().build();
461+
@SuppressWarnings("deprecation")
462+
Moshi moshi = new Moshi.Builder()
463+
.addLast(new UnitAdapterFactory())
464+
.addLast(new KotlinJsonAdapterFactory())
465+
.build();
460466
adapter = moshi.adapter(OSRDError.class);
461467
}
462468

0 commit comments

Comments
 (0)