Skip to content

Commit

Permalink
[Chore] Project build updates
Browse files Browse the repository at this point in the history
- Update Sbt
- Update Scala
- Remove sbt-verify package: In the near future will covered by nix build
  • Loading branch information
mirkoAlic committed Sep 8, 2020
1 parent 98c4688 commit 2eca73b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 142 deletions.
5 changes: 0 additions & 5 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,3 @@ RUN useradd --create-home -s /bin/bash circleci
WORKDIR /home/circleci

USER circleci

RUN \
git clone --branch v0.4.1 --depth=1 https://github.com/input-output-hk/sbt-verify.git &&\
cd sbt-verify &&\
sbt publishLocal
17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

18 changes: 0 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,6 @@ Depending on network you want to join you can use appropriate launcher, all can

As an alternative to downloading the client build the client from source.

First of all `sbt-verify` is used in order to check the validity of the downloaded libraries checksums.

`sbt-verify` can be downloaded from our read only repository by typing

```
git clone https://github.com/input-output-hk/sbt-verify
```

Then in order to make `sbt-verify` available to our build type

```
cd sbt-verify
sbt publishLocal
```

This installs the `sbt-verify` library to your local repository.

After installing the `sbt-verify` library to your local repository checkout this repository from github and then type

```
git submodule update --recursive --init
Expand Down
15 changes: 3 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ enablePlugins(JDKPackagerPlugin, JavaAppPackaging, SolidityPlugin)

val commonSettings = Seq(
name := "mantis",
version := "2.0",
scalaVersion := "2.12.5",
version := "3.0",
scalaVersion := "2.12.10",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-l", "EthashMinerSpec") // miner tests disabled by default
)

Expand Down Expand Up @@ -78,17 +78,8 @@ val root = project.in(file("."))
.settings(commonSettings: _*)
.settings(
libraryDependencies ++= dep,
verifyOutputFile in verifyGenerate := baseDirectory.value / "verify.sbt",
verifyOptions in verify := VerifyOptions(
includeBin = true,
includeScala = true,
includeDependency = true,
excludedJars = Nil,
warnOnUnverifiedFiles = false,
warnOnUnusedVerifications = false
),
executableScriptName := name.value,
dist in Universal := ((dist in Universal) dependsOn verify).value
dist in Universal := (dist in Universal).value
)
.settings(inConfig(Integration)(Defaults.testSettings) : _*)
.settings(inConfig(Benchmark)(Defaults.testSettings) : _*)
Expand Down
7 changes: 0 additions & 7 deletions docker/scripts/install-mantis-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))

mkdir ~/repos

cd ~/repos
git clone https://github.com/input-output-hk/sbt-verify.git
cd sbt-verify
git checkout $SBT_VERIFY_TAG
# This is needed, since the library is not published in binary form.
sbt publishLocal

cd ~/repos
git clone https://github.com/input-output-hk/mantis.git
cd mantis
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 0.13.13
sbt.version = 1.2.8
14 changes: 6 additions & 8 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
logLevel := sbt.Level.Warn
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.0")
addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.1.0")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "latest.release")
addSbtPlugin("uk.co.josephearl" % "sbt-verify" % "0.4.1")
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.12")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.21")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0")
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.2")

libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.6"
74 changes: 0 additions & 74 deletions verify.sbt

This file was deleted.

0 comments on commit 2eca73b

Please sign in to comment.