Skip to content

Commit 1fb3e8f

Browse files
committed
fix publishing
1 parent 59c4fbd commit 1fb3e8f

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
3838

3939
- name: Publish release ${{ github.ref }}
40-
run: sbt +publishSigned sonatypeBundleRelease
40+
run: sbt +scryptoJVM/publishSigned +scryptoJS/publishSigned sonatypeBundleRelease
4141
env:
4242
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
4343
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

build.sbt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import sbt.Keys.{homepage, scalaVersion}
22

33
name := "scrypto"
44
description := "Cryptographic primitives for Scala"
5+
organization := "org.scorexfoundation"
56

67
lazy val scala213 = "2.13.8"
78
lazy val scala212 = "2.12.15"
@@ -33,13 +34,14 @@ lazy val commonSettings = Seq(
3334
),
3435
libraryDependencies ++= Seq(
3536
"org.rudogma" %%% "supertagged" % "2.0-RC2",
36-
"org.scorexfoundation" %%% "scorex-util" % "0.1.8-20-565873cd-SNAPSHOT",
37+
"org.scorexfoundation" %%% "scorex-util" % "0.2.0",
3738
"org.scalatest" %%% "scalatest" % "3.3.0-SNAP3" % Test,
3839
"org.scalatest" %%% "scalatest-propspec" % "3.3.0-SNAP3" % Test,
3940
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.3.0-SNAP3" % Test,
4041
"org.scalatestplus" %%% "scalacheck-1-15" % "3.3.0.0-SNAP3" % Test,
4142
"org.scalacheck" %%% "scalacheck" % "1.15.2" % Test
4243
),
44+
javacOptions ++= javacReleaseOption,
4345
publishMavenStyle := true,
4446
publishTo := sonatypePublishToBundle.value
4547
)
@@ -50,9 +52,15 @@ Test / publishArtifact := false
5052

5153
pomIncludeRepository := { _ => false }
5254

55+
lazy val noPublishSettings = Seq(
56+
publish := {},
57+
publishLocal := {},
58+
publishArtifact := false
59+
)
60+
5361
lazy val scrypto = crossProject(JVMPlatform, JSPlatform)
5462
.in(file("."))
55-
.settings(commonSettings: _*)
63+
.settings(commonSettings)
5664
.jvmSettings(
5765
libraryDependencies ++= Seq(
5866
"org.bouncycastle" % "bcprov-jdk15to18" % "1.66"
@@ -89,6 +97,15 @@ lazy val benchmarks = project
8997
scalaVersion := scala213,
9098
)
9199
.enablePlugins(JmhPlugin)
100+
.settings(noPublishSettings)
101+
102+
def javacReleaseOption = {
103+
if (System.getProperty("java.version").startsWith("1."))
104+
// java <9 "--release" is not supported
105+
Seq()
106+
else
107+
Seq("--release", "8")
108+
}
92109

93110
credentials ++= (for {
94111
username <- Option(System.getenv().get("SONATYPE_USERNAME"))

0 commit comments

Comments
 (0)