Merge branch 'develop' into etcm-43-opt-out-header-field

input-output-hk · Sep 22, 2020 · 3fabf92 · 3fabf92
2 parents 071d36a + 12e6b6e
commit 3fabf92
Show file tree

Hide file tree

Showing 32 changed files with 1,211 additions and 744 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -25,10 +25,10 @@ object Dependencies {
     )
   }
 
-  val json4s = Seq("org.json4s" %% "json4s-native" % "3.5.4")
+  val json4s = Seq("org.json4s" %% "json4s-native" % "3.6.9")
 
   val circe: Seq[ModuleID] = {
-    val circeVersion = "0.12.1" //0.9.3
+    val circeVersion = "0.13.0"
 
     Seq(
       "io.circe" %% "circe-core" % circeVersion,
@@ -45,9 +45,9 @@ object Dependencies {
   )
 
   val enumeratum: Seq[ModuleID] = Seq(
-    "com.beachape" %% "enumeratum" % "1.5.13",
-    "com.beachape" %% "enumeratum-cats" % "1.5.15",
-    "com.beachape" %% "enumeratum-scalacheck" % "1.5.16" % Test
+    "com.beachape" %% "enumeratum" % "1.6.1",
+    "com.beachape" %% "enumeratum-cats" % "1.6.1",
+    "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test
   )
 
   val testing: Seq[ModuleID] = Seq(
@@ -57,16 +57,16 @@ object Dependencies {
   )
 
   val cats: Seq[ModuleID] = {
-    val catsVersion = "2.0.0"
+    val catsVersion = "2.2.0"
     Seq(
-      "org.typelevel" %% "mouse" % "0.23",
+      "org.typelevel" %% "mouse" % "0.25",
       "org.typelevel" %% "cats-core" % catsVersion,
       "org.typelevel" %% "cats-effect" % catsVersion
     )
   }
 
   val monix = Seq(
-    "io.monix" %% "monix" % "3.1.0"
+    "io.monix" %% "monix" % "3.2.2"
   )
 
   val logging = Seq(

diff --git a/repo.nix b/repo.nix
diff --git a/src/it/resources/logback-test.xml b/src/it/resources/logback-test.xml
@@ -0,0 +1,32 @@
+<configuration>
+
+    <property name="stdoutEncoderPattern" value="%d{HH:mm:ss} [%logger{36}] - %msg%n" />
+    <property name="fileEncoderPattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} %X{akkaSource} - %msg%n" />
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${stdoutEncoderPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${user.home}/.mantis/logs/mantis.log</file>
+        <append>true</append>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>${user.home}/.mantis/logs/mantis.%i.log.zip</fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>10</maxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>10MB</maxFileSize>
+        </triggeringPolicy>
+        <encoder>
+            <pattern>${fileEncoderPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>