Skip to content

Commit 7fbbf6b

Browse files
authored
Merge pull request #165 from xuwei-k/fix-warnings
fix warnings
2 parents c0d8345 + 4f206b2 commit 7fbbf6b

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

sbt-crossproject/src/main/scala/sbtcrossproject/CrossProjectMacros.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ private[sbtcrossproject] object CrossProjectMacros {
2525
val jsPlatform =
2626
Select(
2727
Select(
28-
Ident(newTermName("_root_")),
29-
newTermName("scalajscrossproject")
28+
Ident(TermName("_root_")),
29+
TermName("scalajscrossproject")
3030
),
31-
newTermName("JSPlatform")
31+
TermName("JSPlatform")
3232
)
3333
val jvmPlatform =
3434
Select(
3535
Select(
36-
Ident(newTermName("_root_")),
37-
newTermName("sbtcrossproject")
36+
Ident(TermName("_root_")),
37+
TermName("sbtcrossproject")
3838
),
39-
newTermName("JVMPlatform")
39+
TermName("JVMPlatform")
4040
)
4141

4242
List(jsPlatform, jvmPlatform)
@@ -45,16 +45,16 @@ private[sbtcrossproject] object CrossProjectMacros {
4545
val crossProjectCompanionTerm =
4646
Select(
4747
Select(
48-
Ident(newTermName("_root_")),
49-
newTermName("sbtcrossproject")
48+
Ident(TermName("_root_")),
49+
TermName("sbtcrossproject")
5050
),
51-
newTermName("CrossProject")
51+
TermName("CrossProject")
5252
)
5353

5454
val applyFun =
5555
Select(
5656
crossProjectCompanionTerm,
57-
newTermName("apply")
57+
TermName("apply")
5858
)
5959

6060
c.Expr[CrossProject.Builder](

sbt-crossproject/src/main/scala/sbtcrossproject/MacroUtils.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private[sbtcrossproject] object MacroUtils {
1212
val methodName = c.macroApplication.symbol.name
1313

1414
// trim is not strictly correct, but macros don't expose the API necessary
15-
def processName(n: Name): String = n.decoded.trim
15+
def processName(n: Name): String = n.decodedName.toString.trim
1616

1717
def enclosingVal(trees: List[c.Tree]): String = trees match {
1818
case vd @ ValDef(_, name, _, _) :: ts =>
@@ -27,7 +27,8 @@ private[sbtcrossproject] object MacroUtils {
2727
if mods.hasFlag(Flag.LAZY) =>
2828
processName(name)
2929
case _ =>
30-
c.error(c.enclosingPosition, invalidEnclosingTree(methodName.decoded))
30+
c.error(c.enclosingPosition,
31+
invalidEnclosingTree(methodName.decodedName.toString))
3132
"<error>"
3233
}
3334

0 commit comments

Comments
 (0)