Skip to content

Commit 0c619a0

Browse files
committed
Upgrade to Scala 2.12.10, SBT 1.3.8, Scalatest 3.1.1
1 parent e41fb6f commit 0c619a0

34 files changed

+265
-205
lines changed

Diff for: .DS_Store

6 KB
Binary file not shown.

Diff for: .gitignore

+129-98
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,14 @@
1+
# Created by https://www.gitignore.io/api/scala,ensime,intellij,eclipse,sbt,sublimetext,emacs,vim,visualstudiocode,metals,bloop
2+
# Edit at https://www.gitignore.io/?templates=scala,ensime,intellij,eclipse,sbt,sublimetext,emacs,vim,visualstudiocode,metals,bloop
13

2-
# Created by https://www.gitignore.io/api/scala,ensime,intellij,eclipse,sbt,sublimetext,emacs,vim
3-
4-
### Scala ###
5-
*.class
6-
*.log
7-
8-
# sbt specific
9-
.cache
10-
.history
11-
.lib/
12-
dist/*
13-
target/
14-
lib_managed/
15-
src_managed/
16-
project/boot/
17-
project/plugins/project/
18-
19-
# Scala-IDE specific
20-
.scala_dependencies
21-
.worksheet
22-
23-
24-
### Ensime ###
25-
# Ensime specific
26-
.ensime
27-
.ensime_cache/
28-
.ensime_lucene/
29-
30-
31-
### Intellij ###
32-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
33-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
34-
35-
# User-specific stuff:
36-
.idea
37-
38-
## File-based project format:
39-
*.iws
40-
41-
## Plugin-specific files:
42-
43-
# IntelliJ
44-
/out/
45-
46-
# mpeltonen/sbt-idea plugin
47-
.idea_modules/
48-
49-
# JIRA plugin
50-
atlassian-ide-plugin.xml
51-
52-
# Crashlytics plugin (for Android Studio and IntelliJ)
53-
com_crashlytics_export_strings.xml
54-
crashlytics.properties
55-
crashlytics-build.properties
56-
fabric.properties
57-
58-
### Intellij Patch ###
59-
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
60-
61-
# *.iml
62-
# modules.xml
4+
# Modified by Dave to:
5+
# - completely ignore .idea directory
6+
# - ignore project/metals.sbt
637

8+
### Bloop ###
9+
.bloop/
6410

6511
### Eclipse ###
66-
6712
.metadata
6813
bin/
6914
tmp/
@@ -76,9 +21,6 @@ local.properties
7621
.loadpath
7722
.recommenders
7823

79-
# Eclipse Core
80-
.project
81-
8224
# External tool builders
8325
.externalToolBuilders/
8426

@@ -91,8 +33,8 @@ local.properties
9133
# CDT-specific (C/C++ Development Tooling)
9234
.cproject
9335

94-
# JDT-specific (Eclipse Java Development Tools)
95-
.classpath
36+
# CDT- autotools
37+
.autotools
9638

9739
# Java annotation processor (APT)
9840
.factorypath
@@ -115,35 +57,25 @@ local.properties
11557
# Code Recommenders
11658
.recommenders/
11759

60+
# Annotation Processing
61+
.apt_generated/
11862

119-
### SBT ###
120-
# Simple Build Tool
121-
# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
122-
123-
target/
124-
lib_managed/
125-
src_managed/
126-
project/boot/
127-
.history
128-
.cache
129-
130-
131-
### SublimeText ###
132-
# cache files for sublime text
133-
*.tmlanguage.cache
134-
*.tmPreferences.cache
135-
*.stTheme.cache
63+
# Scala IDE specific (Scala & Java development for Eclipse)
64+
.cache-main
65+
.scala_dependencies
66+
.worksheet
13667

137-
# workspace files are user-specific
138-
*.sublime-workspace
68+
### Eclipse Patch ###
69+
# Eclipse Core
70+
.project
13971

140-
# project files should be checked into the repository, unless a significant
141-
# proportion of contributors will probably not be using SublimeText
142-
# *.sublime-project
72+
# JDT-specific (Eclipse Java Development Tools)
73+
.classpath
14374

144-
# sftp configuration file
145-
sftp-config.json
75+
# Annotation Processing
76+
.apt_generated
14677

78+
.sts4-cache/
14779

14880
### Emacs ###
14981
# -*- mode: gitignore; -*-
@@ -189,14 +121,113 @@ flycheck_*.el
189121
# projectiles files
190122
.projectile
191123

124+
# directory configuration
125+
.dir-locals.el
126+
127+
# network security
128+
/network-security.data
129+
130+
131+
### Ensime ###
132+
# Ensime specific
133+
.ensime
134+
.ensime_cache/
135+
.ensime_lucene/
136+
137+
### Intellij ###
138+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
139+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
140+
141+
# User-specific stuff
142+
.idea/
143+
144+
### Metals ###
145+
.metals/
146+
project/metals.sbt
147+
148+
### SBT ###
149+
# Simple Build Tool
150+
# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
151+
152+
dist/*
153+
target/
154+
lib_managed/
155+
src_managed/
156+
project/boot/
157+
project/plugins/project/
158+
.history
159+
.cache
160+
.lib/
161+
162+
### Scala ###
163+
*.class
164+
*.log
165+
*.metals
166+
167+
### SublimeText ###
168+
# Cache files for Sublime Text
169+
*.tmlanguage.cache
170+
*.tmPreferences.cache
171+
*.stTheme.cache
172+
173+
# Workspace files are user-specific
174+
*.sublime-workspace
175+
176+
# Project files should be checked into the repository, unless a significant
177+
# proportion of contributors will probably not be using Sublime Text
178+
# *.sublime-project
179+
180+
# SFTP configuration file
181+
sftp-config.json
182+
183+
# Package control specific files
184+
Package Control.last-run
185+
Package Control.ca-list
186+
Package Control.ca-bundle
187+
Package Control.system-ca-bundle
188+
Package Control.cache/
189+
Package Control.ca-certs/
190+
Package Control.merged-ca-bundle
191+
Package Control.user-ca-bundle
192+
oscrypto-ca-bundle.crt
193+
bh_unicode_properties.cache
194+
195+
# Sublime-github package stores a github token in this file
196+
# https://packagecontrol.io/packages/sublime-github
197+
GitHub.sublime-settings
198+
192199
### Vim ###
193-
# swap
194-
[._]*.s[a-w][a-z]
195-
[._]s[a-w][a-z]
196-
# session
200+
# Swap
201+
[._]*.s[a-v][a-z]
202+
[._]*.sw[a-p]
203+
[._]s[a-rt-v][a-z]
204+
[._]ss[a-gi-z]
205+
[._]sw[a-p]
206+
207+
# Session
197208
Session.vim
198-
# temporary
209+
Sessionx.vim
210+
211+
# Temporary
199212
.netrwhist
200-
*~
201-
# auto-generated tag files
213+
214+
# Auto-generated tag files
202215
tags
216+
217+
# Persistent undo
218+
[._]*.un~
219+
220+
# Coc configuration directory
221+
.vim
222+
223+
### VisualStudioCode ###
224+
.vscode/*
225+
!.vscode/settings.json
226+
!.vscode/tasks.json
227+
!.vscode/launch.json
228+
!.vscode/extensions.json
229+
230+
### VisualStudioCode Patch ###
231+
# Ignore all local history of files
232+
233+
# End of https://www.gitignore.io/api/scala,ensime,intellij,eclipse,sbt,sublimetext,emacs,vim,visualstudiocode,metals,bloop

Diff for: .scalafmt.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version = "2.4.1"

Diff for: build.sbt

+49-48
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,58 @@
1-
scalaVersion := "2.12.6"
1+
scalaVersion := "2.12.10"
22

33
logLevel := Level.Error
44
logLevel in run := Level.Error
55

66
libraryDependencies ++= Seq(
7-
"org.scalactic" %% "scalactic" % "3.0.1" % Test,
8-
"org.scalatest" %% "scalatest" % "3.0.1" % Test
7+
"org.scalactic" %% "scalactic" % "3.1.1" % Test,
8+
"org.scalatest" %% "scalatest" % "3.1.1" % Test
99
)
1010

1111
scalacOptions ++= Seq(
12-
"-deprecation", // Emit warning and location for usages of deprecated APIs.
13-
"-encoding", "utf-8", // Specify character encoding used by source files.
14-
"-explaintypes", // Explain type errors in more detail.
15-
"-feature", // Emit warning and location for usages of features that should be imported explicitly.
16-
"-language:existentials", // Existential types (besides wildcard types) can be written and inferred
17-
"-language:experimental.macros", // Allow macro definition (besides implementation and application)
18-
"-language:higherKinds", // Allow higher-kinded types
19-
"-language:implicitConversions", // Allow definition of implicit functions called views
20-
"-unchecked", // Enable additional warnings where generated code depends on assumptions.
21-
"-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
22-
"-Xfatal-warnings", // Fail the compilation if there are any warnings.
23-
"-Xfuture", // Turn on future language features.
24-
"-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver.
25-
"-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
26-
"-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error.
27-
"-Xlint:delayedinit-select", // Selecting member of DelayedInit.
28-
"-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element.
29-
"-Xlint:inaccessible", // Warn about inaccessible types in method signatures.
30-
"-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`.
31-
"-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id.
32-
"-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
33-
"-Xlint:nullary-unit", // Warn when nullary methods return Unit.
34-
"-Xlint:option-implicit", // Option.apply used implicit view.
35-
"-Xlint:package-object-classes", // Class or object defined in package object.
36-
"-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds.
37-
"-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
38-
"-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
39-
"-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
40-
"-Xlint:unsound-match", // Pattern match may not be typesafe.
41-
"-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
42-
"-Ypartial-unification", // Enable partial unification in type constructor inference
43-
// "-Ywarn-dead-code", // Warn when dead code is identified.
44-
"-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined.
45-
"-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
46-
"-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`.
47-
"-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
48-
"-Ywarn-nullary-unit", // Warn when nullary methods return Unit.
49-
// "-Ywarn-numeric-widen", // Warn when numerics are widened.
50-
// "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused.
51-
// "-Ywarn-unused:imports", // Warn if an import selector is not referenced.
52-
// "-Ywarn-unused:locals", // Warn if a local definition is unused.
53-
// "-Ywarn-unused:params", // Warn if a value parameter is unused.
54-
// "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused.
55-
// "-Ywarn-unused:privates", // Warn if a private member is unused.
56-
// "-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
12+
"-deprecation", // Emit warning and location for usages of deprecated APIs.
13+
"-encoding",
14+
"utf-8", // Specify character encoding used by source files.
15+
"-explaintypes", // Explain type errors in more detail.
16+
"-feature", // Emit warning and location for usages of features that should be imported explicitly.
17+
"-language:existentials", // Existential types (besides wildcard types) can be written and inferred
18+
"-language:experimental.macros", // Allow macro definition (besides implementation and application)
19+
"-language:higherKinds", // Allow higher-kinded types
20+
"-language:implicitConversions", // Allow definition of implicit functions called views
21+
"-unchecked", // Enable additional warnings where generated code depends on assumptions.
22+
"-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
23+
"-Xfatal-warnings", // Fail the compilation if there are any warnings.
24+
"-Xfuture", // Turn on future language features.
25+
"-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver.
26+
"-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
27+
"-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error.
28+
"-Xlint:delayedinit-select", // Selecting member of DelayedInit.
29+
"-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element.
30+
"-Xlint:inaccessible", // Warn about inaccessible types in method signatures.
31+
"-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`.
32+
"-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id.
33+
"-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
34+
"-Xlint:nullary-unit", // Warn when nullary methods return Unit.
35+
"-Xlint:option-implicit", // Option.apply used implicit view.
36+
"-Xlint:package-object-classes", // Class or object defined in package object.
37+
"-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds.
38+
"-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
39+
"-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
40+
"-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
41+
"-Xlint:unsound-match", // Pattern match may not be typesafe.
42+
"-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
43+
"-Ypartial-unification", // Enable partial unification in type constructor inference
44+
// "-Ywarn-dead-code", // Warn when dead code is identified.
45+
"-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined.
46+
"-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
47+
"-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`.
48+
"-Ywarn-nullary-override" // Warn when non-nullary `def f()' overrides nullary `def f'.
49+
// "-Ywarn-nullary-unit" // Warn when nullary methods return Unit.
50+
// "-Ywarn-numeric-widen", // Warn when numerics are widened.
51+
// "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused.
52+
// "-Ywarn-unused:imports", // Warn if an import selector is not referenced.
53+
// "-Ywarn-unused:locals", // Warn if a local definition is unused.
54+
// "-Ywarn-unused:params", // Warn if a value parameter is unused.
55+
// "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused.
56+
// "-Ywarn-unused:privates", // Warn if a private member is unused.
57+
// "-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
5758
)

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.1
1+
sbt.version=1.3.8

Diff for: sbt-launch.jar

202 KB
Binary file not shown.

Diff for: sbt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
java -Xmx3g -Xms3g -XX:+TieredCompilation -XX:ReservedCodeCacheSize=256m -XX:+UseNUMA -XX:+UseParallelGC -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M -jar sbt-launch.jar "$@"
3+
java -Xmx3g -Xms3g -XX:+TieredCompilation -XX:ReservedCodeCacheSize=256m -XX:+UseNUMA -XX:+UseParallelGC -XX:+CMSClassUnloadingEnabled -jar sbt-launch.jar "$@"

0 commit comments

Comments
 (0)