Skip to content

Commit f9ea866

Browse files
sideeffffectsideeffffect
committed
merge fixes
1 parent e958b10 commit f9ea866

File tree

12 files changed

+207
-1
lines changed

12 files changed

+207
-1
lines changed

‎example/lock.sbt

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// DON'T EDIT THIS FILE.
2+
// This file is auto generated by sbt-lock 0.6.1.
3+
// https://github.com/tkawachi/sbt-lock/
4+
dependencyOverrides ++= {
5+
if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
6+
Seq.empty
7+
} else {
8+
Seq(
9+
"com.chuusai" % "shapeless_2.13" % "2.3.3",
10+
"com.geirsson" % "metaconfig-core_2.13" % "0.9.4",
11+
"com.geirsson" % "metaconfig-typesafe-config_2.13" % "0.9.4",
12+
"com.github.ghik" % "silencer-lib_2.13.0" % "1.4.3",
13+
"com.github.pureconfig" % "pureconfig-core_2.13" % "0.12.0",
14+
"com.github.pureconfig" % "pureconfig-generic_2.13" % "0.12.0",
15+
"com.github.pureconfig" % "pureconfig-macros_2.13" % "0.12.0",
16+
"com.github.pureconfig" % "pureconfig_2.13" % "0.12.0",
17+
"com.google.protobuf" % "protobuf-java" % "3.7.1",
18+
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0",
19+
"com.ibm.icu" % "icu4j" % "59.1",
20+
"com.lihaoyi" % "fansi_2.13" % "0.2.7",
21+
"com.lihaoyi" % "fastparse_2.13" % "2.1.3",
22+
"com.lihaoyi" % "pprint_2.13" % "0.5.5",
23+
"com.lihaoyi" % "sourcecode_2.13" % "0.1.7",
24+
"com.openhtmltopdf" % "openhtmltopdf-core" % "0.0.1-RC13",
25+
"com.openhtmltopdf" % "openhtmltopdf-jsoup-dom-converter" % "0.0.1-RC13",
26+
"com.openhtmltopdf" % "openhtmltopdf-pdfbox" % "0.0.1-RC13",
27+
"com.openhtmltopdf" % "openhtmltopdf-rtl-support" % "0.0.1-RC13",
28+
"com.thesamet.scalapb" % "lenses_2.13" % "0.9.0",
29+
"com.thesamet.scalapb" % "scalapb-runtime_2.13" % "0.9.0",
30+
"com.typesafe" % "config" % "1.3.4",
31+
"com.vladsch.flexmark" % "flexmark" % "0.40.4",
32+
"com.vladsch.flexmark" % "flexmark-all" % "0.40.4",
33+
"com.vladsch.flexmark" % "flexmark-ext-abbreviation" % "0.40.4",
34+
"com.vladsch.flexmark" % "flexmark-ext-admonition" % "0.40.4",
35+
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.40.4",
36+
"com.vladsch.flexmark" % "flexmark-ext-aside" % "0.40.4",
37+
"com.vladsch.flexmark" % "flexmark-ext-attributes" % "0.40.4",
38+
"com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.40.4",
39+
"com.vladsch.flexmark" % "flexmark-ext-definition" % "0.40.4",
40+
"com.vladsch.flexmark" % "flexmark-ext-emoji" % "0.40.4",
41+
"com.vladsch.flexmark" % "flexmark-ext-enumerated-reference" % "0.40.4",
42+
"com.vladsch.flexmark" % "flexmark-ext-escaped-character" % "0.40.4",
43+
"com.vladsch.flexmark" % "flexmark-ext-footnotes" % "0.40.4",
44+
"com.vladsch.flexmark" % "flexmark-ext-gfm-issues" % "0.40.4",
45+
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.40.4",
46+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.40.4",
47+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.40.4",
48+
"com.vladsch.flexmark" % "flexmark-ext-gfm-users" % "0.40.4",
49+
"com.vladsch.flexmark" % "flexmark-ext-gitlab" % "0.40.4",
50+
"com.vladsch.flexmark" % "flexmark-ext-ins" % "0.40.4",
51+
"com.vladsch.flexmark" % "flexmark-ext-jekyll-front-matter" % "0.40.4",
52+
"com.vladsch.flexmark" % "flexmark-ext-jekyll-tag" % "0.40.4",
53+
"com.vladsch.flexmark" % "flexmark-ext-macros" % "0.40.4",
54+
"com.vladsch.flexmark" % "flexmark-ext-media-tags" % "0.40.4",
55+
"com.vladsch.flexmark" % "flexmark-ext-superscript" % "0.40.4",
56+
"com.vladsch.flexmark" % "flexmark-ext-tables" % "0.40.4",
57+
"com.vladsch.flexmark" % "flexmark-ext-toc" % "0.40.4",
58+
"com.vladsch.flexmark" % "flexmark-ext-typographic" % "0.40.4",
59+
"com.vladsch.flexmark" % "flexmark-ext-wikilink" % "0.40.4",
60+
"com.vladsch.flexmark" % "flexmark-ext-xwiki-macros" % "0.40.4",
61+
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % "0.40.4",
62+
"com.vladsch.flexmark" % "flexmark-ext-youtube-embedded" % "0.40.4",
63+
"com.vladsch.flexmark" % "flexmark-formatter" % "0.40.4",
64+
"com.vladsch.flexmark" % "flexmark-html-parser" % "0.40.4",
65+
"com.vladsch.flexmark" % "flexmark-jira-converter" % "0.40.4",
66+
"com.vladsch.flexmark" % "flexmark-pdf-converter" % "0.40.4",
67+
"com.vladsch.flexmark" % "flexmark-profile-pegdown" % "0.40.4",
68+
"com.vladsch.flexmark" % "flexmark-util" % "0.40.4",
69+
"com.vladsch.flexmark" % "flexmark-youtrack-converter" % "0.40.4",
70+
"commons-logging" % "commons-logging" % "1.2",
71+
"de.rototor.pdfbox" % "graphics2d" % "0.12",
72+
"dev.zio" % "zio-interop-cats_2.13" % "2.0.0.0-RC4",
73+
"dev.zio" % "zio-stacktracer_2.13" % "1.0.0-RC13",
74+
"dev.zio" % "zio-streams_2.13" % "1.0.0-RC13",
75+
"dev.zio" % "zio-test_2.13" % "1.0.0-RC13",
76+
"dev.zio" % "zio_2.13" % "1.0.0-RC13",
77+
"io.methvin" % "directory-watcher" % "0.8.0",
78+
"io.undertow" % "undertow-core" % "2.0.13.Final",
79+
"jline" % "jline" % "2.14.6",
80+
"me.xdrop" % "fuzzywuzzy" % "1.1.10",
81+
"net.java.dev.jna" % "jna" % "4.2.1",
82+
"org.apache.pdfbox" % "fontbox" % "2.0.8",
83+
"org.apache.pdfbox" % "pdfbox" % "2.0.8",
84+
"org.apache.pdfbox" % "xmpbox" % "2.0.8",
85+
"org.jboss.logging" % "jboss-logging" % "3.3.2.Final",
86+
"org.jboss.threads" % "jboss-threads" % "2.3.0.Beta2",
87+
"org.jboss.xnio" % "xnio-api" % "3.6.5.Final",
88+
"org.jboss.xnio" % "xnio-nio" % "3.6.5.Final",
89+
"org.jsoup" % "jsoup" % "1.10.2",
90+
"org.nibor.autolink" % "autolink" % "0.6.0",
91+
"org.portable-scala" % "portable-scala-reflect_2.13" % "0.1.0",
92+
"org.scala-lang.modules" % "scala-collection-compat_2.13" % "2.1.2",
93+
"org.scalameta" % "common_2.13" % "4.2.2",
94+
"org.scalameta" % "fastparse-utils_2.13" % "1.0.1",
95+
"org.scalameta" % "fastparse_2.13" % "1.0.1",
96+
"org.scalameta" % "mdoc-runtime_2.13" % "1.3.2",
97+
"org.scalameta" % "mdoc_2.13" % "1.3.2",
98+
"org.scalameta" % "parsers_2.13" % "4.2.2",
99+
"org.scalameta" % "scalameta_2.13" % "4.2.2",
100+
"org.scalameta" % "trees_2.13" % "4.2.2",
101+
"org.slf4j" % "slf4j-api" % "1.8.0-beta2",
102+
"org.slf4j" % "slf4j-nop" % "1.8.0-beta2",
103+
"org.typelevel" % "cats-core_2.13" % "2.0.0",
104+
"org.typelevel" % "cats-effect_2.13" % "2.0.0",
105+
"org.typelevel" % "cats-kernel_2.13" % "2.0.0",
106+
"org.typelevel" % "cats-macros_2.13" % "2.0.0",
107+
"org.typelevel" % "paiges-core_2.13" % "0.2.4",
108+
"org.wildfly.client" % "wildfly-client-config" % "1.0.0.Final",
109+
"org.wildfly.common" % "wildfly-common" % "1.3.0.Final"
110+
)
111+
}
112+
}
113+
// LIBRARY_DEPENDENCIES_HASH 2ecbeff21d9e9c801655c00abef68c216e500a17

