From cfaf455380b9345bed869e1175652156afa5de2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20Leutha=CC=88user?= <max.leuthaeuser@gmail.com>
Date: Mon, 9 Oct 2017 09:06:28 +0200
Subject: [PATCH] - updated to latest SCROLL and Scala version
---
README.md | 2 +-
build.sbt | 8 ++++----
project/plugins.sbt | 5 +----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 25586af..a986ff4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Task and test files for MOST SCROLL task 1.
2. Clone this repository.
3. Set up your favorite IDE:
- 1. For Intellij: run ```sbt gen-idea``` and open the generated project with Intellij.
+ 1. For Intellij: use the SBT import functionality provided by Intellij.
2. For Eclipse: run ```sbt eclipse``` and import the generated project with Eclipse.
4. Implement your solution in the ```solution``` package.
diff --git a/build.sbt b/build.sbt
index c622d76..4620944 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,14 +3,14 @@ name := "MOSTSCROLLTask1"
lazy val commonSettings = Seq(
organization := "tu.dresden.de",
version := "0.0.1",
- scalaVersion := "2.11.7",
- scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8")
+ scalaVersion := "2.12.3",
+ scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-language:reflectiveCalls", "-encoding", "utf8")
)
lazy val main = (project in file(".")).settings(commonSettings: _*).
settings(
libraryDependencies ++= Seq(
- "com.github.max-leuthaeuser" % "scroll_2.11" % "latest.integration",
- "org.scalatest" %% "scalatest" % "2.2.1" % "test"
+ "com.github.max-leuthaeuser" %% "scroll" % "latest.integration",
+ "org.scalatest" %% "scalatest" % "3.0.4" % "test"
)
)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2cb91ab..7631aa4 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,2 @@
-// gen-idea plugin
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
-
// eclipse plugin
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.2")
--
GitLab