diff --git a/.gitignore b/.gitignore index 07e2d1e0e7e8d00680e8bad288c0ef97774d1b82..41b7b150473a7564453cbfdb0cd1509c5f47816c 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 f73ccc0dc423c0d29fb21c4b4941b21035e466eb..ac905d4c5b593f52db42f17c0aca5b493bdc3671 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 3a967f85337dd7cd1730fbe3c7b05cbc8d9d4a5a..04c3f259de76837dd4582183a6f9a817ee3cf308 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>