‎example/src/main/scala/com/avast/server/toolkit/example/Main.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import zio.{Task, ZIO}
1313

1414
object Main extends CatsApp {
1515

16+
@SuppressWarnings(Array("org.wartremover.warts.StringPlusAny")) // false positive
1617
def program: Resource[Task, Unit] = {
1718
for {
1819
_ <- Resource.liftF(PureConfigModule.makeOrRaise[Task, Configuration])
@@ -26,7 +27,7 @@ object Main extends CatsApp {
2627
} yield ()
2728
}
2829

29-
@silent("dead code")
30+
@silent("dead code") // false positive
3031
override def run(args: List[String]): ZIO[Environment, Nothing, Int] = {
3132
program
3233
.use(_ => Task.never)

‎jvm-execution/lock.sbt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// DON'T EDIT THIS FILE.
2+
// This file is auto generated by sbt-lock 0.6.1.
3+
// https://github.com/tkawachi/sbt-lock/
4+
dependencyOverrides ++= {
5+
if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
6+
Seq.empty
7+
} else {
8+
Seq(
9+
"com.github.ghik" % "silencer-lib_2.13.0" % "1.4.3",
10+
"org.slf4j" % "slf4j-api" % "1.7.28",
11+
"org.typelevel" % "cats-core_2.13" % "2.0.0",
12+
"org.typelevel" % "cats-effect_2.13" % "2.0.0",
13+
"org.typelevel" % "cats-kernel_2.13" % "2.0.0",
14+
"org.typelevel" % "cats-macros_2.13" % "2.0.0"
15+
)
16+
}
17+
}
18+
// LIBRARY_DEPENDENCIES_HASH 8ec7b1acad1dadbbf2548cd09d3b7cf9f351209a

‎jvm-execution/src/main/scala/com/avast/server/toolkit/execution/ConfigurableThreadFactory.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ object ConfigurableThreadFactory {
3535
/**
3636
* @param nameFormat Formatted with long number, e.g. my-thread-%02d
3737
*/
38+
@SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
3839
final case class Config(nameFormat: Option[String] = None,
3940
daemon: Boolean = false,
4041
priority: Int = Thread.NORM_PRIORITY,

‎jvm-execution/src/main/scala/com/avast/server/toolkit/execution/ForkJoinPoolConfig.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.avast.server.toolkit.execution
33
import ForkJoinPoolConfig.TaskPeekingMode
44
import ForkJoinPoolConfig.TaskPeekingMode.{FIFO, LIFO}
55

6+
@SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
67
final case class ForkJoinPoolConfig(parallelismMin: Int = 8,
78
parallelismFactor: Double = 1.0,
89
parallelismMax: Int = 64,

‎jvm-execution/src/main/scala/com/avast/server/toolkit/execution/ThreadPoolExecutorConfig.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import java.util.concurrent.TimeUnit
44

55
import scala.concurrent.duration.{Duration, FiniteDuration}
66

7+
@SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
78
final case class ThreadPoolExecutorConfig(coreSize: Int,
89
maxSize: Int,
910
keepAlive: FiniteDuration = Duration(1000L, TimeUnit.MILLISECONDS),

‎jvm-ssl/lock.sbt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// DON'T EDIT THIS FILE.
2+
// This file is auto generated by sbt-lock 0.6.1.
3+
// https://github.com/tkawachi/sbt-lock/
4+
dependencyOverrides ++= {
5+
if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
6+
Seq.empty
7+
} else {
8+
Seq(
9+
"com.github.ghik" % "silencer-lib_2.13.0" % "1.4.3",
10+
"org.typelevel" % "cats-core_2.13" % "2.0.0",
11+
"org.typelevel" % "cats-effect_2.13" % "2.0.0",
12+
"org.typelevel" % "cats-kernel_2.13" % "2.0.0",
13+
"org.typelevel" % "cats-macros_2.13" % "2.0.0"
14+
)
15+
}
16+
}
17+
// LIBRARY_DEPENDENCIES_HASH 3c115232d5575d261ed52ade3d2e64044c9447e4

‎jvm-ssl/src/main/scala/com/avast/server/toolkit/ssl/SslContextConfig.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.avast.server.toolkit.ssl
33
import com.avast.server.toolkit.ssl.Protocol.TLS
44
import com.avast.server.toolkit.ssl.Protocol.TLS
55

6+
@SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
67
final case class SslContextConfig(protocol: Protocol = TLS,
78
keystore: Option[KeyStoreConfig] = None,
89
truststore: Option[KeyStoreConfig] = None,

‎jvm-ssl/src/main/scala/com/avast/server/toolkit/ssl/SslContextModule.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import javax.net.ssl.{KeyManager, KeyManagerFactory, SSLContext, TrustManager, T
1111

1212
import scala.language.higherKinds
1313

14+
@SuppressWarnings(Array("org.wartremover.warts.Null"))
1415
object SslContextModule {
1516

1617
/** Loads [[javax.net.ssl.SSLContext]] and fills it with key/trust managers from the provided config. */

‎jvm-system/lock.sbt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// DON'T EDIT THIS FILE.
2+
// This file is auto generated by sbt-lock 0.6.1.
3+
// https://github.com/tkawachi/sbt-lock/
4+
dependencyOverrides ++= {
5+
if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
6+
Seq.empty
7+
} else {
8+
Seq(
9+
"com.github.ghik" % "silencer-lib_2.13.0" % "1.4.3",
10+
"org.typelevel" % "cats-core_2.13" % "2.0.0",
11+
"org.typelevel" % "cats-effect_2.13" % "2.0.0",
12+
"org.typelevel" % "cats-kernel_2.13" % "2.0.0",
13+
"org.typelevel" % "cats-macros_2.13" % "2.0.0"
14+
)
15+
}
16+
}
17+
// LIBRARY_DEPENDENCIES_HASH 3c115232d5575d261ed52ade3d2e64044c9447e4

‎lock.sbt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// DON'T EDIT THIS FILE.
2+
// This file is auto generated by sbt-lock 0.6.1.
3+
// https://github.com/tkawachi/sbt-lock/
4+
dependencyOverrides ++= {
5+
if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
6+
Seq.empty
7+
} else {
8+
Seq(
9+
)
10+
}
11+
}
12+
// LIBRARY_DEPENDENCIES_HASH ba84f20fadaccb0040e68a530ed6863bd523148b

‎pureconfig/lock.sbt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// DON'T EDIT THIS FILE.
2+
// This file is auto generated by sbt-lock 0.6.1.
3+
// https://github.com/tkawachi/sbt-lock/
4+
dependencyOverrides ++= {
5+
if (!(sbtLockHashIsUpToDate in ThisBuild).value && sbtLockIgnoreOverridesOnStaleHash.value) {
6+
Seq.empty
7+
} else {
8+
Seq(
9+
"com.chuusai" % "shapeless_2.13" % "2.3.3",
10+
"com.github.ghik" % "silencer-lib_2.13.0" % "1.4.3",
11+
"com.github.pureconfig" % "pureconfig-core_2.13" % "0.12.0",
12+
"com.github.pureconfig" % "pureconfig-generic_2.13" % "0.12.0",
13+
"com.github.pureconfig" % "pureconfig-macros_2.13" % "0.12.0",
14+
"com.github.pureconfig" % "pureconfig_2.13" % "0.12.0",
15+
"com.typesafe" % "config" % "1.3.4",
16+
"org.typelevel" % "cats-core_2.13" % "2.0.0",
17+
"org.typelevel" % "cats-effect_2.13" % "2.0.0",
18+
"org.typelevel" % "cats-kernel_2.13" % "2.0.0",
19+
"org.typelevel" % "cats-macros_2.13" % "2.0.0"
20+
)
21+
}
22+
}
23+
// LIBRARY_DEPENDENCIES_HASH cc2062c5868351c2b8bc80a5d96634a63585dd78

0 commit comments

Comments
 (0)