Skip to content

Commit 46fba3c

Browse files
committed
Update dependencies
1 parent 0e7c6e1 commit 46fba3c

File tree

11 files changed

+20
-13
lines changed

11 files changed

+20
-13
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea/
2+
.bsp/
23
*.iml
34
project/project
45
project/target

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ lazy val metasJS = metas.js.settings(name := "metas")
7777
val buildMacrosSettings = globalSettings ++ Seq(
7878
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
7979
resolvers += Resolver.sonatypeRepo("releases"),
80-
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
80+
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
8181
)
8282

8383
val macroSettings = buildMacrosSettings ++ publishSettings
@@ -97,9 +97,9 @@ lazy val hamsters = CrossPlugin.autoImport.crossProject(JSPlatform, JVMPlatform)
9797
.dependsOn(metas)
9898
.dependsOn(macros)
9999
.settings(libraryDependencies ++= Seq(
100-
"org.scalatest" %%% "scalatest" % "3.1.0" % "test",
100+
"org.scalatest" %%% "scalatest" % "3.2.2" % "test",
101101
"org.scalamock" %%% "scalamock-scalatest-support" % "3.6.0" % "test",
102-
"org.scalacheck" %%% "scalacheck" % "1.14.1" % "test"
102+
"org.scalacheck" %%% "scalacheck" % "1.15.1" % "test"
103103
))
104104
.settings(hamstersSettings)
105105

metas/shared/src/main/scala/io/github/hamsters/CartesianMacro.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import scala.meta._
66

77
class CartesianMacro extends StaticAnnotation {
88

9-
inline def apply(defn: Any): Any = meta {
9+
@inline
10+
def apply(defn: Any): Any = {
1011

1112
val MAX_ARITY = 23
1213

metas/shared/src/main/scala/io/github/hamsters/GenLens.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import scala.collection.immutable.Seq
55
import scala.meta._
66
class GenLens extends StaticAnnotation {
77

8-
inline def apply(defn: Any): Any = meta {
8+
@inline
9+
def apply(defn: Any): Any = {
910
defn match {
1011
case q"""case class $tName(..$params)""" => {
1112

metas/shared/src/main/scala/io/github/hamsters/HListMacro.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import scala.meta._
55

66
class HListMacro extends scala.annotation.StaticAnnotation {
77

8-
inline def apply(defn: Any): Any = meta {
8+
@inline
9+
def apply(defn: Any): Any = {
910

1011
defn match {
1112
case q"..$mods class $tName(..$params)" =>

metas/shared/src/main/scala/io/github/hamsters/ShowMacro.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import scala.meta._
55

66
class ShowMacro extends scala.annotation.StaticAnnotation {
77

8-
inline def apply(defn: Any): Any = meta {
8+
@inline
9+
def apply(defn: Any): Any = {
910
defn match {
1011
// TODO handle object with existing companion
1112
// case Seq(cls @ Defn.Class(_, name, _, ctor, template), companion: Defn.Object)=> q""""""

metas/shared/src/main/scala/io/github/hamsters/UnionMacro.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import scala.meta.{Term, _}
66

77
class UnionMacro extends scala.annotation.StaticAnnotation {
88

9-
inline def apply(defn: Any): Any = meta {
9+
@inline
10+
def apply(defn: Any): Any = {
1011

1112
def argByXY(idx: Int, i: Int): Term =
1213
if (idx == i) q"""Some(t)"""

metas/shared/src/main/scala/io/github/hamsters/ValidationMacro.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import scala.meta._
55

66
class ValidationMacro extends scala.annotation.StaticAnnotation {
77

8-
inline def apply(defn: Any): Any = meta {
8+
@inline
9+
def apply(defn: Any): Any = {
910

1011
val arityRange = Range(1, 23)
1112

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.8
1+
sbt.version=1.4.5

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
22
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.1")
33
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
4-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
5-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
4+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
5+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

scripts/try-hamsters.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ COURSIER_URL=https://git.io/vgvpD
33
test -e ~/.coursier/coursier || \
44
(mkdir -p ~/.coursier && curl -L -s --output ~/.coursier/coursier $COURSIER_URL && chmod +x ~/.coursier/coursier)
55
~/.coursier/coursier launch -q -P \
6-
com.lihaoyi:ammonite_2.12.3:1.0.1 \
6+
com.lihaoyi:ammonite_2.12.8:2.3.8 \
77
io.github.scala-hamsters:hamsters_2.12:3.0.0 \
88
-- --predef-code 'import io.github.hamsters._;
99
import HList._;

0 commit comments

Comments
 (0)