mirror of https://github.com/sbt/sbt.git
Rename simple-web-server module to http-server
This commit is contained in:
parent
73321d5447
commit
b0a20eff81
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
Loading…
Reference in New Issue