Skip to content

Commit

Permalink
Removed driver package and merged down to core.
Browse files Browse the repository at this point in the history
  • Loading branch information
darkfrog26 committed Dec 25, 2023
1 parent 5c18e08 commit afc8467
Show file tree
Hide file tree
Showing 74 changed files with 13 additions and 38 deletions.
32 changes: 9 additions & 23 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,36 +41,23 @@ def groupByName(tests: Seq[TestDefinition]): Seq[Group] = {
}

lazy val root = project.in(file("."))
.aggregate(coreJS, coreJVM, driver, monitor, docs) // example, generator
.aggregate(core, monitor, docs) // example, generator
.settings(
publish := {},
publishLocal := {}
)

lazy val core = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure)
.in(file("core"))
lazy val core = project.in(file("core"))
.settings(
name := "scarango-core",
libraryDependencies ++= Seq(
dep.profig,
dep.fabric,
dep.scalaPass,
dep.scalaTest
)
)

lazy val coreJS = core.js
lazy val coreJVM = core.jvm

lazy val driver = project.in(file("driver"))
.settings(
name := "scarango-driver",
name := "scarango",
fork := true,
Test / testGrouping := groupByName((Test / definedTests).value),
Test / testOptions += Tests.Argument("-oF"),
Test / parallelExecution := false,
libraryDependencies ++= Seq(
dep.profig,
dep.fabric,
dep.scalaPass,
dep.arangoDBJavaDriver,
dep.jacksonDataformatVelocypack,
dep.catsEffect,
Expand All @@ -80,7 +67,6 @@ lazy val driver = project.in(file("driver"))
dep.catsEffectTesting
)
)
.dependsOn(coreJVM)

lazy val monitor = project.in(file("monitor"))
.settings(
Expand All @@ -95,7 +81,7 @@ lazy val monitor = project.in(file("monitor"))
dep.catsEffectTesting
)
)
.dependsOn(driver)
.dependsOn(core)

lazy val generator = project.in(file("generator"))
.settings(
Expand All @@ -109,7 +95,7 @@ lazy val generator = project.in(file("generator"))

lazy val docs = project
.in(file("documentation"))
.dependsOn(driver)
.dependsOn(core)
.enablePlugins(MdocPlugin)
.settings(
mdocVariables := Map(
Expand All @@ -122,4 +108,4 @@ lazy val example = project.in(file("example"))
.settings(
name := "scarango-example"
)
.dependsOn(driver)
.dependsOn(core)
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
package spec

import cats.effect.IO
import cats.effect.testing.scalatest.AsyncIOSpec
import com.outr.arango._
import com.outr.arango.backup.{DatabaseBackup, DatabaseRestore}
import com.outr.arango.collection.DocumentCollection
import com.outr.arango.core.{ComputeOn, ComputedValue, DeleteOptions, StreamTransaction, TransactionLock, TransactionStatus}
import com.outr.arango.core.{DeleteOptions, StreamTransaction, TransactionLock, TransactionStatus}
import com.outr.arango.query._
import com.outr.arango.query.dsl._
import com.outr.arango.queue.OperationQueueSupport
import com.outr.arango.upsert.Searchable
import fabric.rw._
import fabric._
import fabric.search.SearchEntry
import fabric.rw._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AsyncWordSpec
import profig.Profig

import java.nio.file.Paths
import scala.concurrent.duration.DurationInt

class AdvancedSpec extends AsyncWordSpec with AsyncIOSpec with Matchers with OperationQueueSupport {
private var transaction: StreamTransaction = _
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package spec

import cats.effect.testing.scalatest.AsyncIOSpec
import com.outr.arango._
import com.outr.arango.core._
import com.outr.arango.query._
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package spec

import cats.effect.IO
import cats.effect.testing.scalatest.AsyncIOSpec
import com.outr.arango._
import com.outr.arango.collection.{DocumentCollection, EdgeCollection}
import com.outr.arango.query._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package spec

import cats.effect.testing.scalatest.AsyncIOSpec
import com.outr.arango.collection.DocumentCollection
import com.outr.arango.json._
import com.outr.arango.{Graph, Index}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package spec

import cats.effect.IO
import cats.effect.testing.scalatest.AsyncIOSpec
import com.outr.arango.{Document, DocumentModel, Field, Graph, Id, Index}
import com.outr.arango.collection.DocumentCollection
import com.outr.arango.pagination.{PaginationSupport, ResultType}
import com.outr.arango.query.dsl._
import com.outr.arango.query._
import com.outr.arango.query.dsl._
import com.outr.arango.{Document, DocumentModel, Field, Graph, Id, Index}
import fabric.rw._
import org.scalatest.Assertion
import org.scalatest.matchers.should.Matchers
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package spec

import cats.effect.testing.scalatest.AsyncIOSpec
import com.outr.arango.collection.DocumentCollection
import com.outr.arango.query.dsl._
import com.outr.arango.query.sc2AQL
Expand Down

0 comments on commit afc8467

Please sign in to comment.