openequella#387 Scala 2.12

Author: doolse

Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt

@@ -10,8 +10,6 @@ libraryDependencies ++= Seq(
   xstreamDep
 )
 
-scalaVersion := "2.11.7"
-
 excludeDependencies += "commons-logging" % "commons-logging"
 packageOptions in assembly += Package.ManifestAttributes("Permissions" -> "all-permissions")
 assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)

Source/Plugins/InPlaceFileEditor/com.tle.web.inplaceeditor/jarsrc/build.sbt

@@ -5,7 +5,6 @@ libraryDependencies ++= Seq(
   "org.springframework" % "spring-web" % "2.5.5",
   "org.springframework" % "spring-aop" % "2.5.5"
 )
-scalaVersion := "2.11.7"
 
 packageOptions in assembly += Package.ManifestAttributes(
   "Application-Name" -> "EQUELLA In-place File Editor",

Source/Plugins/Server/com.tle.applet.filemanager/appletsrc/build.sbt

@@ -6,8 +6,6 @@ libraryDependencies ++= Seq(
   "org.springframework" % "spring-aop" % "2.5.5"
 )
 
-scalaVersion := "2.11.7"
-
 dependsOn(platformSwing, LocalProject("com_tle_common_applet"), LocalProject("com_tle_applet_filemanager"))
 
 packageOptions in assembly += Package.ManifestAttributes(

Source/Server/equellaserver/build.sbt

@@ -1,5 +1,3 @@
-scalaVersion := "2.11.7"
-
 javacOptions ++= Seq("-source", "1.8")
 
 resourceDirectory in Compile := baseDirectory.value / "resources"

Source/Server/equellaserver/scalasrc/com/tle/core/equella/runner/PluginScanner.scala

@@ -107,7 +107,7 @@ object PluginScanner {
 
       convertAll(manifestMap, Set.empty, List.empty, manifestMap.keys)._2.foreach { jpf =>
         val jpfBase = jpf.baseFile
-        val classesDir = jpfBase / "target/scala-2.11/classes"
+        val classesDir = jpfBase / "target/scala-2.12/classes"
         val codeLibrary = JPFLibrary("code", "code", classesDir.toURI.toString, Some("*"))
         val resourcesDir = Option(jpfBase / "resources").filter(_.isDirectory)
         val resLibrary = resourcesDir.map(d => JPFLibrary("resources", "resources", d.toURI.toString, None))

build.sbt

@@ -10,7 +10,6 @@ lazy val learningedge_config = project in file("Dev/learningedge-config")
 lazy val allPlugins = LocalProject("allPlugins")
 
 val legacyPaths = Seq(
-  scalaVersion := "2.11.7",
   javaSource in Compile := baseDirectory.value / "src",
   javaSource in Test := baseDirectory.value / "test",
   unmanagedResourceDirectories in Compile := (baseDirectory.value / "resources") :: Nil,

project/CommonSettings.scala

@@ -34,6 +34,7 @@ object CommonSettings extends AutoPlugin {
   import autoImport._
   override def projectSettings = Seq(
     organization := "com.github.equella",
+    scalaVersion := "2.12.4",
     javacOptions ++= Seq("-source", "1.8"),
     compileOrder := CompileOrder.Mixed,
     headerLicense := Some(HeaderLicense.ALv2("2017", "Apereo")),

project/JPFPlugin.scala

@@ -22,7 +22,7 @@ object JPFPlugin extends AutoPlugin {
   import autoImport._
 
   override def projectSettings: Seq[Def.Setting[_]] = Seq(
-    scalaVersion := "2.11.7",
+    scalaVersion := "2.12.4",
     javacOptions ++= Seq("-source", "1.8"),
     jpfCodeDirs := Seq((classDirectory in Compile).value),
     resourceDirectory in Compile := baseDirectory.value / "resources",