From 843f25c22d09db638a5905b7a81c905f2b990f93 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sun, 23 Apr 2017 20:56:40 +0200
Subject: [PATCH] Update Scala Version
---
.gitignore | 1 +
PlayWallServer.iml | 3 +--
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 07e2d1e..41b7b15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/.idea/libraries
/.idea/dictionaries
workspace.xml
+kotlinc.xml
diff --git a/PlayWallServer.iml b/PlayWallServer.iml
index f73ccc0..ac905d4 100644
--- a/PlayWallServer.iml
+++ b/PlayWallServer.iml
@@ -12,7 +12,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.1" level="project" />
+ <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.2" level="project" />
<orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.5.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.6.v20151106" level="project" />
@@ -35,6 +35,5 @@
<orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-jdbc:5.0" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.5" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
- <orderEntry type="library" name="scala-sdk-2.12.1" level="application" />
</component>
</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3a967f8..04c3f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.12.1</version>
+ <version>2.12.2</version>
</dependency>
<dependency>
<groupId>com.sparkjava</groupId>
--
GitLab