mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-19 09:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump scala version to 2.13.2 (#1360)

Browse Source
This commit is contained in:
Chris Stewart 2020-04-23 07:38:20 -05:00 committed by GitHub
parent 001124a045
commit cb88b78540
8 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala
View File

@ -9,12 +9,6 @@ import org.bitcoins.core.util.BitcoinSLogger
import org.bitcoins.rpc.client.common.BitcoindVersion
import scala.sys.process._
import org.bitcoins.core.util.BitcoinSLogger
import org.bitcoins.core.config.NetworkParameters
import scala.util.Properties
import java.nio.file.Files
import scala.util.Properties
/**

12
chain/src/main/scala/org/bitcoins/chain/db/ChainDbManagement.scala
View File

@ -1,17 +1,11 @@
package org.bitcoins.chain.db
import org.bitcoins.db._
import org.bitcoins.chain.models.{
BlockHeaderTable,
CompactFilterHeaderTable,
CompactFilterTable
}
import org.bitcoins.chain.config.ChainAppConfig
import org.bitcoins.chain.models.{BlockHeaderTable, CompactFilterHeaderTable, CompactFilterTable}
import org.bitcoins.db.DbManagement
import slick.lifted.TableQuery
import scala.concurrent.Future
import scala.concurrent.ExecutionContext
import org.bitcoins.chain.config.ChainAppConfig
import scala.concurrent.{ExecutionContext, Future}
/**
* Responsible for creating and destroying database

3
core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPingMessageSerializer.scala
View File

@ -1,9 +1,8 @@
package org.bitcoins.core.serializers.p2p.messages
import org.bitcoins.core.number.UInt64
import org.bitcoins.core.p2p.PingMessage
import org.bitcoins.core.serializers.RawBitcoinSerializer
import org.bitcoins.core.p2p.PingMessage
import org.bitcoins.core.p2p.PingMessage
import scodec.bits.ByteVector
/**

3
core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPongMessageSerializer.scala
View File

@ -1,9 +1,8 @@
package org.bitcoins.core.serializers.p2p.messages
import org.bitcoins.core.number.UInt64
import org.bitcoins.core.p2p.PongMessage
import org.bitcoins.core.serializers.RawBitcoinSerializer
import org.bitcoins.core.p2p.PongMessage
import org.bitcoins.core.p2p.PongMessage
import scodec.bits.ByteVector
trait RawPongMessageSerializer extends RawBitcoinSerializer[PongMessage] {

3
core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawRejectMessageSerializer.scala
View File

@ -1,9 +1,8 @@
package org.bitcoins.core.serializers.p2p.messages
import org.bitcoins.core.p2p.RejectMessage
import org.bitcoins.core.protocol.CompactSizeUInt
import org.bitcoins.core.serializers.RawBitcoinSerializer
import org.bitcoins.core.p2p.RejectMessage
import org.bitcoins.core.p2p.RejectMessage
import scodec.bits.ByteVector
trait RawRejectMessageSerializer extends RawBitcoinSerializer[RejectMessage] {

2
inThisBuild.sbt
View File

@ -1,6 +1,6 @@
val scala2_11 = "2.11.12"
val scala2_12 = "2.12.11"
val scala2_13 = "2.13.1"
val scala2_13 = "2.13.2"
scalaVersion in ThisBuild := scala2_13

2
project/CommonSettings.scala
View File

@ -67,7 +67,7 @@ object CommonSettings {
private val commonCompilerOpts = {
List(
"-Xsource:2.12",
"-Xsource:2.13",
"-target:jvm-1.8"
)
}

16
testkit/src/main/scala/org/bitcoins/testkit/core/gen/p2p/ControlMessageGenerator.scala
View File

@ -3,22 +3,12 @@ package org.bitcoins.testkit.core.gen.p2p
import java.net.{InetAddress, InetSocketAddress}
import org.bitcoins.core.number.{UInt32, UInt64}
import org.bitcoins.core.p2p.ProtocolVersion
import org.bitcoins.core.p2p.{ProtocolVersion, _}
import org.bitcoins.core.protocol.CompactSizeUInt
import org.bitcoins.core.p2p._
import org.bitcoins.core.p2p._
import org.bitcoins.testkit.core.gen.{
BloomFilterGenerator,
CryptoGenerators,
NumberGenerator,
StringGenerators
}
import org.bitcoins.core.wallet.fee.{SatoshisPerByte, SatoshisPerKiloByte, SatoshisPerVirtualByte}
import org.bitcoins.testkit.core.gen._
import org.scalacheck.Gen
import scodec.bits.ByteVector
import org.bitcoins.testkit.core.gen.CurrencyUnitGenerator
import org.bitcoins.core.wallet.fee.SatoshisPerByte
import org.bitcoins.core.wallet.fee.SatoshisPerKiloByte
import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
object ControlMessageGenerator {