Browse Source

upgrade fintrospect and scala (#5953)

David Denton 5 years ago
parent
commit
fa63403949

+ 3 - 0
frameworks/Scala/fintrospect/.gitignore

@@ -0,0 +1,3 @@
+sbt
+target/
+

+ 5 - 5
frameworks/Scala/fintrospect/build.sbt

@@ -2,7 +2,7 @@ name := """techempower-benchmarks-fintrospect"""
 
 version := "1.0"
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.3"
 
 scalacOptions += "-deprecation"
 
@@ -13,10 +13,10 @@ resolvers += "JCenter" at "https://jcenter.bintray.com"
 resolvers += Resolver.sonatypeRepo("snapshots")
 
 libraryDependencies ++= Seq(
-  "io.fintrospect" %% "fintrospect-core" % "15.0.2",
-  "io.fintrospect" %% "fintrospect-jackson" % "15.0.2",
-  "io.fintrospect" %% "fintrospect-mustache" % "15.0.2",
-  "com.twitter" %% "finagle-mysql" % "19.5.1"
+  "io.fintrospect" %% "fintrospect-core" % "17.0.0",
+  "io.fintrospect" %% "fintrospect-jackson" % "17.0.0",
+  "io.fintrospect" %% "fintrospect-mustache" % "17.0.0",
+  "com.twitter" %% "finagle-mysql" % "20.8.0"
 )
 
 assemblyMergeStrategy in assembly := {

+ 2 - 2
frameworks/Scala/fintrospect/fintrospect.dockerfile

@@ -1,7 +1,7 @@
-FROM hseeberger/scala-sbt:8u151-2.12.5-1.1.2
+FROM hseeberger/scala-sbt:8u222_1.3.5_2.13.1
 WORKDIR /fintrospect
 COPY project project
 COPY src src
 COPY build.sbt build.sbt
 RUN sbt assembly -batch
-CMD ["java", "-Dcom.twitter.finagle.toggle.flag.overrides=com.twitter.http.UseNetty4=1.0", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-XX:+AlwaysPreTouch", "-jar", "target/scala-2.12/techempower-benchmarks-fintrospect-assembly-1.0.jar"]
+CMD ["java", "-Dcom.twitter.finagle.toggle.flag.overrides=com.twitter.http.UseNetty4=1.0", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-XX:+AlwaysPreTouch", "-jar", "target/scala-2.13/techempower-benchmarks-fintrospect-assembly-1.0.jar"]

+ 1 - 1
frameworks/Scala/fintrospect/project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.2
+sbt.version=1.3.13