Merge branch 'release/0.6.3'

usommerl · May 17, 2021 · 0212ab9 · 0212ab9
2 parents 8e8d0d8 + a445146
commit 0212ab9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,4 +1,5 @@
 name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
 categories:
   - title: 'Enhancements'
     label: 'enhancement'

diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.3.4
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
@@ -21,14 +21,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.3.4
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
         java-version: 11
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v1.9.0
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
@@ -59,5 +59,4 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag: ${{ github.ref }}
         version: ${{ github.ref }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2 as builder
+FROM ghcr.io/graalvm/graalvm-ce:java11-21.1.0 as builder
 
 ARG upx_compression
 RUN gu install native-image

diff --git a/build.sbt b/build.sbt
@@ -3,13 +3,13 @@ ThisBuild / organization := "dev.usommerl"
 ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"
 
 val v = new {
-  val http4s  = "0.21.22"
+  val http4s  = "0.21.23"
   val circe   = "0.13.0"
   val ciris   = "1.2.1"
   val tapir   = "0.17.19"
   val odin    = "0.11.0"
-  val munit   = "0.7.23"
-  val munitCE = "1.0.1"
+  val munit   = "0.7.26"
+  val munitCE = "1.0.3"
 }
 
 val upx = "UPX_COMPRESSION"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.0
+sbt.version=1.5.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,5 +6,5 @@ addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"       % "0.10.0")
 addSbtPlugin("com.typesafe.sbt"          % "sbt-native-packager" % "1.8.1")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"        % "0.1.17")
 addSbtPlugin("org.scalameta"             % "sbt-scalafmt"        % "2.4.2")
-addSbtPlugin("org.scoverage"             % "sbt-scoverage"       % "1.6.1")
+addSbtPlugin("org.scoverage"             % "sbt-scoverage"       % "1.8.0")
 addSbtPlugin("se.marcuslonnberg"         % "sbt-docker"          % "1.8.2")
diff --git a/src/main/resources/META-INF/native-image/native-image.properties b/src/main/resources/META-INF/native-image/native-image.properties
@@ -8,6 +8,7 @@ Args = --verbose \
        --enable-all-security-services \
        --report-unsupported-elements-at-runtime \
        --initialize-at-build-time \
+       --initialize-at-run-time=org.http4s.multipart.Boundary$ \
        --allow-incomplete-classpath \
        -H:+ReportExceptionStackTraces \
        -H:+ReportUnsupportedElementsAtRuntime \

diff --git a/src/main/resources/META-INF/native-image/resource-config.json b/src/main/resources/META-INF/native-image/resource-config.json
@@ -1,12 +1,8 @@
 {
   "resources":{
   "includes":[
-    {"pattern":".*swagger-ui/.*"}, 
-    {"pattern":"\\QMETA-INF/maven/org.webjars/swagger-ui/pom.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/resources/webjars/swagger-ui/3.43.0/swagger-ui-bundle.js\\E"}, 
-    {"pattern":"\\QMETA-INF/resources/webjars/swagger-ui/3.43.0/swagger-ui-standalone-preset.js\\E"}, 
-    {"pattern":"\\QMETA-INF/resources/webjars/swagger-ui/3.43.0/swagger-ui.css\\E"}, 
-    {"pattern":"\\Qlibrary.properties\\E"}, 
+    {"pattern":".*swagger-ui/.*"},
+    {"pattern":"\\Qlibrary.properties\\E"},
     {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}
   ]},
   "bundles":[]