Merge pull request #528 from tkrs/move-it

test: move it to it module
tkrs · Mar 25, 2024 · 77f3b38 · 77f3b38
2 parents 3b3f7fc + 8f70cb8
commit 77f3b38
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
   setup:
     runs-on: ubuntu-latest
     outputs:
-      scala-versions:  ${{ steps.set-scala-versions.outputs.versions }}
+      scala-versions: ${{ steps.set-scala-versions.outputs.versions }}
     steps:
       - uses: actions/checkout@v4
       - id: set-scala-versions
@@ -33,9 +33,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          java-version: "11"
+          distribution: "temurin"
+          cache: "sbt"
       - run: sbt ++${{ matrix.scala }} coverage test
       - run: sbt ++${{ matrix.scala }} examples/run
       - run: sbt ++${{ matrix.scala }} coverageReport
@@ -47,23 +47,24 @@ jobs:
           flags: unittests
           fail_ci_if_error: true
           verbose: true
+      - run: sbt ++${{ matrix.scala }} it/test
   scalafmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          java-version: "11"
+          distribution: "temurin"
+          cache: "sbt"
       - run: sbt scalafmtCheckAll
   scalafix:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'sbt'
+          java-version: "11"
+          distribution: "temurin"
+          cache: "sbt"
       - run: sbt "scalafixAll --check"
diff --git a/build.sbt b/build.sbt
@@ -2,9 +2,6 @@ import Dependencies._
 
 lazy val fluflu = project
   .in(file("."))
-  .configs(IntegrationTest)
-  .settings(Defaults.itSettings, inConfig(IntegrationTest)(scalafixConfigSettings(IntegrationTest)))
-  .settings(libraryDependencies ++= Pkg.forTest.map(_ % "it"))
   .settings(
     inThisBuild(
       Seq(
@@ -44,7 +41,7 @@ lazy val fluflu = project
   )
   .settings(publish / skip := true)
   .aggregate(core, msgpack, `msgpack-mess`)
-  .dependsOn(core, msgpack % "it->test", `msgpack-mess`)
+  .dependsOn(core, msgpack, `msgpack-mess`)
 
 lazy val core = project
   .in(file("modules/core"))
@@ -86,6 +83,12 @@ lazy val examples = project
   .settings(coverageEnabled := false)
   .dependsOn(core, `msgpack-mess`)
 
+lazy val it = project
+  .in(file("modules/it"))
+  .settings(publish / skip := true)
+  .settings(libraryDependencies ++= Pkg.forTest)
+  .dependsOn(core, msgpack % "test->test", `msgpack-mess`)
+
 lazy val compilerOptions = Seq(
   "-deprecation",
   "-encoding",

diff --git a/src/it/resources/logback.xml → modules/it/src/test/resources/logback.xml b/src/it/resources/logback.xml → modules/it/src/test/resources/logback.xml
diff --git a/...la/fluflu/connection/ConnectionSpec.scala → ...la/fluflu/connection/ConnectionSpec.scala b/...la/fluflu/connection/ConnectionSpec.scala → ...la/fluflu/connection/ConnectionSpec.scala
@@ -1,5 +1,3 @@
-package fluflu.connection
-
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.nio.ByteBuffer