Skip to content

Commit

Permalink
fix: generate to java instead of kotlin
Browse files Browse the repository at this point in the history
It's simpler and more stable.
We have to reduce the complexity of the project and will focus on the
server side version of the editor first.
  • Loading branch information
slisson committed Oct 23, 2024
1 parent 308beda commit 4fc5df3
Show file tree
Hide file tree
Showing 36 changed files with 2,096 additions and 3,990 deletions.
13 changes: 7 additions & 6 deletions editor-common-mps/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,19 @@ tasks {
outputFolder(defaultDestinationDir.get().resolve(project.name).resolve("languages"))
runtimeJars.forEach {
javaJar(it.name)
kotlinJar(it.name)
// kotlinJar(it.name)
}
kotlinJarFromMPS("util-8.jar")
// kotlinJarFromMPS("util-8.jar")
javaJarFromMPS("util-8.jar")
kotlinJarFromMPS("annotations.jar")
// kotlinJarFromMPS("annotations.jar")
moduleDependency(KnownModuleIds.Annotations)
moduleDependency(KnownModuleIds.JDK)
moduleDependency(KnownModuleIds.MPS_OpenAPI)
moduleDependency(KnownModuleIds.MPS_Core)
moduleDependency(KnownModuleIds.MPS_IDEA)
moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
// moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib)
// moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stdlib_jvm)
// moduleDependency(KnownModuleIds.jetbrains_mps_kotlin_stubs)
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions mps/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<project version="4">
<component name="MPSProject">
<projectModules>
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.baseLanguage2kotlin/org.modelix.mps.baseLanguage2kotlin.mpl" folder="text" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.baseLanguageInsideKotlin/org.modelix.mps.baseLanguageInsideKotlin.mpl" folder="text" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd" folder="text" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl" folder="text" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd" folder="react" />
Expand Down
4 changes: 0 additions & 4 deletions mps/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@ mpsBuild {
publication("editor-languages") {
module("org.modelix.mps.webaspect.devkit")
module("org.modelix.mps.webaspect.genplan")
module("org.modelix.mps.baseLanguage2kotlin")
module("org.modelix.mps.notation")
}
publication("baseLanguage-notation") {
module("org.modelix.mps.notation.impl.baseLanguage")
}
publication("baseLanguageInsideKotlin") {
module("org.modelix.mps.baseLanguageInsideKotlin")
}
publication("react") {
module("org.modelix.mps.react")
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4fc5df3

Please sign in to comment.