From 203e3fd477a7636b012da0b03a088be9c2a2958b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 15 May 2017 15:32:51 +0200 Subject: [PATCH] Only compile http-server module in 2.12 So that we don't have to wait on its dependencies to add preliminary support for scala 2.13 --- appveyor.yml | 3 ++- build.sbt | 18 ++++++++++++------ .../coursier/HttpServer.scala | 0 scripts/launch-test-repo.sh | 4 ++-- scripts/start-it-auth-server.ps1 | 2 +- scripts/start-it-no-listing-server.ps1 | 2 +- scripts/travis.sh | 4 +++- 7 files changed, 21 insertions(+), 12 deletions(-) rename http-server/src/main/{scala => scala-2.12}/coursier/HttpServer.scala (100%) diff --git a/appveyor.yml b/appveyor.yml index 1e2c1663a..2c5375ac4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,8 @@ install: Set-Location -Path .. } build_script: - - sbt ++2.11.11 clean compile coreJVM/publishLocal http-server/publishLocal + - sbt ++2.11.11 clean compile coreJVM/publishLocal + - sbt ++2.12.1 http-server/publishLocal - sbt ++2.10.6 clean compile - sbt ++2.12.1 coreJVM/publishLocal cache/publishLocal extra/publishLocal # to make the scripted sbt 1.0 tests happy - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal extra/publishLocal # to make the scripted sbt 0.13 tests happy diff --git a/build.sbt b/build.sbt index be20db5fe..cf2c62d33 100644 --- a/build.sbt +++ b/build.sbt @@ -212,12 +212,18 @@ lazy val `http-server` = project shared, generatePack, name := "http-server", - libs ++= Seq( - Deps.http4sBlazeServer, - Deps.http4sDsl, - Deps.slf4jNop, - Deps.caseApp12 - ) + dontPublishIn("2.10", "2.11"), + libs ++= { + if (scalaBinaryVersion.value == "2.12") + Seq( + Deps.http4sBlazeServer, + Deps.http4sDsl, + Deps.slf4jNop, + Deps.caseApp12 + ) + else + Nil + } ) lazy val okhttp = project diff --git a/http-server/src/main/scala/coursier/HttpServer.scala b/http-server/src/main/scala-2.12/coursier/HttpServer.scala similarity index 100% rename from http-server/src/main/scala/coursier/HttpServer.scala rename to http-server/src/main/scala-2.12/coursier/HttpServer.scala diff --git a/scripts/launch-test-repo.sh b/scripts/launch-test-repo.sh index fca2ec105..fa6e55ddb 100755 --- a/scripts/launch-test-repo.sh +++ b/scripts/launch-test-repo.sh @@ -8,11 +8,11 @@ cd "$(dirname "$0")/.." # synchronously fill cache so that two runs of this script don't try to download # a same file at the same time (and one of them fail because of locks) ./coursier fetch \ - "io.get-coursier:http-server_2.11:$VERSION" \ + "io.get-coursier:http-server_2.12:$VERSION" \ -r https://dl.bintray.com/scalaz/releases ./coursier launch \ - "io.get-coursier:http-server_2.11:$VERSION" \ + "io.get-coursier:http-server_2.12:$VERSION" \ -- \ -d tests/jvm/src/test/resources/test-repo/http/abc.com \ -u user -P pass -r realm \ diff --git a/scripts/start-it-auth-server.ps1 b/scripts/start-it-auth-server.ps1 index d1c8456c9..6719c3b91 100644 --- a/scripts/start-it-auth-server.ps1 +++ b/scripts/start-it-auth-server.ps1 @@ -1,3 +1,3 @@ # see https://stackoverflow.com/questions/2224350/powershell-start-job-working-directory/2246542#2246542 Set-Location $args[0] -& java -jar -noverify coursier launch io.get-coursier:http-server_2.11:1.0.0-SNAPSHOT -- -d tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm --port 8080 --list-pages -v +& java -jar -noverify coursier launch io.get-coursier:http-server_2.12:1.0.0-SNAPSHOT -- -d tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm --port 8080 --list-pages -v diff --git a/scripts/start-it-no-listing-server.ps1 b/scripts/start-it-no-listing-server.ps1 index 8d0275bc1..b0a1c180f 100644 --- a/scripts/start-it-no-listing-server.ps1 +++ b/scripts/start-it-no-listing-server.ps1 @@ -1,3 +1,3 @@ # see https://stackoverflow.com/questions/2224350/powershell-start-job-working-directory/2246542#2246542 Set-Location $args[0] -& java -jar -noverify coursier launch io.get-coursier:http-server_2.11:1.0.0-SNAPSHOT -- -d tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm --port 8081 -v +& java -jar -noverify coursier launch io.get-coursier:http-server_2.12:1.0.0-SNAPSHOT -- -d tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm --port 8081 -v diff --git a/scripts/travis.sh b/scripts/travis.sh index b81098d0d..5084f56d3 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -26,7 +26,9 @@ launchTestRepo() { integrationTestsRequirements() { # Required for ~/.ivy2/local repo tests - sbt ++2.11.11 coreJVM/publishLocal http-server/publishLocal + sbt ++2.11.11 coreJVM/publishLocal + + sbt ++2.12.1 http-server/publishLocal # Required for HTTP authentication tests launchTestRepo --port 8080 --list-pages