smyalygames/checklist-tester
1
0
Fork 0
mirror of https://github.com/smyalygames/checklist-tester.git synced 2025-05-18 14:34:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(connector): move VDMJ to shared module

Browse Source
This commit is contained in:
Anthony Berg 2024-04-18 14:15:42 +01:00
parent 52dd166e49
commit b784ab9799
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
connector/server/build.gradle.kts
View File

@ -6,7 +6,6 @@ plugins {
} }
val sl4jVersion = "2.0.12" val sl4jVersion = "2.0.12"
val vdmjVersion = "4.5.0"
group = "io.anthonyberg.connector" group = "io.anthonyberg.connector"
version = "1.0.0" version = "1.0.0"
@ -25,6 +24,4 @@ dependencies {
implementation("io.ktor:ktor-server-content-negotiation-jvm") implementation("io.ktor:ktor-server-content-negotiation-jvm")
implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") implementation("io.ktor:ktor-serialization-kotlinx-json-jvm")
implementation("dk.au.ece.vdmj:vdmj:$vdmjVersion")
} }

2
connector/server/src/main/kotlin/io/anthonyberg/connector/routes/VDMJRoutes.kt
View File

@ -1,6 +1,6 @@
package io.anthonyberg.connector.routes package io.anthonyberg.connector.routes
import io.anthonyberg.connector.vdmj.vdmjExecute import io.anthonyberg.connector.shared.vdmj.vdmjExecute
import io.ktor.http.* import io.ktor.http.*
import io.ktor.server.application.* import io.ktor.server.application.*
import io.ktor.server.response.* import io.ktor.server.response.*

5
connector/shared/build.gradle.kts
View File

@ -10,6 +10,9 @@ val ktorVersion = "2.3.9"
val sqlDelightVersion = "2.0.2" val sqlDelightVersion = "2.0.2"
val dateTimeVersion = "0.5.0" val dateTimeVersion = "0.5.0"
val sl4jVersion = "2.0.12" val sl4jVersion = "2.0.12"
val vdmjVersion = "4.5.0"
// Testing Dependencies
val jupyterVersion = "5.10.1" val jupyterVersion = "5.10.1"
kotlin { kotlin {
@ -29,6 +32,8 @@ kotlin {
implementation("org.slf4j:slf4j-api:$sl4jVersion") implementation("org.slf4j:slf4j-api:$sl4jVersion")
implementation("org.slf4j:slf4j-reload4j:$sl4jVersion") implementation("org.slf4j:slf4j-reload4j:$sl4jVersion")
implementation("dk.au.ece.vdmj:vdmj:$vdmjVersion")
// this feels like the most godawful hack I have created, I am ashamed // this feels like the most godawful hack I have created, I am ashamed
implementation("gov.nasa.xpc-parent:xpc:1.4.0-SNAPSHOT") implementation("gov.nasa.xpc-parent:xpc:1.4.0-SNAPSHOT")

2
connector/server/src/main/kotlin/io/anthonyberg/connector/models/VDMJExpression.kt → connector/shared/src/commonMain/kotlin/io/anthonyberg/connector/shared/entity/VDMJExpression.kt
View File

@ -1,4 +1,4 @@
package io.anthonyberg.connector.models package io.anthonyberg.connector.shared.entity
import com.fujitsu.vdmj.ExitStatus import com.fujitsu.vdmj.ExitStatus
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

4
connector/server/src/main/kotlin/io/anthonyberg/connector/vdmj/VDMJ.kt → connector/shared/src/commonMain/kotlin/io/anthonyberg/connector/shared/vdmj/VDMJ.kt
View File

@ -1,4 +1,4 @@
package io.anthonyberg.connector.vdmj package io.anthonyberg.connector.shared.vdmj
import com.fujitsu.vdmj.Settings import com.fujitsu.vdmj.Settings
import com.fujitsu.vdmj.config.Properties import com.fujitsu.vdmj.config.Properties
@ -7,7 +7,7 @@ import com.fujitsu.vdmj.messages.ConsolePrintWriter
import com.fujitsu.vdmj.plugins.EventHub import com.fujitsu.vdmj.plugins.EventHub
import com.fujitsu.vdmj.plugins.Lifecycle import com.fujitsu.vdmj.plugins.Lifecycle
import com.fujitsu.vdmj.plugins.VDMJ import com.fujitsu.vdmj.plugins.VDMJ
import io.anthonyberg.connector.models.VDMJExpression import io.anthonyberg.connector.shared.entity.VDMJExpression
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.nio.file.Paths import java.nio.file.Paths
import kotlin.io.path.pathString import kotlin.io.path.pathString