From 61c386a7c2480b503798bd00b7b349d8f68025df Mon Sep 17 00:00:00 2001
From: Rico Bergmann <rico.bergmann1@tu-dresden.de>
Date: Fri, 21 Sep 2018 15:20:43 +0200
Subject: [PATCH] Prepare project for assembly
This will disable other App files to prevent issues due to multiple `main` methods.
Also the latest SCROLL, which temporarily disables loading the CROM
metamodel is used now. Otherwise the generator would not be able to be invoked
correctly.
---
lib/SCROLL | 2 +-
.../model_sync/generator/conversion/SModelGeneratorTest.scala | 2 +-
.../rosi_project/model_sync/generator/io/SClassWriterTest.scala | 2 +-
.../model_sync/generator/io/SModelFSWriterTest.scala | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/SCROLL b/lib/SCROLL
index 6d69b35..6237658 160000
--- a/lib/SCROLL
+++ b/lib/SCROLL
@@ -1 +1 @@
-Subproject commit 6d69b3575c3e31ca383798eb6660a1a7b5067cc7
+Subproject commit 623765816af6d27387efb82dfb890bc4318c58a2
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SModelGeneratorTest.scala b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SModelGeneratorTest.scala
index fc8987d..a102201 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SModelGeneratorTest.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SModelGeneratorTest.scala
@@ -7,7 +7,7 @@ import scroll.internal.ecore.ECoreImporter
/**
* @author Rico Bergmann
*/
-object SModelGeneratorTest extends App {
+object SModelGeneratorTest/* extends App */{
val importer = new ECoreImporter {
def lm(): Resource = loadModel()
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/io/SClassWriterTest.scala b/src/main/scala/org/rosi_project/model_sync/generator/io/SClassWriterTest.scala
index 418f945..ecd0859 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/io/SClassWriterTest.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/io/SClassWriterTest.scala
@@ -6,7 +6,7 @@ import org.rosi_project.model_sync.generator.sync_model.{GetterSetterGeneratingV
/**
* @author Rico Bergmann
*/
-object SClassWriterTest extends App {
+object SClassWriterTest/* extends App */{
val stringType = SType("String")
val attrs = Seq(SAttribute("name", stringType))
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/io/SModelFSWriterTest.scala b/src/main/scala/org/rosi_project/model_sync/generator/io/SModelFSWriterTest.scala
index 57351db..461367d 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/io/SModelFSWriterTest.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/io/SModelFSWriterTest.scala
@@ -6,7 +6,7 @@ import scala.reflect.io.File
/** @author Rico Bergmann
*/
-object SModelFSWriterTest extends App {
+object SModelFSWriterTest/* extends App */{
val model = new SimpleSModel("org.foo")
--
GitLab