From ccbc68d668e1515b66770ba7755ed08a4f5b8745 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Fri, 29 May 2020 06:21:56 -0500 Subject: [PATCH] Add -Xfatal-warnings on Scala 2.13 (#1483) * Add -Xfatal-warnings on Scala 2.13 * Turn off -Xfatal-warnings in docs/ --- .../src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala | 2 ++ bitcoin-s-docs/docs.sbt | 3 +++ project/CommonSettings.scala | 2 +- .../org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala | 2 +- .../scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bench/src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala b/bench/src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala index 203d6d0704..a211629b40 100644 --- a/bench/src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala +++ b/bench/src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala @@ -23,6 +23,7 @@ import scala.util.{Failure, Success} * and when the corresponding web socket event was received. It writes all results into [[OutputFileName]] * in CSV format. */ +@scala.annotation.nowarn object EclairBench extends App with EclairRpcTestUtil { import PaymentLog._ @@ -97,6 +98,7 @@ object EclairBench extends App with EclairRpcTestUtil { }) } yield paymentIds.flatten + def runTests(network: EclairNetwork): Future[Vector[PaymentLogEntry]] = { println("Setting up the test network") for { diff --git a/bitcoin-s-docs/docs.sbt b/bitcoin-s-docs/docs.sbt index 48a3b90942..ec565a3ec6 100644 --- a/bitcoin-s-docs/docs.sbt +++ b/bitcoin-s-docs/docs.sbt @@ -43,3 +43,6 @@ Test / bloopGenerate := None Compile / bloopGenerate := None libraryDependencies ++= Deps.docs + +//https://stackoverflow.com/questions/26940253/in-sbt-how-do-you-override-scalacoptions-for-console-in-all-configurations +scalacOptions in Compile ~= (_.filterNot(s => s == "-Xfatal-warnings")) \ No newline at end of file diff --git a/project/CommonSettings.scala b/project/CommonSettings.scala index 4623676168..406a2f5319 100644 --- a/project/CommonSettings.scala +++ b/project/CommonSettings.scala @@ -72,7 +72,7 @@ object CommonSettings { ) } - private val scala2_13CompilerOpts = Seq("-Xlint:unused") + private val scala2_13CompilerOpts = Seq("-Xlint:unused","-Xfatal-warnings") private val nonScala2_13CompilerOpts = Seq( "-Xmax-classfile-name", diff --git a/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala index 7f168bfb8b..8958374e98 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala @@ -63,7 +63,7 @@ trait EclairRpcTestUtil extends BitcoinSLogger { val path = binaryDirectory .resolve(eclairVersionOpt.getOrElse(EclairRpcClient.version)) .resolve( - s"eclair-node-${EclairRpcClient.version}-${EclairRpcClient.commit}") + s"eclair-node-${EclairRpcClient.version}-${eclairCommitOpt.getOrElse(EclairRpcClient.commit)}") .resolve("bin") .resolve( if (sys.props("os.name").toLowerCase.contains("windows")) diff --git a/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala index 27d6bbf03e..80647f6486 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala @@ -820,7 +820,7 @@ trait BitcoindRpcTestUtil extends BitcoinSLogger { val v17 = new BitcoindV17RpcClient(other.instance) v17.getAddressInfo(address).map(_.pubkey) } else { - other.validateAddress(address).map(_.pubkey) + other.getAddressInfo(address).map(_.pubkey) } } }