Skip to content
This repository was archived by the owner on Jan 19, 2025. It is now read-only.

build: replace local Simple-ML Jar with remote Safe-DS Jar #649

Merged
merged 3 commits into from
Jun 16, 2022
Merged

build: replace local Simple-ML Jar with remote Safe-DS Jar #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d611705
build: replace local Simple-ML Jar with remote Safe-DS Jar
lars-reimann Jun 16, 2022
391a484
build: fix wrong main class
lars-reimann Jun 16, 2022
f33319d
style: apply automatic fixes of linters
lars-reimann Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions api-editor/backend/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
}

application {
mainClass.set("com.larsreimann.api_editor.backend.ApplicationKt")
mainClass.set("com.larsreimann.api_editor.server.ApplicationKt")
}

java {
Expand All @@ -36,15 +36,14 @@ dependencies {
implementation("io.ktor:ktor-server:$ktorVersion")
implementation("io.ktor:ktor-server-netty:$ktorVersion")
implementation("com.larsreimann:modeling-core:2.0.0")
implementation("com.larsreimann.safe-ds:safe-ds-core:1.0.0")

// We can later pull this from Maven Central (or some other repo) once published
implementation(files("lib/de.unibonn.simpleml-1.0.0-SNAPSHOT.jar"))
// Required, otherwise serializeToFormattedString does not compile
implementation("org.eclipse.xtext:org.eclipse.xtext:2.27.0")

testImplementation(kotlin("test"))
testImplementation("io.kotest:kotest-assertions-core-jvm:5.3.0")
testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
testImplementation("io.mockk:mockk:1.12.4")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.2")
}
Expand Down
Binary file removed api-editor/backend/lib/de.unibonn.simpleml-1.0.0-SNAPSHOT.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions api-editor/backend/src/main/kotlin/com/larsreimann/api_editor/codegen/CodeGenerationPlan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.larsreimann.api_editor.codegen

import com.larsreimann.api_editor.mutable_model.PythonModule
import com.larsreimann.api_editor.mutable_model.PythonPackage
import de.unibonn.simpleml.constant.SmlFileExtension
import com.larsreimann.safeds.constant.SdsFileExtension
import java.io.BufferedInputStream
import java.io.BufferedOutputStream
import java.io.File
Expand Down Expand Up @@ -41,7 +41,7 @@ private fun createStubFile(workingDirectory: File, module: PythonModule) {
workingDirectory
.resolve("stub")
.resolve(module.name.replace('.', '/'))
.resolve(module.name.split(".").last() + "." + SmlFileExtension.Stub)
.resolve(module.name.split(".").last() + "." + SdsFileExtension.Stub)
.createFile(module.toStubCode())
}

Expand Down
Loading