reorganize tapir http session project

Author: fupelaqu

.scalafmt.conf

@@ -1 +1,17 @@
-maxColumn = 120
+version=3.0.2
+style = defaultWithAlign
+align.openParenCallSite = false
+align.openParenDefnSite = false
+align.tokens = [{code = "->"}, {code = "<-"}, {code = "=>", owner = "Case"}]
+continuationIndent.callSite = 2
+continuationIndent.defnSite = 2
+danglingParentheses = true
+indentOperator = spray
+maxColumn = 100
+indentOperator.preset = "spray"
+danglingParentheses.preset = true
+project.excludeFilters = [".*\\.sbt"]
+rewrite.rules = [RedundantParens, SortImports]
+spaces.inImportCurlyBraces = false
+unindentTopLevelOperators = true
+project.git = true

build.sbt

@@ -1,15 +1,13 @@
-import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
-import com.softwaremill.Publish.ossPublishSettings
-
-val scala2_12 = "2.12.15"
+val scala2_12 = "2.12.18"
 val scala2_13 = "2.13.8"
 val scala2 = List(scala2_12, scala2_13)
 
-lazy val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
-  organization := "com.softwaremill.akka-http-session",
+lazy val commonSettings = Seq(
+  organization := "app.softnetwork.session",
   versionScheme := Some("early-semver")
 )
 
+val akkaHttpSession = "0.7.0"
 val akkaHttpVersion = "10.2.7"
 val akkaVersion = "2.6.18"
 val json4sVersion = "4.0.4"
@@ -21,41 +19,8 @@ val scalaTest = "org.scalatest" %% "scalatest" % "3.2.11" % "test"
 
 lazy val rootProject = (project in file("."))
   .settings(commonSettings: _*)
-  .settings(publish / skip := true, name := "akka-http-session", scalaVersion := scala2_13)
-  .aggregate(core.projectRefs ++ jwt.projectRefs ++ example.projectRefs ++ javaTests.projectRefs ++ tapir.projectRefs: _*)
-
-lazy val core = (projectMatrix in file("core"))
-  .settings(commonSettings: _*)
-  .settings(
-    name := "core",
-    libraryDependencies ++= Seq(
-      "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
-      akkaStreams % "provided",
-      "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
-      akkaStreamsTestkit,
-      "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
-      "org.scalacheck" %% "scalacheck" % "1.15.4" % "test",
-      scalaTest
-    )
-  )
-  .jvmPlatform(scalaVersions = scala2)
-
-lazy val jwt = (projectMatrix in file("jwt"))
-  .settings(commonSettings: _*)
-  .settings(
-    name := "jwt",
-    libraryDependencies ++= Seq(
-      "org.json4s" %% "json4s-jackson" % json4sVersion,
-      "org.json4s" %% "json4s-ast" % json4sVersion,
-      "org.json4s" %% "json4s-core" % json4sVersion,
-      akkaStreams % "provided",
-      scalaTest
-    ),
-    // generating docs for 2.13 causes an error: "not found: type DefaultFormats$"
-    Compile / doc / sources := Seq.empty
-  )
-  .jvmPlatform(scalaVersions = scala2)
-  .dependsOn(core)
+  .settings(publish / skip := true, name := "tapir-http-session", scalaVersion := scala2_13)
+  .aggregate(core.projectRefs ++ example.projectRefs: _*)
 
 lazy val example = (projectMatrix in file("example"))
   .settings(commonSettings: _*)
@@ -71,37 +36,23 @@ lazy val example = (projectMatrix in file("example"))
     )
   )
   .jvmPlatform(scalaVersions = scala2)
-  .dependsOn(tapir, jwt)
+  .dependsOn(core)
 
-lazy val javaTests = (projectMatrix in file("javaTests"))
+lazy val core = (projectMatrix in file("core"))
   .settings(commonSettings: _*)
   .settings(
-    name := "javaTests",
-    Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")), // required for javadsl JUnit tests
-    crossPaths := false, // https://github.com/sbt/junit-interface/issues/35
-    publishArtifact := false,
+    name := "core",
     libraryDependencies ++= Seq(
-      akkaStreams % "provided",
+      "com.softwaremill.akka-http-session" %% "core" % akkaHttpSession  excludeAll ExclusionRule(organization = "com.typesafe.akka"),
       "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
+      akkaStreams % "provided",
+      "com.softwaremill.sttp.tapir" %% "tapir-core" % tapirVersion,
+      "com.softwaremill.sttp.tapir" %% "tapir-akka-http-server" % tapirVersion excludeAll ExclusionRule(organization = "com.typesafe.akka"),
       "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
       akkaStreamsTestkit,
-      "junit" % "junit" % "4.13.2" % "test",
-      "com.github.sbt" % "junit-interface" % "0.13.3" % "test",
-      scalaTest
-    )
-  )
-  .jvmPlatform(scalaVersions = scala2)
-  .dependsOn(core, jwt)
-
-lazy val tapir = (projectMatrix in file("tapir"))
-  .settings(commonSettings: _*)
-  .settings(
-    name := "tapir",
-    libraryDependencies ++= Seq(
       "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
-      "com.softwaremill.sttp.tapir" %% "tapir-core" % tapirVersion,
-      "com.softwaremill.sttp.tapir" %% "tapir-akka-http-server" % tapirVersion excludeAll ExclusionRule(organization = "com.typesafe.akka")
+      "org.scalacheck" %% "scalacheck" % "1.15.4" % "test",
+      scalaTest
     )
   )
   .jvmPlatform(scalaVersions = scala2)
-  .dependsOn(core % "compile->compile;test->test")