Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xsbt-web-plugin 4.2.4 -> sbt-war 5.0.0-M2 #131

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might require other documentation updates around the Scalatra ecosystem.

Copy link
Member

@takezoe takezoe Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we will work on it once this PR is merged.

> 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$")
Loading