Moved main API to its own module

ulitol97 · Apr 27, 2022 · 6b9bf63 · 6b9bf63
1 parent 4594363
commit 6b9bf63
Show file tree

Hide file tree

Showing 35 changed files with 21 additions and 1 deletion.
diff --git a/src/main/scala/Main.scala → api/src/main/scala/Main.scala b/src/main/scala/Main.scala → api/src/main/scala/Main.scala
diff --git a/src/main/scala/data/DataFormat.scala → api/src/main/scala/data/DataFormat.scala b/src/main/scala/data/DataFormat.scala → api/src/main/scala/data/DataFormat.scala
diff --git a/...stream/timed/StreamTimeoutException.scala → ...stream/timed/StreamTimeoutException.scala b/...stream/timed/StreamTimeoutException.scala → ...stream/timed/StreamTimeoutException.scala
diff --git a/...idations/StreamErroredItemException.scala → ...idations/StreamErroredItemException.scala b/...idations/StreamErroredItemException.scala → ...idations/StreamErroredItemException.scala
diff --git a/...idations/StreamInvalidItemException.scala → ...idations/StreamInvalidItemException.scala b/...idations/StreamInvalidItemException.scala → ...idations/StreamInvalidItemException.scala
diff --git a/...lidations/StreamValidationException.scala → ...lidations/StreamValidationException.scala b/...lidations/StreamValidationException.scala → ...lidations/StreamValidationException.scala
diff --git a/src/main/scala/implicits/package.scala → api/src/main/scala/implicits/package.scala b/src/main/scala/implicits/package.scala → api/src/main/scala/implicits/package.scala
diff --git a/src/main/scala/model/rdf/RDFElement.scala → ...src/main/scala/model/rdf/RDFElement.scala b/src/main/scala/model/rdf/RDFElement.scala → ...src/main/scala/model/rdf/RDFElement.scala
diff --git a/src/main/scala/schema/ShExSchemaFormat.scala → .../main/scala/schema/ShExSchemaFormat.scala b/src/main/scala/schema/ShExSchemaFormat.scala → .../main/scala/schema/ShExSchemaFormat.scala
diff --git a/src/main/scala/stream/StreamSource.scala → api/src/main/scala/stream/StreamSource.scala b/src/main/scala/stream/StreamSource.scala → api/src/main/scala/stream/StreamSource.scala
diff --git a/...a/stream/extractors/StreamExtractor.scala → ...a/stream/extractors/StreamExtractor.scala b/...a/stream/extractors/StreamExtractor.scala → ...a/stream/extractors/StreamExtractor.scala
diff --git a/...ala/stream/extractors/file/Charsets.scala → ...ala/stream/extractors/file/Charsets.scala b/...ala/stream/extractors/file/Charsets.scala → ...ala/stream/extractors/file/Charsets.scala
diff --git a/...tream/extractors/file/FileExtractor.scala → ...tream/extractors/file/FileExtractor.scala b/...tream/extractors/file/FileExtractor.scala → ...tream/extractors/file/FileExtractor.scala
diff --git a/...eam/extractors/kafka/KafkaExtractor.scala → ...eam/extractors/kafka/KafkaExtractor.scala b/...eam/extractors/kafka/KafkaExtractor.scala → ...eam/extractors/kafka/KafkaExtractor.scala
diff --git a/...s/kafka/KafkaExtractorConfiguration.scala → ...s/kafka/KafkaExtractorConfiguration.scala b/...s/kafka/KafkaExtractorConfiguration.scala → ...s/kafka/KafkaExtractorConfiguration.scala
diff --git a/...tream/extractors/list/ListExtractor.scala → ...tream/extractors/list/ListExtractor.scala b/...tream/extractors/list/ListExtractor.scala → ...tream/extractors/list/ListExtractor.scala
diff --git a/src/main/scala/trigger/ShapeMapFormat.scala → ...c/main/scala/trigger/ShapeMapFormat.scala b/src/main/scala/trigger/ShapeMapFormat.scala → ...c/main/scala/trigger/ShapeMapFormat.scala
diff --git a/src/main/scala/trigger/TriggerModeType.scala → .../main/scala/trigger/TriggerModeType.scala b/src/main/scala/trigger/TriggerModeType.scala → .../main/scala/trigger/TriggerModeType.scala
diff --git a/src/main/scala/trigger/TriggerShapeMap.scala → .../main/scala/trigger/TriggerShapeMap.scala b/src/main/scala/trigger/TriggerShapeMap.scala → .../main/scala/trigger/TriggerShapeMap.scala
diff --git a/...a/trigger/TriggerTargetDeclarations.scala → ...a/trigger/TriggerTargetDeclarations.scala b/...a/trigger/TriggerTargetDeclarations.scala → ...a/trigger/TriggerTargetDeclarations.scala
diff --git a/...ain/scala/trigger/ValidationTrigger.scala → ...ain/scala/trigger/ValidationTrigger.scala b/...ain/scala/trigger/ValidationTrigger.scala → ...ain/scala/trigger/ValidationTrigger.scala
diff --git a/src/main/scala/utils/StreamUtils.scala → api/src/main/scala/utils/StreamUtils.scala b/src/main/scala/utils/StreamUtils.scala → api/src/main/scala/utils/StreamUtils.scala
diff --git a/src/main/scala/utils/Timer.scala → api/src/main/scala/utils/Timer.scala b/src/main/scala/utils/Timer.scala → api/src/main/scala/utils/Timer.scala
diff --git a/src/main/scala/utils/package.scala → api/src/main/scala/utils/package.scala b/src/main/scala/utils/package.scala → api/src/main/scala/utils/package.scala
diff --git a/src/main/scala/validation/Validator.scala → ...src/main/scala/validation/Validator.scala b/src/main/scala/validation/Validator.scala → ...src/main/scala/validation/Validator.scala
diff --git a/...onfiguration/ValidatorConfiguration.scala → ...onfiguration/ValidatorConfiguration.scala b/...onfiguration/ValidatorConfiguration.scala → ...onfiguration/ValidatorConfiguration.scala
diff --git a/...cala/validation/result/ResultStatus.scala → ...cala/validation/result/ResultStatus.scala b/...cala/validation/result/ResultStatus.scala → ...cala/validation/result/ResultStatus.scala
diff --git a/.../validation/result/ValidationResult.scala → .../validation/result/ValidationResult.scala b/.../validation/result/ValidationResult.scala → .../validation/result/ValidationResult.scala
diff --git a/...est/scala/extraction/ExtractorTests.scala → ...est/scala/extraction/ExtractorTests.scala b/...est/scala/extraction/ExtractorTests.scala → ...est/scala/extraction/ExtractorTests.scala
diff --git a/src/test/scala/utils/FileUtils.scala → api/src/test/scala/utils/FileUtils.scala b/src/test/scala/utils/FileUtils.scala → api/src/test/scala/utils/FileUtils.scala
diff --git a/src/test/scala/utils/Samples.scala → api/src/test/scala/utils/Samples.scala b/src/test/scala/utils/Samples.scala → api/src/test/scala/utils/Samples.scala
diff --git a/...ala/validation/halting/HaltingTests.scala → ...ala/validation/halting/HaltingTests.scala b/...ala/validation/halting/HaltingTests.scala → ...ala/validation/halting/HaltingTests.scala
diff --git a/...scala/validation/ouputs/SchemaTests.scala → ...scala/validation/ouputs/SchemaTests.scala b/...scala/validation/ouputs/SchemaTests.scala → ...scala/validation/ouputs/SchemaTests.scala
diff --git a/...ala/validation/timeout/TimeoutTests.scala → ...ala/validation/timeout/TimeoutTests.scala b/...ala/validation/timeout/TimeoutTests.scala → ...ala/validation/timeout/TimeoutTests.scala
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,13 @@ Global / excludeLintKeys ++= Set(name, idePackagePrefix)
 
 /* ------------------------------------------------------------------------- */
 /* MODULES */
-lazy val comet = (project in file("."))
+
+// Root project
+lazy val root = (project in file("."))
+  .aggregate(comet)
+
+// Comet's core API, to be published
+lazy val comet = (project in file("api"))
   .enablePlugins(BuildInfoPlugin)
   .settings(
     name := "comet",
@@ -57,6 +63,20 @@ lazy val buildInfoSettings = Seq(
   buildInfoObject := "BuildInfo"
 )
 
+/* PACKAGING SETTINGS */
+// Shared packaging settings for all modules
+lazy val packagingSettings = Seq(
+  // Do not package logback files in .jar, they interfere with other logback
+  // files in classpath
+  Compile / packageBin / mappings ~= { project =>
+    project.filter { case (file, _) =>
+      val fileName = file.getName
+      !(fileName.startsWith("logback") && (fileName.endsWith(".xml") || fileName
+        .endsWith(".groovy")))
+    }
+  }
+)
+
 /* ------------------------------------------------------------------------- */
 /* SBT GITHUB ACTIONS */
 // GitHub Actions for build/test and clean are automatically generated