-
-
Notifications
You must be signed in to change notification settings - Fork 14
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
Drop Java 8 #207
Drop Java 8 #207
Changes from all commits
10fb5a2
fcf58f1
2a695d2
3a4f6e8
0f806f8
2596752
3be9456
05f89d0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
name: Publish | ||
|
||
on: | ||
push: | ||
branches: # Snapshots | ||
- main | ||
tags: ["**"] # Releases | ||
release: | ||
types: [published] | ||
|
||
jobs: | ||
publish-artifacts: | ||
name: Publish / Artifacts | ||
uses: playframework/.github/.github/workflows/publish.yml@v3 | ||
secrets: inherit |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
target | ||
.idea/ | ||
.bsp/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ import sbt.Keys._ | |
import interplay._ | ||
import interplay.PlayBuildBase.autoImport._ | ||
import xerial.sbt.Sonatype.autoImport.sonatypeProfileName | ||
import sbtrelease.ReleasePlugin.autoImport._ | ||
import sbtdynver.DynVerPlugin.autoImport._ | ||
|
||
object OmnidocBuild { | ||
|
||
|
@@ -99,14 +99,13 @@ object OmnidocBuild { | |
|
||
lazy val omnidoc = project | ||
.in(file(".")) | ||
.enablePlugins(PlayLibrary, PlayReleaseBase) | ||
.enablePlugins(PlayLibrary) | ||
.settings(omnidocSettings) | ||
.configs(Omnidoc) | ||
|
||
def omnidocSettings: Seq[Setting[_]] = | ||
projectSettings ++ | ||
dependencySettings ++ | ||
releaseSettings ++ | ||
inConfig(Omnidoc) { | ||
updateSettings ++ | ||
extractSettings ++ | ||
|
@@ -118,13 +117,17 @@ object OmnidocBuild { | |
|
||
def projectSettings: Seq[Setting[_]] = Seq( | ||
name := "play-omnidoc", | ||
version := playVersion, | ||
ThisBuild / playBuildRepoName := "omnidoc", | ||
crossScalaVersions := Seq(ScalaVersions.scala212, ScalaVersions.scala213), | ||
resolvers ++= Seq( | ||
Resolver.sonatypeRepo("snapshots"), | ||
Resolver.sonatypeRepo("releases")), | ||
resolvers ++= Resolver.sonatypeOssRepos("snapshots") ++ | ||
Resolver.sonatypeOssRepos("releases"), | ||
useCoursier := false, // so updatePlaydocClassifiers isn't empty | ||
updateSbtClassifiers / useCoursier := true, // https://github.com/sbt/sbt/issues/5263#issuecomment-626462593 | ||
ThisBuild / dynverVTagPrefix := false, // Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed | ||
Global / onLoad := (Global / onLoad).value.andThen { s => | ||
dynverAssertTagVersion.value // Sanity-check: assert that version comes from a tag (e.g. not a too-shallow clone) | ||
s // https://github.com/dwijnand/sbt-dynver/#sanity-checking-the-version | ||
}, | ||
) | ||
|
||
def dependencySettings: Seq[Setting[_]] = Seq( | ||
|
@@ -138,24 +141,6 @@ object OmnidocBuild { | |
) | ||
) | ||
|
||
def releaseSettings: Seq[Setting[_]] = Seq( | ||
releaseTagName := playVersion, | ||
sonatypeProfileName := "com.typesafe.play", | ||
releaseProcess := { | ||
import ReleaseTransformations._ | ||
|
||
// Since the version comes externally, we don't set or update it here. | ||
Seq[ReleaseStep]( | ||
checkSnapshotDependencies, | ||
tagRelease, | ||
publishArtifacts, | ||
releaseStepCommand("sonatypeBundleRelease"), | ||
pushChanges | ||
) | ||
} | ||
|
||
) | ||
|
||
def updateSettings: Seq[Setting[_]] = Seq( | ||
transitiveClassifiers := Seq(SourceClassifier, PlaydocClassifier), | ||
updatePlaydocClassifiers := updatePlaydocClassifiersTask.value | ||
|
@@ -195,12 +180,14 @@ object OmnidocBuild { | |
|
||
def compilerReporterSettings = Seq( | ||
compile / compilerReporter := { | ||
new sbt.internal.server.LanguageServerReporter( | ||
new sbt.internal.inc.LoggedReporter( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This and the below tastyFiles / bspReporter hack allows us to finally upgrade to latest sbt version |
||
maxErrors.value, | ||
streams.value.log, | ||
foldMappers(sourcePositionMappers.value) | ||
) | ||
}, | ||
tastyFiles := (Compile / compile / tastyFiles).value, // not 100% sure but it seems to work | ||
bspReporter := (Compile / compile / bspReporter).value, // same | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Needed to fix (because of sbt upgrade)
Actually these two settings does not really matter in this context IMHO, bsp is for build server protocol and tastyFiles for Scala 3, but even if we use Scala 3 here, it should not really matter as well. I keep the comment here in case someone stumples over it and thinks this should be changed. |
||
) | ||
|
||
private def foldMappers[A](mappers: Seq[A => Option[A]]): A => A = | ||
|
@@ -321,7 +308,7 @@ object OmnidocBuild { | |
"-encoding", | ||
"UTF-8", | ||
"-source", | ||
"8", | ||
"11", | ||
|
||
) | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
sbt.version=1.3.13 | ||
sbt.version=1.7.1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay.version", "3.0.5")) | ||
addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay.version", "3.1.0-RC3")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Switching to sbt-ci-release/sbt-dynver