Skip to content

Commit 24f88b2

Browse files
MateuszKubuszokMateuszKubuszok
committed
Updated for 2.13 (blocked by upstream)
1 parent 01bfb4c commit 24f88b2

File tree

8 files changed

+49
-53
lines changed

8 files changed

+49
-53
lines changed

Diff for: ‎lock.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
dependencyOverrides ++= Seq(
55

66
)
7-
// LIBRARY_DEPENDENCIES_HASH fdc28634c6c339ea10ce9da391ecaee94ec774d2
7+
// LIBRARY_DEPENDENCIES_HASH a7752052be10e08cb939d3fea8c8665360d973d4

Diff for: ‎modules/catnip-tests/.js/lock.sbt

+13-14
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
dependencyOverrides ++= Seq(
55
"com.chuusai" % "shapeless_2.12" % "2.3.3",
66
"com.chuusai" % "shapeless_sjs0.6_2.12" % "2.3.3",
7-
"org.scala-js" % "scalajs-library_2.12" % "0.6.25",
8-
"org.scala-lang.modules" % "scala-collection-compat_2.12" % "0.1.1",
9-
"org.typelevel" % "alleycats-core_2.12" % "1.3.1",
10-
"org.typelevel" % "alleycats-core_sjs0.6_2.12" % "1.3.1",
11-
"org.typelevel" % "cats-core_2.12" % "1.3.1",
12-
"org.typelevel" % "cats-core_sjs0.6_2.12" % "1.3.1",
13-
"org.typelevel" % "cats-kernel_2.12" % "1.3.1",
14-
"org.typelevel" % "cats-kernel_sjs0.6_2.12" % "1.3.1",
15-
"org.typelevel" % "cats-macros_2.12" % "1.3.1",
16-
"org.typelevel" % "cats-macros_sjs0.6_2.12" % "1.3.1",
7+
"org.scala-js" % "scalajs-library_2.12" % "0.6.28",
8+
"org.typelevel" % "alleycats-core_2.12" % "1.6.0",
9+
"org.typelevel" % "alleycats-core_sjs0.6_2.12" % "1.6.0",
10+
"org.typelevel" % "cats-core_2.12" % "1.6.0",
11+
"org.typelevel" % "cats-core_sjs0.6_2.12" % "1.6.0",
12+
"org.typelevel" % "cats-kernel_2.12" % "1.6.0",
13+
"org.typelevel" % "cats-kernel_sjs0.6_2.12" % "1.6.0",
14+
"org.typelevel" % "cats-macros_2.12" % "1.6.0",
15+
"org.typelevel" % "cats-macros_sjs0.6_2.12" % "1.6.0",
1716
"org.typelevel" % "export-hook_2.12" % "1.2.0",
18-
"org.typelevel" % "kittens_sjs0.6_2.12" % "1.2.0",
19-
"org.typelevel" % "machinist_2.12" % "0.6.5",
20-
"org.typelevel" % "machinist_sjs0.6_2.12" % "0.6.5",
17+
"org.typelevel" % "kittens_sjs0.6_2.12" % "1.2.1",
18+
"org.typelevel" % "machinist_2.12" % "0.6.6",
19+
"org.typelevel" % "machinist_sjs0.6_2.12" % "0.6.6",
2120
"org.typelevel" % "macro-compat_2.12" % "1.1.1"
2221
)
23-
// LIBRARY_DEPENDENCIES_HASH a920cfdde255319e948d05199b843902b066cec3
22+
// LIBRARY_DEPENDENCIES_HASH 980a65e78ef2cedcbbc351bbf56e6fa6a86829f9

