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

Preparations on main for 3.0.x branch #1031

Merged
merged 2 commits into from
Jun 27, 2024
Merged
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
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
target-branch: "3.0.x"
commit-message:
prefix: "[3.0.x] "
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
10 changes: 0 additions & 10 deletions .github/scala-steward.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,4 @@ updates.ignore = [
]

updates.pin = [
{ groupId = "org.playframework", artifactId = "play-docs-sbt-plugin", version = "3.0." },
{ groupId = "org.playframework", artifactId = "play-docs", version = "3.0." },
{ groupId = "com.fasterxml.jackson.core", version = "2.14." },
{ groupId = "com.fasterxml.jackson.datatype", version = "2.14." },
{ groupId = "org.scala-native", artifactId = "sbt-scala-native", version = "0.4." },
{ groupId = "org.scala-native", artifactId = "nscplugin", version = "0.4." },
{ groupId = "org.scala-js", version = "1.15." },
{ groupId = "org.portable-scala", version = "1.3." },
{ groupId = "org.specs2", version = "4.20." },
{ groupId = "org.scalacheck", artifactId = "scalacheck", version = "1.17.0." }
]
5 changes: 1 addition & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@ jobs:
check-binary-compatibility:
name: Binary Compatibility
uses: playframework/.github/.github/workflows/binary-check.yml@v4
with:
java: 11

check-docs:
name: Docs
uses: playframework/.github/.github/workflows/cmd.yml@v4
with:
java: 11
cmd: sbt docs/validateDocs

tests:
Expand All @@ -40,7 +37,7 @@ jobs:
- "check-docs"
uses: playframework/.github/.github/workflows/cmd.yml@v4
with:
java: 21, 17, 11
java: 21, 17
scala: 2.12.x, 2.13.x, 3.x
cmd: scripts/test-code.sh

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ jobs:
publish-artifacts:
name: Publish / Artifacts
uses: playframework/.github/.github/workflows/publish.yml@v4
with:
java: 11
secrets: inherit
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ def playJsonMimaSettings = Seq(

val javacSettings = Seq(
"-source",
"11",
"17",
"-Xlint:deprecation",
"-Xlint:unchecked",
)

val scalacOpts = Seq(
"-language:higherKinds",
"-release",
"11",
"17",
"-Ywarn-unused:imports",
"-Xlint:nullary-unit",
"-Xlint",
Expand Down Expand Up @@ -96,7 +96,7 @@ lazy val commonSettings = Def.settings(
crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
Compile / javacOptions ++= javacSettings,
Test / javacOptions ++= javacSettings,
Compile / compile / javacOptions ++= Seq("--release", "11"), // sbt #1785, avoids passing to javadoc
Compile / compile / javacOptions ++= Seq("--release", "17"), // sbt #1785, avoids passing to javadoc
scalacOptions ++= (if (isScala3.value) Nil else scalacOpts),
Compile / doc / scalacOptions ++= Seq(
// Work around 2.12 bug which prevents javadoc in nested java classes from compiling.
Expand Down
Loading