mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-15 12:20:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Get scala3 crossbuild working upto db-commons/

Browse source
This commit is contained in:
Chris Stewart 2024-05-11 12:33:03 -05:00
parent 52040da386
commit fc006caeb8
6 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app-commons/src/main/scala/org/bitcoins/commons/serializers/Picklers.scala
View file

@ -1320,8 +1320,6 @@ object Picklers {
val numericOracles =
oracles.map(_.asInstanceOf[NumericSingleOracleInfo])
NumericOracleOutcome(numericOracles.zip(numericOutcomes))
case signed: SignedNumericOutcome =>
throw new IllegalArgumentException(s"Unexpected outcome $signed")
}
lazy val myPayoutJs = obj(PicklerKeys.myPayout)

3
build.sbt
View file

@ -30,8 +30,7 @@ lazy val commonJsSettings = {
scalaJSLinkerConfig ~= {
_.withModuleKind(ModuleKind.CommonJSModule)
}
) ++ CommonSettings.settings ++ Seq(
scalacOptions += "-P:scalajs:nowarnGlobalExecutionContext")
) ++ CommonSettings.settings
}
lazy val crypto = crossProject(JVMPlatform, JSPlatform)

2
core/src/main/scala/org/bitcoins/core/number/NumberType.scala
View file

@ -334,7 +334,7 @@ object UInt8
checkCached(unsigned)
}
def toByte(uInt8: UInt8): Byte = uInt8.underlying.toByte
def toByte(uInt8: UInt8): Byte = uInt8.toBigInt.toByte
def toBytes(us: Seq[UInt8]): ByteVector = {
ByteVector(us.map(toByte))

5
core/src/main/scala/org/bitcoins/core/script/reserved/ReservedOperations.scala
View file

@ -92,10 +92,7 @@ case class UndefinedOP_NOP(opCode: Int) extends ReservedOperation
object ReservedOperation extends ScriptOperationFactory[ReservedOperation] {
lazy val undefinedOpCodes = for { i <- 0xbb to 0xff } yield UndefinedOP_NOP(i)
override val operations: scala.collection.immutable.Vector[
org.bitcoins.core.script.reserved.ReservedOperation
with Product
with java.io.Serializable] =
override val operations: Vector[ReservedOperation] =
Vector(OP_RESERVED,
OP_VER,
OP_VERIF,

5
inThisBuild.sbt
View file

@ -3,12 +3,13 @@ import sbt.Keys.excludeLintKeys
import scala.util.Properties
val scala2_13 = "2.13.16"
val scala3 = "3.4.1"
ThisBuild / scalafmtOnCompile := !Properties.envOrNone("CI").contains("true")
ThisBuild / scalaVersion := scala2_13
ThisBuild / scalaVersion := scala3
ThisBuild / crossScalaVersions := List(scala2_13)
ThisBuild / crossScalaVersions := List(scala2_13, scala3)
//https://github.com/sbt/sbt/pull/5153
//https://github.com/bitcoin-s/bitcoin-s/pull/2194

4
project/Deps.scala
View file

@ -224,7 +224,7 @@ object Deps {
"org.scalacheck" %%% "scalacheck" % V.scalacheck withSources () withJavadoc ())
val scalaJsStubs =
"org.scala-js" %% "scalajs-stubs" % V.scalaJsStubsV % "provided"
"org.scala-js" % "scalajs-stubs_2.13" % V.scalaJsStubsV % "provided"
val scalaJsTime =
Def.setting(
@ -235,7 +235,7 @@ object Deps {
"org.scalatest" %%% "scalatest" % V.scalaTest withSources () withJavadoc ())
val scalaTestPlus = Def.setting(
"org.scalatestplus" %%% "scalacheck-1-17" % V.scalaTestPlus withSources () withJavadoc ())
"org.scalatestplus" %%% "scalacheck-1-17" % V.scalaTestPlus withSources () /*withJavadoc ()*/)
val pgEmbedded =
"com.opentable.components" % "otj-pg-embedded" % V.pgEmbeddedV withSources () withJavadoc ()