Skip to content

Commit

Permalink
Update files for crates.io publish
Browse files Browse the repository at this point in the history
  • Loading branch information
deadblackclover committed Apr 12, 2024
1 parent 670789e commit 6cc8d24
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 5 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import com.github.sbt.jni.build.Cargo
import com.typesafe.sbt.git.JGit
import scala.sys.process._

Expand Down Expand Up @@ -28,7 +27,7 @@ publish := (publish dependsOn (Compile / assembly)).value

publishLocal := (publishLocal dependsOn (Compile / assembly)).value

version in ThisBuild := {
ThisBuild / version := {
val suffix = git.makeUncommittedSignifierSuffix(git.gitUncommittedChanges.value, Some("DIRTY"))
val releaseVersion = git.releaseVersion(git.gitCurrentTags.value, git.gitTagToVersionNumber.value, suffix)
lazy val describedExtended = git.gitDescribedVersion.value.map { described =>
Expand Down Expand Up @@ -131,10 +130,10 @@ lazy val wevm = (project in file("."))
sbtJniCoreScope := Compile,
classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat,
assembly / assemblyJarName := s"wevm_${scalaVersion.value.reverse.dropWhile(_ != '.').drop(1).reverse.take(4)}-${version.value}.jar",
publishArtifact in (Compile, packageSrc) := true,
publishArtifact in (Compile, packageBin) := true,
publishArtifact in (Compile, packageDoc) := true,
addArtifact(artifact in (Compile, assembly), assembly),
Compile / packageSrc / publishArtifact := true,
Compile / packageBin / publishArtifact := true,
Compile / packageDoc / publishArtifact := true,
addArtifact(Compile / assembly / artifact, assembly),
)
.settings(publicationSettings)
.aggregate(wevmNative)
Expand All @@ -148,7 +147,6 @@ lazy val wevmNative = (project in file("native"))
.settings(crossPaths := false)
.settings(
nativeCompile / sourceDirectory := baseDirectory.value,
nativeBuildTool := Cargo.make(Seq("--release", "--features jvm"))
)
.settings(publicationSettings)
.settings(
Expand Down
6 changes: 4 additions & 2 deletions native/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wevm"
version = "0.3.0"
name = "wevm-core"
version = "0.3.1"
edition = "2021"
authors = ["DEADBLACKCLOVER <deadblackclover@protonmail.com>"]
description = "Waves Enterprise Virtual Machine for WASM smart-contracts"
Expand All @@ -25,8 +25,10 @@ jni = { version = "0.21.0", features = ["invocation"] }
wat = "1"

[lib]
name = "wevm"
crate_type = ["cdylib", "rlib"]

[features]
default = ["jvm"]
jvm = []
bindings = []
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Seq(
"com.github.sbt" % "sbt-jni" % "1.6.0",
"com.github.sbt" % "sbt-jni" % "1.7.0",
"org.scalameta" % "sbt-scalafmt" % "2.4.6",
"com.eed3si9n" % "sbt-assembly" % "1.2.0",
"com.typesafe.sbt" % "sbt-git" % "1.0.0"
Expand Down

0 comments on commit 6cc8d24

Please sign in to comment.