Skip to content

Commit fbf1f85

Browse files
committed
Upgraded to sbt 1.2.8
1 parent e990bc9 commit fbf1f85

File tree

5 files changed

+26
-37
lines changed

5 files changed

+26
-37
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
language: scala
22
scala:
3-
- 2.11.7
3+
- 2.12.1
44
branches:
55
only:
66
- master
77
jdk:
8-
- oraclejdk7
98
- oraclejdk8
109
cache:
1110
directories:

build.sbt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
2+
val Organization = "Ricardo"
3+
val Name = "ScalaBCrypt"
4+
val Version = "0.1.1-SNAPSHOT"
5+
val ScalaVersion = "2.12.1"
6+
7+
lazy val root = (project in file("."))
8+
.settings(
9+
name := "scalaBCrypt",
10+
organization := Organization,
11+
scalacOptions ++= Seq("-unchecked", "-deprecation"),
12+
name := Name,
13+
version := Version,
14+
scalaVersion := ScalaVersion,
15+
resolvers += Classpaths.typesafeReleases,
16+
resolvers += "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases",
17+
libraryDependencies ++= Seq(
18+
"org.scalatest" %% "scalatest" % "3.0.8" % Test,
19+
"org.scalacheck" %% "scalacheck" % "1.14.0" % Test
20+
),
21+
testOptions in Test += Tests.Argument("-oD")
22+
)
23+

project/build.properties

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

project/build.scala

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

src/test/scala/ft/crypt/bcrypt/BCryptSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class BCryptSpec extends FlatSpec with PrivateMethodTester with PropertyChecks w
5151
("~!@#$%^&*() ~!@#$%^&*()PNBFRD", "$2a$08$Eq2r4G/76Wv39MzSX262hu", "$2a$08$Eq2r4G/76Wv39MzSX262huzPz612MZiYHVUJe/OcOql2jo4.9UxTW"),
5252
("~!@#$%^&*() ~!@#$%^&*()PNBFRD", "$2a$10$LgfYWkbzEvQ4JakH7rOvHe", "$2a$10$LgfYWkbzEvQ4JakH7rOvHe0y8pHKF9OaFgwUZ2q7W2FFZmZzJYlfS"),
5353
("~!@#$%^&*() ~!@#$%^&*()PNBFRD", "$2a$12$WApznUOJfkEGSmYRfnkrPO", "$2a$12$WApznUOJfkEGSmYRfnkrPOr466oFDCaj4b6HY3EXGvfxm43seyhgC"),
54-
("Hello", "$2a$04$Ple0QwxiRAJSclOT8yq4r.", "$2a$04$Ple0QwxiRAJSclOT8yq4r.SuhyoAaZtEOS64rgLQRsVaJJ3UnXT4u")
55-
)
54+
("Hello", "$2a$04$Ple0QwxiRAJSclOT8yq4r.", "$2a$04$Ple0QwxiRAJSclOT8yq4r.SuhyoAaZtEOS64rgLQRsVaJJ3UnXT4u"))
5655

5756
behavior of "BCrypt"
5857

0 commit comments

Comments
 (0)