mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-21 22:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make sure secp256k1 is published for java8, not the class version of the jdk it was built on (#3145)

Browse source
This commit is contained in:
Chris Stewart 2021-05-26 09:36:20 -05:00 • committed by GitHub
parent caf6c2e724
commit b23b5ad55f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.sbt
View file

@ -290,7 +290,11 @@ lazy val secp256k1jni = project
//since this is not a scala module, we have no code coverage
//this also doesn't place nice with scoverage, see
//https://github.com/scoverage/sbt-scoverage/issues/275
coverageEnabled := false
coverageEnabled := false,
Compile / compile / javacOptions ++= {
//https://github.com/eclipse/jetty.project/issues/3244#issuecomment-495322586
Seq("--release", "8")
}
)
val testAndCompile = "compile->compile;test->test"

22
project/CommonSettings.scala
View file

@ -3,7 +3,15 @@ import com.typesafe.sbt.SbtNativePackager.Docker
import com.typesafe.sbt.SbtNativePackager.autoImport.packageName
import java.nio.file.Paths
import com.typesafe.sbt.packager.Keys.{daemonUser, daemonUserUid, dockerAlias, dockerAliases, dockerRepository, dockerUpdateLatest, maintainer}
import com.typesafe.sbt.packager.Keys.{
daemonUser,
daemonUserUid,
dockerAlias,
dockerAliases,
dockerRepository,
dockerUpdateLatest,
maintainer
}
import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.dockerBaseImage
import sbt._
import sbt.Keys._
@ -51,11 +59,13 @@ object CommonSettings {
//you need to build protoc manually to get it working on the new
//mac m1 chip. For instructions on how to do so see
//see: https://github.com/scalapb/ScalaPB/issues/1024
PB.protocExecutable := (
if (protocbridge.SystemDetector.detectedClassifier()=="osx-aarch_64")
file("/usr/local/bin/protoc") // to change if needed, this is where protobuf manual compilation put it for me
else
PB.protocExecutable.value
PB.protocExecutable := (
if (protocbridge.SystemDetector.detectedClassifier() == "osx-aarch_64")
file(
"/usr/local/bin/protoc"
) // to change if needed, this is where protobuf manual compilation put it for me
else
PB.protocExecutable.value
),
assembly / test := {}
)