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

Drop Java 8 #207

Merged
merged 8 commits into from
Sep 30, 2022
Merged

Drop Java 8 #207

merged 8 commits into from
Sep 30, 2022

Conversation

mkurz
Copy link
Member

@mkurz mkurz commented Sep 29, 2022

No description provided.

@mkurz mkurz changed the title Drop java8 Drop Java 8 Sep 29, 2022
@ihostage ihostage mentioned this pull request Sep 30, 2022
30 tasks
Omnidoc / javadoc / tastyFiles from Omnidoc / javadoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
Omnidoc / compile / bspReporter from Omnidoc / javadoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
Omnidoc / scaladoc / tastyFiles from Omnidoc / scaladoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
Omnidoc / compile / bspReporter from Omnidoc / scaladoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
@@ -195,12 +180,14 @@ object OmnidocBuild {

def compilerReporterSettings = Seq(
compile / compilerReporter := {
new sbt.internal.server.LanguageServerReporter(
new sbt.internal.inc.LoggedReporter(
Copy link
Member Author

Choose a reason for hiding this comment

The 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
Copy link
Member Author

Choose a reason for hiding this comment

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

Needed to fix (because of sbt upgrade)

References to undefined settings:
Omnidoc / javadoc / tastyFiles from Omnidoc / javadoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
Omnidoc / compile / bspReporter from Omnidoc / javadoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
Omnidoc / scaladoc / tastyFiles from Omnidoc / scaladoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)
Omnidoc / compile / bspReporter from Omnidoc / scaladoc ((sbt.Defaults.docTaskSettings) Defaults.scala:2123)

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.

@@ -118,13 +117,17 @@ object OmnidocBuild {

def projectSettings: Seq[Setting[_]] = Seq(
name := "play-omnidoc",
version := playVersion,
Copy link
Member Author

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

@mkurz
Copy link
Member Author

mkurz commented Sep 30, 2022

So, I am going to merge this. It was a bit a pita to figure everything out.
However, what I did to make sure that everyhing works correctly:

  • publishLocal from the main branch (with this pull request applied)
  • publishLocal from the 2.8.16 tag

and then compare both jar files in the ~/.ivy2/local/com.typesafe.play/play-omnidoc_2.13/ folder.
Bot where the same size (15MB) and contain almost the same files (the docs), (only difference was that in main we upgraded some libraries already, so of course there where a bit textual changes).

For me this confirms this is working correctly.

@mkurz mkurz merged commit 92f9d04 into playframework:main Sep 30, 2022
@mkurz mkurz deleted the dropJava8 branch September 30, 2022 10:05
@mkurz mkurz mentioned this pull request Sep 30, 2022
@mkurz
Copy link
Member Author

mkurz commented Sep 30, 2022

So another proof this worked correctly:
After merging this pull request there was a snapshot published:
https://oss.sonatype.org/content/repositories/snapshots/com/typesafe/play/play-omnidoc_2.13/2.8.2+109-92f9d044-SNAPSHOT/
You can compare that with the currenct 2.8.16 artifacts: https://repo1.maven.org/maven2/com/typesafe/play/play-omnidoc_2.13/2.8.16/
You see both main jars almost the same, if you extract them, you will see the docs inside basically are the same (like I said just main uses new versions so therea re subtle differences)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant