Skip to content

Commit bb0d7d3

Browse files
mirkoAlicmanveru
authored andcommitted
[Chore] Project build updates
- Update Sbt - Update Scala - Remove sbt-verify package: In the near future will covered by nix build
1 parent 6e919da commit bb0d7d3

File tree

8 files changed

+10
-150
lines changed

8 files changed

+10
-150
lines changed

.circleci/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,3 @@ RUN useradd --create-home -s /bin/bash circleci
2626
WORKDIR /home/circleci
2727

2828
USER circleci
29-
30-
RUN \
31-
git clone --branch v0.4.1 --depth=1 https://github.com/input-output-hk/sbt-verify.git &&\
32-
cd sbt-verify &&\
33-
sbt publishLocal

.travis.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,6 @@ Depending on network you want to join you can use appropriate launcher, all can
4646

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

49-
First of all `sbt-verify` is used in order to check the validity of the downloaded libraries checksums.
50-
51-
`sbt-verify` can be downloaded from our read only repository by typing
52-
53-
```
54-
git clone https://github.com/input-output-hk/sbt-verify
55-
```
56-
57-
Then in order to make `sbt-verify` available to our build type
58-
59-
```
60-
cd sbt-verify
61-
sbt publishLocal
62-
```
63-
64-
This installs the `sbt-verify` library to your local repository.
65-
66-
After installing the `sbt-verify` library to your local repository checkout this repository from github and then type
6749

6850
```
6951
git submodule update --recursive --init

build.sbt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ enablePlugins(JDKPackagerPlugin, JavaAppPackaging, SolidityPlugin)
22

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

@@ -77,17 +77,8 @@ val root = project.in(file("."))
7777
.settings(commonSettings: _*)
7878
.settings(
7979
libraryDependencies ++= dep,
80-
verifyOutputFile in verifyGenerate := baseDirectory.value / "verify.sbt",
81-
verifyOptions in verify := VerifyOptions(
82-
includeBin = true,
83-
includeScala = true,
84-
includeDependency = true,
85-
excludedJars = Nil,
86-
warnOnUnverifiedFiles = false,
87-
warnOnUnusedVerifications = false
88-
),
8980
executableScriptName := name.value,
90-
dist in Universal := ((dist in Universal) dependsOn verify).value
81+
dist in Universal := (dist in Universal).value
9182
)
9283
.settings(inConfig(Integration)(Defaults.testSettings) : _*)
9384
.settings(inConfig(Benchmark)(Defaults.testSettings) : _*)

docker/scripts/install-mantis-dev.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
1010

1111
mkdir ~/repos
1212

13-
cd ~/repos
14-
git clone https://github.com/input-output-hk/sbt-verify.git
15-
cd sbt-verify
16-
git checkout $SBT_VERIFY_TAG
17-
# This is needed, since the library is not published in binary form.
18-
sbt publishLocal
19-
2013
cd ~/repos
2114
git clone https://github.com/input-output-hk/mantis.git
2215
cd mantis

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.13
1+
sbt.version = 1.2.8

project/plugins.sbt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
logLevel := sbt.Level.Warn
2-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.0")
3-
addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.1.0")
4-
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
5-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6")
6-
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "latest.release")
7-
addSbtPlugin("uk.co.josephearl" % "sbt-verify" % "0.4.1")
8-
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.12")
9-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
2+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
3+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
4+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.21")
5+
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0")
6+
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
7+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.2")
108

119
libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.6"

verify.sbt

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)