-
Notifications
You must be signed in to change notification settings - Fork 445
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
fixed Java version check in bash template #1111
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
val basename = "jdk-versions" | ||
|
||
scalacOptions in ThisBuild := Seq("-target:jvm-1.8") | ||
|
||
lazy val `jdk8` = project | ||
.in(file("jdk8")) | ||
.enablePlugins(JavaAppPackaging) | ||
.settings( | ||
name := basename + "-8", | ||
dockerBaseImage := "openjdk:8u162-jre", | ||
dockerBuildOptions := dockerBuildOptions.value ++ Seq("-t", "jdk-versions:8") | ||
) | ||
|
||
lazy val `jdk9` = project | ||
.in(file("jdk9")) | ||
.enablePlugins(JavaAppPackaging) | ||
.settings( | ||
name := basename + "-9", | ||
dockerBaseImage := "openjdk:9.0.4-jre", | ||
dockerBuildOptions := dockerBuildOptions.value ++ Seq("-t", "jdk-versions:9") | ||
) | ||
|
||
lazy val `jdk10` = project | ||
.in(file("jdk10")) | ||
.enablePlugins(JavaAppPackaging) | ||
.settings( | ||
name := basename + "-10", | ||
dockerBaseImage := "openjdk:10-jre", | ||
dockerBuildOptions := dockerBuildOptions.value ++ Seq("-t", "jdk-versions:10") | ||
) | ||
|
3 changes: 3 additions & 0 deletions
3
src/sbt-test/docker/jdk-versions/jdk10/src/main/scala/Hello.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
object Hello extends App { | ||
println("Hello JDK10!") | ||
} |
3 changes: 3 additions & 0 deletions
3
src/sbt-test/docker/jdk-versions/jdk8/src/main/scala/Hello.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
object Hello extends App { | ||
println("Hello JDK8!") | ||
} |
3 changes: 3 additions & 0 deletions
3
src/sbt-test/docker/jdk-versions/jdk9/src/main/scala/Hello.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
object Hello extends App { | ||
println("Hello JDK9!") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version")) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
> project jdk8 | ||
> docker:publishLocal | ||
$ exec bash -c 'docker run --rm jdk-versions:8 | grep -q "Hello JDK8!"' | ||
> project jdk9 | ||
> docker:publishLocal | ||
$ exec bash -c 'docker run --rm jdk-versions:9 | grep -q "Hello JDK9!"' | ||
> project jdk10 | ||
> docker:publishLocal | ||
$ exec bash -c 'docker run --rm jdk-versions:10 | grep -q "Hello JDK10!"' |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
it seems the scala doc compiler doesn't like this setting. I never actually fought
the docs compiler (only my colleagues), so sorry for not being a greater help here 😞
IIRC you can either turn the scaladoc generation off or do some research on how
to fix this 😎 I'm fine with either way 👍
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.
Thanks for pointing this out. Will push a fix. Normally limiting the scope should fix this.
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.
Awesome, thanks :)