Skip to content

Commit ca0a6ff

Browse files
authored
Merge pull request scodec#161 from scodec/topic/dotty
Topic/dotty
2 parents 41c3fc7 + e5a621c commit ca0a6ff

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: scala
22

33
scala:
4-
- "0.22.0-bin-20200123-9982f0d-NIGHTLY"
4+
- "0.22.0-RC1"
55
- "2.12.10"
66
- "2.13.1"
77

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
9999
libraryDependencies ++= {
100100
if (isDotty.value)
101101
Seq(
102-
"dev.travisbrown" %%% "scalatest" % "3.1.0-20200123-9982f0d-NIGHTLY",
103-
"dev.travisbrown" %%% "scalacheck-1-14" % "3.1.0.1-20200123-9982f0d-NIGHTLY"
102+
"dev.travisbrown" %%% "scalatest" % "3.1.0-20200201-c4c847f-NIGHTLY" % "test",
103+
"dev.travisbrown" %%% "scalacheck-1-14" % "3.1.0.1-20200201-c4c847f-NIGHTLY" % "test"
104104
)
105105
else
106106
Seq(
@@ -138,6 +138,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
138138
o == "-Ywarn-unused" || o == "-Xfatal-warnings"
139139
}
140140
},
141+
publishArtifact in (Compile, packageDoc) := !isDotty.value,
142+
publishArtifact in packageDoc := !isDotty.value,
141143
scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value,
142144
mimaPreviousArtifacts := {
143145
List("1.1.12").map { pv =>

core/shared/src/main/scala-0.22/scodec/bits/Interpolators.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import scala.quoted.matching._
1111
* val b: scodec.bits.ByteVector = ByteVector(4 bytes, 0xdeadbeef)
1212
* }}}
1313
*/
14-
inline def (ctx: StringContext).hex (args: => ByteVector*): ByteVector =
14+
inline def (ctx: StringContext).hex (inline args: ByteVector*): ByteVector =
1515
${hexInterpolator('ctx, 'args)}
1616

1717
private def hexInterpolator(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[ByteVector]])(given qctx: QuoteContext): Expr[ByteVector] = {
@@ -42,7 +42,7 @@ private def hexInterpolator(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[
4242
* val b: scodec.bits.BitVector = BitVector(10 bits, 0xaa8)
4343
* }}}
4444
*/
45-
inline def (ctx: StringContext).bin (args: => BitVector*): BitVector =
45+
inline def (ctx: StringContext).bin (inline args: BitVector*): BitVector =
4646
${binInterpolator('ctx, 'args)}
4747

4848
private def binInterpolator(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[BitVector]])(given qctx: QuoteContext): Expr[BitVector] = {

0 commit comments

Comments
 (0)