Skip to content

Commit 36ce98d

Browse files
committed
change to openjdk
1 parent dab722b commit 36ce98d

File tree

4 files changed

+26
-6
lines changed

4 files changed

+26
-6
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: scala
22
scala:
33
- 2.11.11
4-
- 2.12.4
4+
- 2.12.8
55
jdk:
6-
- oraclejdk8
6+
- openjdk8
77
sudo: false
88
notifications:
99
email:

Makefile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
.PHONY: help clean compile test
2+
.DEFAULT_GOAL := help
3+
4+
help:
5+
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
6+
7+
clean: ## clean
8+
@sbt clean
9+
10+
compile: ## compile
11+
@sbt compile
12+
13+
cross-compile: ## cross-compile
14+
@sbt +compile
15+
16+
test: ## test
17+
@sbt test
18+
19+
cross-test: ## cross test
20+
@sbt +test

project/ProjectSettings.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.typesafe.sbt.SbtScalariform
55

66
object ProjectSettings extends AutoPlugin {
77
final val AkkaVersion = "2.4.20"
8-
final val ScalazVersion = "7.2.17"
9-
final val ScalaTestVersion = "3.0.4"
8+
final val ScalazVersion = "7.2.28"
9+
final val ScalaTestVersion = "3.0.8"
1010
final val LogbackVersion = "1.2.3"
1111

1212
override def requires = plugins.JvmPlugin && SbtScalariform
@@ -20,7 +20,7 @@ object ProjectSettings extends AutoPlugin {
2020
startYear := Some(2014),
2121

2222
scalaVersion := "2.12.6",
23-
crossScalaVersions := Seq("2.11.11", "2.12.6"),
23+
crossScalaVersions := Seq("2.11.12", "2.12.8"),
2424
crossVersion := CrossVersion.binary,
2525

2626
licenses := Seq(("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt"))),

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
sbt.version=1.2.1
16+
sbt.version=1.2.8

0 commit comments

Comments
 (0)