From 44a66e72e56c52a91a8f7b2478b117d291440263 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Thu, 13 Jan 2022 10:17:11 -0600 Subject: [PATCH] Upgrade to Scala 2.13.8 (#3789) * Upgrade to Scala 2.13.7 * Upgrade to Scala 2.13.8 --- .github/workflows/Docs.yml | 2 +- .github/workflows/Linux_2.13_App_Chain_Core_Tests.yml | 2 +- .github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml | 2 +- .github/workflows/Linux_2.13_Node_Tests.yml | 2 +- .github/workflows/Linux_2.13_RPC_Tests.yml | 2 +- .github/workflows/Linux_2.13_ScalaJS_Tests.yml | 2 +- .github/workflows/Mac_2.13_RPC_Tests.yml | 2 +- .github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml | 2 +- .github/workflows/PostgresTests.yml | 2 +- .github/workflows/Secp_Disabled_Tests.yml | 2 +- .github/workflows/TorTests.yml | 2 +- .github/workflows/Windows.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .../src/main/scala/org/bitcoins/gui/dlc/dialog/DLCDialog.scala | 2 +- inThisBuild.sbt | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml index 3260945b9e..ae52786997 100644 --- a/.github/workflows/Docs.yml +++ b/.github/workflows/Docs.yml @@ -27,4 +27,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: Compile website - run: sbt ++2.13.6 docs/mdoc + run: sbt ++2.13.8 docs/mdoc diff --git a/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml b/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml index a983350014..a8e835b0b1 100644 --- a/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml +++ b/.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoTestJVM/test cryptoJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test dlcTest/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test + run: sbt ++2.13.8 downloadBitcoind coverage chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoTestJVM/test cryptoJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test dlcTest/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test diff --git a/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml b/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml index b9295d6fc0..38a4bac648 100644 --- a/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml +++ b/.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test oracleExplorerClient/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls + run: sbt ++2.13.8 downloadBitcoind coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test oracleExplorerClient/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls diff --git a/.github/workflows/Linux_2.13_Node_Tests.yml b/.github/workflows/Linux_2.13_Node_Tests.yml index 5f74d3ad81..f4ef62fc79 100644 --- a/.github/workflows/Linux_2.13_Node_Tests.yml +++ b/.github/workflows/Linux_2.13_Node_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test + run: sbt ++2.13.8 downloadBitcoind coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test diff --git a/.github/workflows/Linux_2.13_RPC_Tests.yml b/.github/workflows/Linux_2.13_RPC_Tests.yml index 548971a9fa..9d402a8386 100644 --- a/.github/workflows/Linux_2.13_RPC_Tests.yml +++ b/.github/workflows/Linux_2.13_RPC_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind downloadEclair downloadLnd downloadCLightning coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test + run: sbt ++2.13.8 downloadBitcoind downloadEclair downloadLnd downloadCLightning coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test diff --git a/.github/workflows/Linux_2.13_ScalaJS_Tests.yml b/.github/workflows/Linux_2.13_ScalaJS_Tests.yml index 54f4f5a6d7..34c815f44e 100644 --- a/.github/workflows/Linux_2.13_ScalaJS_Tests.yml +++ b/.github/workflows/Linux_2.13_ScalaJS_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 cryptoTestJS/test coreJS/test 'set scalaJSStage in Global := FullOptStage' cryptoTestJS/test coreJS/test asyncUtilsTestJS/test \ No newline at end of file + run: sbt ++2.13.8 cryptoTestJS/test coreJS/test 'set scalaJSStage in Global := FullOptStage' cryptoTestJS/test coreJS/test asyncUtilsTestJS/test \ No newline at end of file diff --git a/.github/workflows/Mac_2.13_RPC_Tests.yml b/.github/workflows/Mac_2.13_RPC_Tests.yml index 432818822d..a28ef193ee 100644 --- a/.github/workflows/Mac_2.13_RPC_Tests.yml +++ b/.github/workflows/Mac_2.13_RPC_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind downloadEclair downloadLnd coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test + run: sbt ++2.13.8 downloadBitcoind downloadEclair downloadLnd coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test diff --git a/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml b/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml index 649b23d1fc..dc617d8a83 100644 --- a/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml +++ b/.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml @@ -28,4 +28,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test dlcTest/test appCommonsTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coveralls dlcNodeTest/test appServerTest/test + run: sbt ++2.13.8 downloadBitcoind coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test dlcTest/test appCommonsTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coveralls dlcNodeTest/test appServerTest/test diff --git a/.github/workflows/PostgresTests.yml b/.github/workflows/PostgresTests.yml index 54c44b0431..08a1630fc6 100644 --- a/.github/workflows/PostgresTests.yml +++ b/.github/workflows/PostgresTests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test nodeTest/test dlcOracle/test + run: sbt ++2.13.7 downloadBitcoind dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test nodeTest/test dlcOracle/test diff --git a/.github/workflows/Secp_Disabled_Tests.yml b/.github/workflows/Secp_Disabled_Tests.yml index fa8dffb5ab..339e0d2124 100644 --- a/.github/workflows/Secp_Disabled_Tests.yml +++ b/.github/workflows/Secp_Disabled_Tests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 cryptoTestJVM/test coreTestJVM/test dlcTest/test + run: sbt ++2.13.7 cryptoTestJVM/test coreTestJVM/test dlcTest/test diff --git a/.github/workflows/TorTests.yml b/.github/workflows/TorTests.yml index d7aca7c250..30128023ea 100644 --- a/.github/workflows/TorTests.yml +++ b/.github/workflows/TorTests.yml @@ -30,4 +30,4 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: run tests - run: sbt ++2.13.6 downloadBitcoind torTest/test nodeTest/test dlcNodeTest/test + run: sbt ++2.13.7 downloadBitcoind torTest/test nodeTest/test dlcNodeTest/test diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index 592ad889df..af48075511 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -31,5 +31,5 @@ jobs: ~/.bitcoin-s/binaries key: ${{ runner.os }}-cache - name: Windows Crypto, Core, and Database tests - run: sbt ++2.13.6 downloadBitcoind cryptoTestJVM/test coreTestJVM/test secp256k1jni/test dlcTest/test appCommonsTest/test dbCommonsTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test appServerTest/test + run: sbt ++2.13.7 downloadBitcoind cryptoTestJVM/test coreTestJVM/test secp256k1jni/test dlcTest/test appCommonsTest/test dbCommonsTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test appServerTest/test shell: bash diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8a7a69c894..f68f16ebdc 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,4 +19,4 @@ jobs: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build and push - run: sbt ++2.13.6 "oracleServer/docker:publish;appServer/docker:publish" \ No newline at end of file + run: sbt ++2.13.7 "oracleServer/docker:publish;appServer/docker:publish" \ No newline at end of file diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/DLCDialog.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/DLCDialog.scala index 7218cd6fc7..dd1a437c65 100644 --- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/DLCDialog.scala +++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/DLCDialog.scala @@ -132,7 +132,7 @@ abstract class DLCDialog[T <: CliCommand]( val result = dialog.showAndWait() result match { - case Some(someT: Some[T]) => someT + case Some(someT: Some[_]) => someT.asInstanceOf[Option[T]] case Some(_) | None => None } } diff --git a/inThisBuild.sbt b/inThisBuild.sbt index a448000416..218f6cc7fb 100644 --- a/inThisBuild.sbt +++ b/inThisBuild.sbt @@ -3,7 +3,7 @@ import sbt.Keys.excludeLintKeys import scala.util.Properties val scala2_12 = "2.12.15" -val scala2_13 = "2.13.6" +val scala2_13 = "2.13.8" ThisBuild / scalafmtOnCompile := !Properties.envOrNone("CI").contains("true")