Diff for: ‎modules/catnip-tests/.jvm/lock.sbt

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
// https://github.com/tkawachi/sbt-lock/
44
dependencyOverrides ++= Seq(
55
"com.chuusai" % "shapeless_2.12" % "2.3.3",
6-
"org.scala-lang.modules" % "scala-collection-compat_2.12" % "0.1.1",
7-
"org.typelevel" % "alleycats-core_2.12" % "1.3.1",
8-
"org.typelevel" % "cats-core_2.12" % "1.3.1",
9-
"org.typelevel" % "cats-kernel_2.12" % "1.3.1",
10-
"org.typelevel" % "cats-macros_2.12" % "1.3.1",
6+
"org.typelevel" % "alleycats-core_2.12" % "1.6.0",
7+
"org.typelevel" % "cats-core_2.12" % "1.6.0",
8+
"org.typelevel" % "cats-kernel_2.12" % "1.6.0",
9+
"org.typelevel" % "cats-macros_2.12" % "1.6.0",
1110
"org.typelevel" % "export-hook_2.12" % "1.2.0",
12-
"org.typelevel" % "kittens_2.12" % "1.2.0",
13-
"org.typelevel" % "machinist_2.12" % "0.6.5",
11+
"org.typelevel" % "kittens_2.12" % "1.2.1",
12+
"org.typelevel" % "machinist_2.12" % "0.6.6",
1413
"org.typelevel" % "macro-compat_2.12" % "1.1.1"
1514
)
16-
// LIBRARY_DEPENDENCIES_HASH 05d734ce988c78042c9d3924eee3e08f8404af49
15+
// LIBRARY_DEPENDENCIES_HASH 3be6949353491121167cffd217fdb5d56aa7a2e4

Diff for: ‎modules/catnip/.js/lock.sbt

+13-14
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
dependencyOverrides ++= Seq(
55
"com.chuusai" % "shapeless_2.12" % "2.3.3",
66
"com.chuusai" % "shapeless_sjs0.6_2.12" % "2.3.3",
7-
"org.scala-js" % "scalajs-library_2.12" % "0.6.25",
8-
"org.scala-lang.modules" % "scala-collection-compat_2.12" % "0.1.1",
9-
"org.typelevel" % "alleycats-core_2.12" % "1.3.1",
10-
"org.typelevel" % "alleycats-core_sjs0.6_2.12" % "1.3.1",
11-
"org.typelevel" % "cats-core_2.12" % "1.3.1",
12-
"org.typelevel" % "cats-core_sjs0.6_2.12" % "1.3.1",
13-
"org.typelevel" % "cats-kernel_2.12" % "1.3.1",
14-
"org.typelevel" % "cats-kernel_sjs0.6_2.12" % "1.3.1",
15-
"org.typelevel" % "cats-macros_2.12" % "1.3.1",
16-
"org.typelevel" % "cats-macros_sjs0.6_2.12" % "1.3.1",
7+
"org.scala-js" % "scalajs-library_2.12" % "0.6.28",
8+
"org.typelevel" % "alleycats-core_2.12" % "1.6.0",
9+
"org.typelevel" % "alleycats-core_sjs0.6_2.12" % "1.6.0",
10+
"org.typelevel" % "cats-core_2.12" % "1.6.0",
11+
"org.typelevel" % "cats-core_sjs0.6_2.12" % "1.6.0",
12+
"org.typelevel" % "cats-kernel_2.12" % "1.6.0",
13+
"org.typelevel" % "cats-kernel_sjs0.6_2.12" % "1.6.0",
14+
"org.typelevel" % "cats-macros_2.12" % "1.6.0",
15+
"org.typelevel" % "cats-macros_sjs0.6_2.12" % "1.6.0",
1716
"org.typelevel" % "export-hook_2.12" % "1.2.0",
18-
"org.typelevel" % "kittens_sjs0.6_2.12" % "1.2.0",
19-
"org.typelevel" % "machinist_2.12" % "0.6.5",
20-
"org.typelevel" % "machinist_sjs0.6_2.12" % "0.6.5",
17+
"org.typelevel" % "kittens_sjs0.6_2.12" % "1.2.1",
18+
"org.typelevel" % "machinist_2.12" % "0.6.6",
19+
"org.typelevel" % "machinist_sjs0.6_2.12" % "0.6.6",
2120
"org.typelevel" % "macro-compat_2.12" % "1.1.1"
2221
)
23-
// LIBRARY_DEPENDENCIES_HASH 00c53c6e5d924d4cad98ded5d91dd811f6880dc2
22+
// LIBRARY_DEPENDENCIES_HASH 71c84f98a21e18cf66ad610222997eeadbc801db

