diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b53355c6..a8976373 100644 --- 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,15 +47,16 @@ 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 @@ -63,7 +64,7 @@ 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 "scalafixAll --check" diff --git a/build.sbt b/build.sbt index 80932d4b..06da4105 100644 --- 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 b/modules/it/src/test/resources/logback.xml similarity index 100% rename from src/it/resources/logback.xml rename to modules/it/src/test/resources/logback.xml diff --git a/src/it/scala/fluflu/connection/ConnectionSpec.scala b/modules/it/src/test/scala/fluflu/connection/ConnectionSpec.scala similarity index 98% rename from src/it/scala/fluflu/connection/ConnectionSpec.scala rename to modules/it/src/test/scala/fluflu/connection/ConnectionSpec.scala index 5a50188c..791b55f3 100644 --- a/src/it/scala/fluflu/connection/ConnectionSpec.scala +++ b/modules/it/src/test/scala/fluflu/connection/ConnectionSpec.scala @@ -1,5 +1,3 @@ -package fluflu.connection - import java.io.IOException import java.net.InetSocketAddress import java.nio.ByteBuffer