Permalink
Browse files

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
  • Loading branch information...
alexarchambault committed May 15, 2017
1 parent 3656389 commit 203e3fd477a7636b012da0b03a088be9c2a2958b
View
@@ -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
View
@@ -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
@@ -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 \
@@ -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
@@ -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
View
@@ -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

0 comments on commit 203e3fd

Please sign in to comment.