Diff for: ‎modules/catnip/.jvm/lock.sbt

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
// https://github.com/tkawachi/sbt-lock/
44
dependencyOverrides ++= Seq(
55
"com.chuusai" % "shapeless_2.12" % "2.3.3",
6-
"org.scala-lang.modules" % "scala-collection-compat_2.12" % "0.1.1",
7-
"org.typelevel" % "alleycats-core_2.12" % "1.3.1",
8-
"org.typelevel" % "cats-core_2.12" % "1.3.1",
9-
"org.typelevel" % "cats-kernel_2.12" % "1.3.1",
10-
"org.typelevel" % "cats-macros_2.12" % "1.3.1",
6+
"org.typelevel" % "alleycats-core_2.12" % "1.6.0",
7+
"org.typelevel" % "cats-core_2.12" % "1.6.0",
8+
"org.typelevel" % "cats-kernel_2.12" % "1.6.0",
9+
"org.typelevel" % "cats-macros_2.12" % "1.6.0",
1110
"org.typelevel" % "export-hook_2.12" % "1.2.0",
12-
"org.typelevel" % "kittens_2.12" % "1.2.0",
13-
"org.typelevel" % "machinist_2.12" % "0.6.5",
11+
"org.typelevel" % "kittens_2.12" % "1.2.1",
12+
"org.typelevel" % "machinist_2.12" % "0.6.6",
1413
"org.typelevel" % "macro-compat_2.12" % "1.1.1"
1514
)
16-
// LIBRARY_DEPENDENCIES_HASH 79ffe92df636aa1d6c286e671daf2fe2f4fa8d65
15+
// LIBRARY_DEPENDENCIES_HASH dea95cffff3bd45f21ad270d9b8e51defe866302

Diff for: ‎project/Dependencies.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ object Dependencies {
99

1010
// scala version
1111
val scalaOrganization = "org.scala-lang" // "org.typelevel"
12-
val scalaVersion = "2.12.7" // "2.12.4-bin-typelevel-4"
13-
val crossScalaVersions = Seq("2.11.12", "2.12.7", "2.13.0-M4")
12+
val scalaVersion = "2.12.8" // "2.12.4-bin-typelevel-4"
13+
val crossScalaVersions = Seq("2.11.12", "2.12.8", "2.13.0")
1414

1515
// build tools version
1616
val scalaFmtVersion = "1.5.1"
1717

1818
// libraries versions
19-
val catsVersion = "1.3.1"
20-
val specs2Version = "4.3.4"
19+
val catsVersion = "1.6.0"
20+
val specs2Version = "4.4.1"
2121

2222
// resolvers
2323
val resolvers = Seq(
@@ -27,7 +27,7 @@ object Dependencies {
2727

2828
val alleyCats = libraryDependencies += "org.typelevel" %%% "alleycats-core" % catsVersion
2929
val cats = libraryDependencies += "org.typelevel" %%% "cats-core" % catsVersion
30-
val kittens = libraryDependencies += "org.typelevel" %%% "kittens" % "1.2.0"
30+
val kittens = libraryDependencies += "org.typelevel" %%% "kittens" % "1.2.1"
3131
val shapeless = libraryDependencies += "com.chuusai" %%% "shapeless" % "2.3.3"
3232
}
3333

Diff for: ‎project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.3
1+
sbt.version=1.3.0-RC2

Diff for: ‎project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ addSbtPlugin("com.github.tkawachi" % "sbt-lock" % "0.5.0")
22
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
33
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
44
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
66
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
77
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
8-
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.3.5")
8+
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.2")
99

1010
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.25"

0 commit comments

Comments
 (0)