Merge pull request #1 from DonatJR/develop

merge develop to master for use in web version
bb30 · Nov 8, 2017 · 8e6f305 · 8e6f305
2 parents 02c595a + 9271c86
commit 8e6f305
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-name          := "learn-duel"
+name          := "LearnDuel"
 organization  := "de.htwg.se"
 version       := "0.0.1"
 scalaVersion  := "2.12.4"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.2
+sbt.version=1.0.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,5 @@
 resolvers += Classpaths.sbtPluginReleases
 
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.3")
-
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
diff --git a/...cala/de/htwg/se/learn_duel/YourGame.scala → ...ala/de/htwg/se/learn_duel/LearnDuel.scala b/...cala/de/htwg/se/learn_duel/YourGame.scala → ...ala/de/htwg/se/learn_duel/LearnDuel.scala
@@ -2,7 +2,7 @@ package de.htwg.se.learn_duel
 
 import de.htwg.se.learn_duel.ui.impl.TUI
 
-object YourGame {
+object LearnDuel {
     def main(args: Array[String]): Unit = {
         println(TUI.createTUI.dummyText)
     }