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

fixed Java version check in bash template #1111

Merged
merged 2 commits into from
Mar 23, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,22 @@ java_version_check() {
echo Please go to http://www.java.com/getjava/ and download
echo
exit 1
elif [[ ! "$java_version" > "1.6" ]]; then
echo
echo The java installation you have is not up to date
echo $app_name requires at least version 1.6+, you have
echo version $java_version
echo
echo Please go to http://www.java.com/getjava/ and download
echo a valid Java Runtime and install before running $app_name.
echo
exit 1
else
local major=$(echo "$java_version" | cut -d'.' -f1)
if [[ "$major" -eq "1" ]]; then
local major=$(echo "$java_version" | cut -d'.' -f2)
fi
if [[ "$major" -lt "6" ]]; then
echo
echo The java installation you have is not up to date
echo $app_name requires at least version 1.6+, you have
echo version $java_version
echo
echo Please go to http://www.java.com/getjava/ and download
echo a valid Java Runtime and install before running $app_name.
echo
exit 1
fi
fi
}

Expand Down
31 changes: 31 additions & 0 deletions src/sbt-test/docker/jdk-versions/build.sbt
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")
Copy link
Contributor

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 👍

Copy link
Contributor Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Awesome, thanks :)


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

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
object Hello extends App {
println("Hello JDK10!")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
object Hello extends App {
println("Hello JDK8!")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
object Hello extends App {
println("Hello JDK9!")
}
2 changes: 2 additions & 0 deletions src/sbt-test/docker/jdk-versions/project/plugins.sbt
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"))

9 changes: 9 additions & 0 deletions src/sbt-test/docker/jdk-versions/test
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!"'