Skip to content
This repository has been archived by the owner on Jul 30, 2024. It is now read-only.

Update AvSystem's commons-core, circe, jsoniter-scala, sbt, and scala 2.12.x #324

Merged
merged 3 commits into from
Sep 11, 2019
Merged
Changes from all commits
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
2 changes: 1 addition & 1 deletion .jvmopts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-Xmx2g
-XX:MaxMetaspaceSize=512m
-XX:MaxMetaspaceSize=1g
-XX:ReservedCodeCacheSize=256m
-XX:+UseParallelGC
-Dfile.encoding=UTF8
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@ stages:

jobs:
include:
- script: sbt +test:compile +test
- script: sbt -Dsbt.supershell=false +test:compile +test
- stage: release
script: sbt ci-release
script: sbt -Dsbt.supershell=false ci-release

cache:
directories:
18 changes: 8 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -60,14 +60,13 @@ lazy val `akka-http-circe` =
.enablePlugins(AutomateHeaderPlugin)
.settings(settings)
.settings(
crossScalaVersions := Seq(scalaVersion.value, "2.11.12"),
crossScalaVersions := Seq("2.13.0", scalaVersion.value, "2.11.12"),
libraryDependencies ++= Seq(
library.akkaHttp,
library.akkaStream,
library.circe,
library.circeParser,
library.circeJawn,
library.circeGeneric % Test,
if (scalaVersion.value == "2.11.12") library.circe.withRevision("0.11.1") else library.circe,
if (scalaVersion.value == "2.11.12") library.circeParser.withRevision("0.11.1") else library.circeParser,
(if (scalaVersion.value == "2.11.12") library.circeGeneric.withRevision("0.11.1") else library.circeGeneric) % Test,
library.scalaTest % Test
)
)
@@ -186,14 +185,14 @@ lazy val library =
val akkaHttp = "10.1.9"
val argonaut = "6.2.3"
val avro4s = "3.0.1"
val circe = "0.11.1"
val circe = "0.12.1"
val jacksonModuleScala = "2.9.9"
val jsoniterScala = "0.55.0"
val jsoniterScala = "0.55.2"
val json4s = "3.6.7"
val play = "2.7.4"
val scalaTest = "3.0.8"
val upickle = "0.7.5"
val avsystemCommons = "1.39.0"
val avsystemCommons = "1.40.0"
}
val akkaHttp = "com.typesafe.akka" %% "akka-http" % Version.akkaHttp
val akkaHttpJacksonJava = "com.typesafe.akka" %% "akka-http-jackson" % Version.akkaHttp
@@ -203,7 +202,6 @@ lazy val library =
val avsystemCommons = "com.avsystem.commons" %% "commons-core" % Version.avsystemCommons
val circe = "io.circe" %% "circe-core" % Version.circe
val circeParser = "io.circe" %% "circe-parser" % Version.circe
val circeJawn = "io.circe" %% "circe-jawn" % Version.circe
val circeGeneric = "io.circe" %% "circe-generic" % Version.circe
val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Version.jacksonModuleScala
val json4sCore = "org.json4s" %% "json4s-core" % Version.json4s
@@ -228,7 +226,7 @@ lazy val settings =

lazy val commonSettings =
Seq(
scalaVersion := "2.12.9",
scalaVersion := "2.12.10",
organizationName := "Heiko Seeberger",
startYear := Some(2015),
scalacOptions ++= Seq(
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.2.8
sbt.version = 1.3.0