update dependencies

rmgk · Nov 14, 2020 · c770a04 · c770a04
1 parent e5af39c
commit c770a04
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 24 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,8 +5,8 @@ import Dependencies._
 import Settings._
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
-val lociVersion = "0.4.0-16-ga880ec8"
-val rescalaVersion = "0.30.0+228-c3c37c47"
+val lociVersion = "0.4.0-17-g4294a47"
+val rescalaVersion = "0.30.0+231-e7d59bbf"
 
 inThisBuild(scalaVersion_213)
 ThisBuild / organization := "de.rmgk"

diff --git a/code/jvm/src/main/resources/META-INF/native-image/jni-config.json b/code/jvm/src/main/resources/META-INF/native-image/jni-config.json
@@ -1,2 +1,15 @@
 [
+{
+  "name":"java.lang.ClassLoader",
+  "methods":[
+    {"name":"getPlatformClassLoader","parameterTypes":[] }, 
+    {"name":"loadClass","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"java.lang.ClassNotFoundException"
+},
+{
+  "name":"java.lang.NoSuchMethodError"
+}
 ]
diff --git a/code/jvm/src/main/resources/META-INF/native-image/reflect-config.json b/code/jvm/src/main/resources/META-INF/native-image/reflect-config.json
@@ -1,7 +1,4 @@
 [
-{
-  "name":"com.nixxcode.jvmbrotli.common.BrotliLoader"
-},
 {
   "name":"io.javalin.websocket.WsHandlerController",
   "allDeclaredMethods":true
@@ -30,6 +27,12 @@
   "name":"java.lang.Long",
   "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.lang.Module"
+},
+{
+  "name":"java.lang.ModuleLayer"
+},
 {
   "name":"java.lang.Object",
   "allDeclaredMethods":true
@@ -60,6 +63,9 @@
   "name":"java.lang.module.ModuleReference",
   "methods":[{"name":"location","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.module.ResolvedModule"
+},
 {
   "name":"java.nio.file.FileVisitOption[]"
 },
@@ -69,6 +75,18 @@
 {
   "name":"java.nio.file.OpenOption[]"
 },
+{
+  "name":"org.eclipse.jetty.servlet.FilterHolder[]"
+},
+{
+  "name":"org.eclipse.jetty.servlet.FilterMapping[]"
+},
+{
+  "name":"org.eclipse.jetty.servlet.ListenerHolder[]"
+},
+{
+  "name":"org.eclipse.jetty.servlet.ServletHolder[]"
+},
 {
   "name":"org.eclipse.jetty.servlet.ServletMapping[]"
 },
@@ -86,8 +104,5 @@
 },
 {
   "name":"org.slf4j.impl.StaticLoggerBinder"
-},
-{
-  "name":"scala.Symbol"
 }
 ]
diff --git a/code/jvm/src/main/resources/META-INF/native-image/resource-config.json b/code/jvm/src/main/resources/META-INF/native-image/resource-config.json
@@ -2,12 +2,10 @@
   "resources":[
     {"pattern":"\\QMETA-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder\\E"}, 
     {"pattern":"\\QMETA-INF/services/org.eclipse.jetty.websocket.api.extensions.Extension\\E"}, 
-    {"pattern":"\\Qlib/linux-x86-amd64/libbrotli.so\\E"}, 
     {"pattern":"\\Qorg/eclipse/jetty/http/encoding.properties\\E"}, 
     {"pattern":"\\Qorg/eclipse/jetty/http/mime.properties\\E"}, 
     {"pattern":"\\Qorg/eclipse/jetty/version/build.properties\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
-    {"pattern":"\\Qversion\\E"}
+    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}
   ],
   "bundles":[{"name":"javax.servlet.LocalStrings"}]
 }
diff --git a/project/Build.scala b/project/Build.scala
@@ -142,7 +142,7 @@ object Dependencies {
   val cats          = ld += "org.typelevel"       %%% "cats-core"       % "2.2.0"
   val decline       = ld += "com.monovore"        %%% "decline"         % "1.3.0"
   val fastparse     = ld += "com.lihaoyi"         %%% "fastparse"       % "2.3.0"
-  val javalin       = ld += "io.javalin"            % "javalin"         % "3.10.1"
+  val javalin       = ld += "io.javalin"            % "javalin"         % "3.11.2"
   val jsoup         = ld += "org.jsoup"             % "jsoup"           % "1.13.1"
   val kaleidoscope  = ld += "com.propensive"      %%% "kaleidoscope"    % "0.1.0"
   val magnolia      = ld += "com.propensive"      %%% "magnolia"        % "0.15.0"
@@ -157,7 +157,7 @@ object Dependencies {
   val upickle       = ld += "com.lihaoyi"          %% "upickle"         % "[0.7.4,1.1.0]"
 
   val jsoniter = {
-    val jsoniterVersion = "2.6.0"
+    val jsoniterVersion = "2.6.2"
     ld ++= Seq(
       "com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core"   % jsoniterVersion exclude ("io.github.cquiroz", s"scala-java-time-tzdb_sjs1_${scalaVersion.value.substring(0, 4)}"), //exclude("io.github.cquiroz", s"scala-java-time_sjs1_${scalaVersion.value.substring(0,4)}"),
       "com.github.plokhotnyuk.jsoniter-scala"  %% "jsoniter-scala-macros" % jsoniterVersion % "provided" // or "compile-internal"
@@ -176,20 +176,20 @@ object Dependencies {
 
   // frontend
   val normalizecss      = ld += "org.webjars.npm" % "normalize.css" % "8.0.1"
-  val scalatagsVersion  = "[0.6.8,0.9.1]"
+  val scalatagsVersion  = "[0.6.8,0.10.0)"
   val scalatags         = ld += "com.lihaoyi"   %%% "scalatags"     % scalatagsVersion
   val scalajsdomVersion = "1.1.0"
   val scalajsdom        = ld += "org.scala-js"  %%% "scalajs-dom"   % scalajsdomVersion
   val fontawesome       = ld += "org.webjars"     % "font-awesome"  % "5.10.1"
 
   // tests
-  val scalacheck         = ld += "org.scalacheck"    %%% "scalacheck"      % "1.14.3"  % "test"
+  val scalacheck         = ld += "org.scalacheck"    %%% "scalacheck"      % "1.15.1"  % "test"
   val scalatestpluscheck = ld += "org.scalatestplus" %%% "scalacheck-1-14" % "3.2.2.0" % "test"
-  val scalatest          = ld += "org.scalatest"     %%% "scalatest"       % "3.2.2"   % "test"
+  val scalatest          = ld += "org.scalatest"     %%% "scalatest"       % "3.2.3"   % "test"
 
   // legacy
   val scalaXml   = ld += "org.scala-lang.modules" %% "scala-xml"   % "1.3.0"
-  val scalaswing = ld += "org.scala-lang.modules" %% "scala-swing" % "2.1.1"
+  val scalaswing = ld += "org.scala-lang.modules" %% "scala-swing" % "3.0.0"
 
   case class Loci(version: String = "0.4.0") {
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.0
+sbt.version=1.4.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,20 +8,20 @@
 // addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
 
 // scalajs 1.0
-addSbtPlugin("ch.epfl.scala"           % "sbt-scalajs-bundler"      % "0.18.0") // https://github.com/scalacenter/scalajs-bundler
+addSbtPlugin("ch.epfl.scala"           % "sbt-scalajs-bundler"      % "0.20.0") // https://github.com/scalacenter/scalajs-bundler
 addSbtPlugin("org.portable-scala"      % "sbt-scalajs-crossproject" % "1.0.0")
-addSbtPlugin("org.scala-js"            % "sbt-scalajs"              % "1.2.0")
+addSbtPlugin("org.scala-js"            % "sbt-scalajs"              % "1.3.0")
 libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"
 
 addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.5.1")
 
 // operations
 addSbtPlugin("com.dwijnand"     % "sbt-dynver"          % "4.1.1") // https://github.com/dwijnand/sbt-dynver
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5") // https://github.com/sbt/sbt-native-packager
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.6") // https://github.com/sbt/sbt-native-packager
 
 // tooling
 addSbtPlugin("org.tpolecat"       % "tut-plugin" % "0.6.13")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"    % "0.4.0")
 
 // dotty?
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.2")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
diff --git a/publish-dependencies.sh b/publish-dependencies.sh
@@ -4,12 +4,14 @@ mkdir dependencies
 cd dependencies
 git clone https://github.com/rescala-lang/REScala.git rescala
 cd rescala
-git reset --hard c3c37c4739b4a0b0ab40adc5c94473d0f8ccc498
+git reset --hard e7d59bbf2280caa25305aa8b4db9c66ed5a60f51
 sbt publishLocal
 cd ..
+
+
 git clone https://github.com/scala-loci/scala-loci.git loci
 cd loci
-git reset --hard a880ec8639ff48f6d85a869cb8a3117dfa06287a
+git reset --hard 4294a4797dde181ebfa8a82203299c50b9f8fc9b
 sbt publishLocal
 cd ..
 cd ..