Skip to content

Commit 3fff6ab

Browse files
committed
Upgrade dependencies and add plugins
1 parent cf0fef3 commit 3fff6ab

File tree

8 files changed

+106
-20
lines changed

8 files changed

+106
-20
lines changed

.gitignore

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,56 @@
1-
# dotenv
2-
.env
1+
## sbt
2+
logs
3+
target
4+
/.idea
5+
/.idea_modules
6+
/.classpath
7+
/.gradle
8+
/.project
9+
/.gradle
10+
/.settings
11+
/public/*
312

4-
# virtualenv
5-
venv/
6-
ENV/
13+
# sbt specific
14+
.cache
15+
.history
16+
.lib/
17+
.bsp/
18+
dist/*
19+
lib_managed/
20+
src_managed/
21+
project/boot/
722

8-
# Rope project settings
23+
# Scala-IDE specific
24+
.scala_dependencies
25+
.worksheet
926
.ropeproject
1027
.idea
28+
29+
# Temporary
30+
.netrwhist
31+
*~
32+
33+
# Vim specific ---
34+
# Swap
35+
[._]*.s[a-v][a-z]
36+
[._]*.sw[a-p]
37+
[._]s[a-v][a-z]
38+
[._]sw[a-p]
39+
._*
40+
*.swp
41+
*.swo
42+
43+
# System Files
1144
.DS_Store
45+
Thumbs.db%
1246

47+
## Metals
48+
.metals
49+
.bloop
1350

14-
# sbt specific
15-
target/
16-
project/target
51+
# dotenv
52+
.env
53+
54+
# virtualenv
55+
venv/
56+
ENV/

.scalafmt.conf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version = "3.0.6"
2+
3+
runner.dialect = scala213source3
4+
align.preset = more
5+
style = defaultWithAlign
6+
maxColumn = 115
7+
docstrings.style = SpaceAsterisk
8+
docstrings.removeEmpty = true
9+
continuationIndent.callSite = 2
10+
continuationIndent.defnSite = 4
11+
includeCurlyBraceInSelectChains = false
12+
project.git = true
13+
project.excludeFilters = ["target/"]

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
os: linux
33
dist: xenial
44
language: scala
5-
scala: 2.13.3
5+
scala:
6+
- 2.13.6
67
jdk:
7-
- openjdk8
8-
# - openjdk11 # Fails!
8+
- openjdk11
99
# - openjdk14 # Fails!
1010
# - openjdk15 # Fails!

build.sbt

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
1-
name := "TheAlgorithmsScala"
1+
val PureConfigVersion = "0.17.0"
2+
val EnumeratumVersion = "1.7.0"
3+
val LogbackVersion = "1.2.6"
4+
val ScalaTestVersion = "3.2.10"
5+
val FlexmarkVersion = "0.62.2"
26

3-
version := "0.1"
4-
5-
scalaVersion := "2.12.4"
6-
7-
libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.4"
8-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % "test"
7+
lazy val root = (project in file("."))
8+
.settings(
9+
organization := "com.github.thealgorithms",
10+
name := "TheAlgorithmsScala",
11+
version := "0.2.0-SNAPSHOT",
12+
scalaVersion := "2.13.6",
13+
libraryDependencies ++= Seq(
14+
"com.beachape" %% "enumeratum" % EnumeratumVersion,
15+
"com.github.pureconfig" %% "pureconfig" % PureConfigVersion,
16+
"ch.qos.logback" % "logback-classic" % LogbackVersion,
17+
"org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
18+
"org.scalatestplus" %% "mockito-3-4" % (ScalaTestVersion + ".0") % Test,
19+
"org.scalactic" %% "scalactic" % ScalaTestVersion % Test,
20+
"com.vladsch.flexmark" % "flexmark-all" % FlexmarkVersion % Test
21+
),
22+
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full),
23+
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")
24+
)

project/build.properties

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

project/plugins.sbt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Easily manage scalac settings across scala versions with this
2+
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
3+
4+
// Makes our code tidy
5+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
6+
7+
// Revolver allows us to use re-start and work a lot faster!
8+
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
9+
10+
// To keep our dependencies up to date
11+
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "3.2.0")
12+
13+
// Enables test coverage analysis
14+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.0")
15+
16+
// Checks Maven and Ivy repositories for dependency updates
17+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0")

src/main/resources/application.conf

Whitespace-only changes.

src/test/resources/application.conf

Whitespace-only changes.

0 commit comments

Comments
 (0)