Skip to content

Commit

Permalink
xsbt-web-plugin 4.2.4 -> sbt-war 5.0.0-M2
Browse files Browse the repository at this point in the history
  • Loading branch information
earldouglas committed Oct 9, 2024
1 parent 7ef7fdf commit 3b7c14d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
$ sbt new scalatra/scalatra.g8
$ cd <name-of-app>
$ sbt
> Jetty/start
> webappStart
```

- Open [http://localhost:8080/](http://localhost:8080/) in your browser.
Expand All @@ -38,7 +38,7 @@ $ sbt
> exit
$ cd target/sbt-test/scalatra-g8/scripted
$ sbt
> Jetty/start
> webappStart
> browse # starts browser for you, or manually open http://localhost:8080 to verify
```

Expand Down
6 changes: 1 addition & 5 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@ lazy val hello = (project in file("."))
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
"org.scalatra" %% "scalatra-scalatest-jakarta" % ScalatraVersion % "test",
"ch.qos.logback" % "logback-classic" % "1.5.6" % "runtime",
"org.eclipse.jetty.ee10" % "jetty-ee10-webapp" % "$jetty_version$" % "container",
"jakarta.servlet" % "jakarta.servlet-api" % "6.0.0" % "provided"
),
)

enablePlugins(SbtTwirl)
enablePlugins(JettyPlugin)

Jetty / containerLibs := Seq("org.eclipse.jetty.ee10" % "jetty-ee10-runner" % "$jetty_version$" intransitive())
Jetty / containerMain := "org.eclipse.jetty.ee10.runner.Runner"
enablePlugins(SbtWar)
2 changes: 1 addition & 1 deletion src/main/g8/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ scala_version=3.3.3
sbt_version=1.10.0
scalatra_version=3.1.0
twirl_version=2.0.6
xsbt_web_plugin_version=4.2.4
sbt_war_version=5.0.0-M2
jetty_version=12.0.10
2 changes: 1 addition & 1 deletion src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "$twirl_version$")
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "$xsbt_web_plugin_version$")
addSbtPlugin("com.earldouglas" % "sbt-war" % "$sbt_war_version$")

0 comments on commit 3b7c14d

Please sign in to comment.