Update Graal to 20.2 and update scripts and native-image args

Author: hhandoko

Dockerfile

@@ -1,4 +1,4 @@
-FROM        oracle/graalvm-ce:19.3.0-java11 as assembler
+FROM        oracle/graalvm-ce:20.2.0-java11 as assembler
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM assembler"
 
@@ -14,29 +14,25 @@ RUN         (SBT_VERSION=$(cat project/build.properties | cut -d '=' -f 2 | tr -
 COPY        project/*.scala project/
 COPY        src/ src/
 COPY        build.sbt VERSION.txt ./
-RUN         ./sbt/bin/sbt -mem 4096 clean assembly
+RUN         ./sbt/bin/sbt -mem 4096 clean stage
 
 # ~~~~~~
 
-FROM        oracle/graalvm-ce:19.3.0-java11 as packager
+FROM        oracle/graalvm-ce:20.2.0-java11 as packager
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM native-image packager"
 
-ARG         APP_NAME
-ENV         APP_NAME ${APP_NAME:-realworld-assembly}
-ARG         APP_VERSION
-ENV         APP_VERSION ${APP_VERSION:-1.0.0-SNAPSHOT}
-
 WORKDIR     packager
 RUN         gu install native-image
-COPY        --from=assembler /assembler/target/scala-2.13/${APP_NAME}-${APP_VERSION}.jar ./
+COPY        --from=assembler /assembler/target/universal/stage/lib/*.jar ./
 RUN         native-image \
               --no-server \
-              -cp ${APP_NAME}-${APP_VERSION}.jar
+              --class-path "*" \
+              com.hhandoko.realworld.Main
 
 # ~~~~~~
 
-FROM        ubuntu:18.04
+FROM        ubuntu:20.04
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM native-image runtime container"
 

README.md

@@ -33,12 +33,12 @@ To run the API spec tests with [newman]:
 
 _Note: Node.js 8+ and globally installed [newman] package are required_
 
-### Production Packaging (uber-jar)
+### Production Packaging (universal format)
 
 To package and run it as an uber-jar:
 
-  1. Run `sbt assembly` to package the application into an uber-jar (`realworld-assembly-1.0.0-SNAPSHOT.jar`)
-  1. Run `java -jar target/scala-2.13/realworld-assembly-1.0.0-SNAPSHOT.jar` to run the web application
+  1. Run `sbt stage` to package the application into a universal distribution format (at `target/universal/stage/`)
+  1. Run `./target/universal/stage/bin/realworld` to run the web application
 
 ### Production Packaging (Graal Native Image)
 
@@ -51,7 +51,8 @@ To package and run it as a Graal native image:
 ```shell
 native-image \
   --no-server \
-  -cp target/scala-2.13/realworld-assembly-1.0.0-SNAPSHOT.jar
+  --class-path "target/universal/stage/lib/*" \
+  com.hhandoko.realworld.Main
 ```
 
   1. Run `./realworld` to run the web application
@@ -75,8 +76,8 @@ Please read [PROGRESS] for more details.
 
 # Issues
 
+  - Native image generation sometimes fail with non-initialized charset issue error message (simply retry until succeeds)
   - Native image generation with `jwt-scala` fails ([oracle/graal/#1152](https://github.com/oracle/graal/issues/1152))
-  - Native image generation with Scala 2.13 fails ([oracle/graal/#1863](https://github.com/oracle/graal/issues/1863))
   - JWT token decoding in native image fails ([oracle/graal/#1240](https://github.com/oracle/graal/issues/1240))
 
 # Contributing

build.sbt

@@ -1,4 +1,5 @@
 enablePlugins(FlywayPlugin)
+enablePlugins(JavaAppPackaging)
 
 lazy val realworld =
   (project in file("."))

project/Common.scala

@@ -4,8 +4,6 @@ import scala.io.Source
 import io.github.davidmweber.FlywayPlugin.autoImport._
 import sbt.Keys._
 import sbt._
-import sbtassembly.AssemblyKeys._
-import sbtassembly.MergeStrategy
 
 object Common {
 
@@ -25,18 +23,20 @@ object Common {
   private val logbackVersion = "1.2.3"
   private val specs2Version  = "4.10.2"
 
-  // Compiler plugin dependency versions
-  private val kindProjectorVersion    = "0.11.0"
+  // Compiler plugin (incl. Graal) dependency versions
   private val betterMonadicForVersion = "0.3.1"
+  private val kindProjectorVersion    = "0.11.0"
+  private val graalVmVersion          = "20.2.0"
 
   final val settings: Seq[Setting[_]] =
-    projectSettings ++ dependencySettings ++ flywaySettings ++ compilerPlugins ++ assemblySettings
+    projectSettings ++ dependencySettings ++ flywaySettings ++ compilerPlugins
 
   private[this] def projectSettings = Seq(
     organization := "com.hhandoko",
     name := "realworld",
     version := using(Source.fromFile("VERSION.txt")) { _.mkString },
-    scalaVersion := "2.13.3"
+    scalaVersion := "2.13.3",
+    mainClass in Compile := Some("com.hhandoko.realworld.Main")
   )
 
   private[this] def dependencySettings = Seq(
@@ -52,12 +52,13 @@ object Common {
       "org.http4s"            %% "http4s-circe"           % http4sVersion,
       "org.http4s"            %% "http4s-dsl"             % http4sVersion,
       "org.postgresql"        %  "postgresql"             % postgresVersion,
+      "org.scalameta"         %% "svm-subs"               % graalVmVersion % "compile-internal",
+      "org.specs2"            %% "specs2-core"            % specs2Version % Test,
       "org.tpolecat"          %% "doobie-core"            % doobieVersion,
       "org.tpolecat"          %% "doobie-h2"              % doobieVersion % Test,
       "org.tpolecat"          %% "doobie-hikari"          % doobieVersion,
       "org.tpolecat"          %% "doobie-postgres"        % doobieVersion,
-      "org.tpolecat"          %% "doobie-specs2"          % doobieVersion % Test,
-      "org.specs2"            %% "specs2-core"            % specs2Version % Test
+      "org.tpolecat"          %% "doobie-specs2"          % doobieVersion % Test
     )
   )
 
@@ -81,16 +82,6 @@ object Common {
     flywayLocations := Seq("filesystem:db/migration/postgresql", "filesystem:db/seed")
   )
 
-  private[this] def assemblySettings = Seq(
-    assemblyMergeStrategy in assembly := {
-      case "module-info.class" =>
-        MergeStrategy.concat
-      case f =>
-        val oldStrategy = (assemblyMergeStrategy in assembly).value
-        oldStrategy(f)
-    }
-  )
-
   /**
    * Basic auto-closing implementation for closeable resource.
    *

project/plugins.sbt

@@ -2,14 +2,14 @@
 // See: https://github.com/mefellows/sbt-dotenv
 addSbtPlugin("au.com.onegeek" %% "sbt-dotenv" % "2.1.146")
 
-// Add `assembly` task for creating uber-jar
-// See: https://github.com/sbt/sbt-assembly
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
-
 // Check Maven and Ivy repositories for dependency updates
 // See: https://github.com/rtimush/sbt-updates
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
 
+// Build application distribution packages in native formats
+// See: https://github.com/sbt/sbt-native-packager
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.6")
+
 // Pass recommended Scala compiler flags
 // See: https://github.com/DavidGregory084/sbt-tpolecat
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.14")

scripts/graal/bin/dist.sh

@@ -14,24 +14,13 @@ if [ $# -gt 0 ] ; then
     DIST_FOLDER=$1
 fi
 
-# Set application version
-APP_VERSION="`cat VERSION.txt`"
-
-# Set artifact name
-APP_NAME=realworld-assembly-${APP_VERSION}
-APP_JAR=${APP_NAME}.jar
-
 # Graal version and path
 GRAAL_JAVA_VERSION=java11
 GRAAL_DIR=scripts/graal
 GRAAL_VERSION=`cat ${GRAAL_DIR}/VERSION.txt`
 GRAAL_HOME=${GRAAL_DIR}/sdk/graalvm-ce-${GRAAL_JAVA_VERSION}-${GRAAL_VERSION}
 GRAAL_BIN=''
 
-# SunEC path
-SUNEC_PLATFORM=amd64
-SUNEC_PATH=${GRAAL_HOME}/jre/lib/${SUNEC_PLATFORM}
-
 # Choose Graal SDK distribution for supported OSes
 OS_NAME="`uname`"
 set_graal_dist() {
@@ -59,9 +48,9 @@ clean_dist_folder() {
 
 # Create an uber-jar and copy the artifact to the distribution folder
 create_assembly() {
-    echo "${C_YELLOW}Packaging into uber-jar${C_RESET}"
-    sbt -mem 4096 assembly
-    cp target/scala-2.12/${APP_JAR} ${DIST_FOLDER}
+    echo "${C_YELLOW}Packaging into universal distribution format${C_RESET}"
+    sbt -mem 4096 stage
+    cp target/universal/stage/lib/*.jar ${DIST_FOLDER}
 }
 
 # Create native image in the distribution folder
@@ -76,7 +65,8 @@ create_native() {
     (cd ${DIST_FOLDER} \
         && ../${GRAAL_HOME}/${GRAAL_BIN}/native-image \
               --no-server \
-              -cp ${APP_JAR})
+              --class-path "*" \
+              com.hhandoko.realworld.Main)
 }
 
 # Run

src/main/resources/META-INF/native-image/realworld-application/native-image.properties src/main/resources/META-INF/native-image/com.hhandoko/realworld/native-image.properties

@@ -1,7 +1,7 @@
 Args = --allow-incomplete-classpath \
        --enable-all-security-services \
-       --initialize-at-build-time=ch.qos.logback,org.slf4j \
-       --initialize-at-run-time=scala.Symbol$ \
+       --initialize-at-build-time \
+       --initialize-at-run-time=org.postgresql.sspi.SSPIClient \
        -H:+ReportUnsupportedElementsAtRuntime \
        -H:Class=com.hhandoko.realworld.Main \
        -H:EnableURLProtocols=http,https \