diff --git a/.ci/travis.sh b/.ci/travis.sh index bff111d15..317c136e4 100755 --- a/.ci/travis.sh +++ b/.ci/travis.sh @@ -28,11 +28,11 @@ function isMasterOrDevelop() { } # Required for ~/.ivy2/local repo tests -~/sbt coreJVM/publishLocal simple-web-server/publishLocal +~/sbt coreJVM/publishLocal http-server/publishLocal # Required for HTTP authentication tests ./coursier launch \ - io.get-coursier:simple-web-server_2.11:1.0.0-SNAPSHOT \ + io.get-coursier:http-server_2.11:1.0.0-SNAPSHOT \ -r http://dl.bintray.com/scalaz/releases \ -- \ -d tests/jvm/src/test/resources/test-repo/http/abc.com \ diff --git a/appveyor.yml b/appveyor.yml index 8a39062dd..855057ebe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,11 +15,11 @@ install: - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET COURSIER_NO_TERM=1 build_script: - - sbt ++2.11.8 clean compile coreJVM/publishLocal simple-web-server/publishLocal + - sbt ++2.11.8 clean compile coreJVM/publishLocal http-server/publishLocal - sbt ++2.10.6 clean compile - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal # to make the scripted tests happy test_script: - - ps: Start-Job { & java -jar -noverify C:\projects\coursier\coursier launch -r http://dl.bintray.com/scalaz/releases io.get-coursier:simple-web-server_2.11:1.0.0-SNAPSHOT -- -d /C:/projects/coursier/tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm -v } + - ps: Start-Job { & java -jar -noverify C:\projects\coursier\coursier launch -r http://dl.bintray.com/scalaz/releases io.get-coursier:http-server_2.11:1.0.0-SNAPSHOT -- -d /C:/projects/coursier/tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm -v } - sbt ++2.11.8 testsJVM/test # Would node be around for testsJS/test? - sbt ++2.10.6 testsJVM/test plugin/scripted cache: diff --git a/build.sbt b/build.sbt index 4a590b795..9e8d27007 100644 --- a/build.sbt +++ b/build.sbt @@ -552,7 +552,7 @@ lazy val plugin = project val http4sVersion = "0.8.6" -lazy val `simple-web-server` = project +lazy val `http-server` = project .settings(commonSettings) .settings(packAutoSettings) .settings( @@ -565,7 +565,7 @@ lazy val `simple-web-server` = project ) lazy val `coursier` = project.in(file(".")) - .aggregate(coreJvm, coreJs, `fetch-js`, testsJvm, testsJs, cache, bootstrap, cli, plugin, web, doc, `simple-web-server`) + .aggregate(coreJvm, coreJs, `fetch-js`, testsJvm, testsJs, cache, bootstrap, cli, plugin, web, doc, `http-server`) .settings(commonSettings) .settings(noPublishSettings) .settings(releaseSettings) diff --git a/simple-web-server/src/main/scala/coursier/SimpleHttpServer.scala b/http-server/src/main/scala/coursier/HttpServer.scala similarity index 98% rename from simple-web-server/src/main/scala/coursier/SimpleHttpServer.scala rename to http-server/src/main/scala/coursier/HttpServer.scala index ef52696d5..b6cdbbf6d 100644 --- a/simple-web-server/src/main/scala/coursier/SimpleHttpServer.scala +++ b/http-server/src/main/scala/coursier/HttpServer.scala @@ -16,7 +16,7 @@ import scala.collection.JavaConverters._ import scalaz.concurrent.Task -case class SimpleHttpServerApp( +case class HttpServerApp( @ExtraName("d") @ValueDescription("served directory") directory: String, @@ -219,4 +219,4 @@ case class SimpleHttpServerApp( } -object SimpleHttpServer extends AppOf[SimpleHttpServerApp] +object HttpServer extends AppOf[HttpServerApp]