prepare for maintenance release 2.10.5

ScalaGrailsPlugin.groovy

@@ -16,7 +16,7 @@
  */
 
 class ScalaGrailsPlugin {
-    def version = "2.11.5"
+    def version = "2.10.5"
     def grailsVersion = "2.2 > *"
     def title = "Scala Plugin"
     def author = "Sandro Martini, originally developed by Vaclav Pech and Domingo Suarez Torres"

docs/TODO.md

@@ -5,23 +5,16 @@ TODO
 ----
 
 - for 2.11.6 (maintenance over 2.11.x):
+	- update scala license with that from Scala 2.11.x distribution ...
+	- check if add even Scala reflection module ...
 	- update groovytransforms to remove Scala deprecations, and update to the same Groovy release used in the Grails release used by the plugin ...
-	- check if publish even other Scala modules (for example reflect) ... but if possible with a suffix in the plugin name ...
 	- do all steps as usual ...
 
-- for 2.11.5.1 (maintenance over 2.11.5):
-	- merge cleanup from Burt ... ok
-	- do all steps as usual ...
-
-- for 2.10.5:
-	- make it in a dedicated branch (2.10.x), if needed ...
-	- set new plugin version and update Scala dependencies ...
-
 
 - for other releases:
 	- check if publish even other Scala modules (for example reflect) ... but if possible with a suffix in the plugin name ...
 	- update groovytransforms to remove Scala deprecations, and update to the same Groovy release used in the Grails release used by the plugin ...
-	- check if update the plugin to latest Grails 2.5.x (by rewriting from scratch) ...
+	- update the plugin to latest Grails 2.5.x (by rewriting from scratch) ...
 	- check if compile even /test/scala sources (if any, in this new folder) in the test environment (in plugin Events), and make some tests ...
 	- check if publish other Scala info in ScalaService or in another (inside the Plugin) ...
 	- run ScalaDoc on Scala sources and see what happens (and fix something, if needed) ...
@@ -104,5 +97,14 @@ DONE
 - after update to Scala-2.11 (and its re-modularized structure), check if/what dependencies should be changes/updated ... ok
 - compile('org.codehaus.groovy.modules:groovytransforms:0.2') , verify if it's still needed now (and if there is a newer version) ... yes, could be useful; note that its original author (Andres Almiray) did transfer that GitHUB repository to me, so now I can do all updates/changes there
 
+- for 2.11.5.1 (maintenance over 2.11.5):
+	- merge cleanup from Burt ... ok
+	- do all steps as usual ... no, skip this version and publish a new version, aligned with next version of Scala
+
+- for 2.10.5:
+	- make it in a dedicated branch (2.10.x), if needed ... no, not needed at the moment (I'll create it if/when needed, from this tag)
+	- update scala license with that from Scala 2.10.x distribution ... ok
+	- set new plugin version and update Scala dependencies ... ok
+
 
 ---------------

grails-app/conf/BuildConfig.groovy

@@ -18,8 +18,8 @@
 grails.project.work.dir = "target"
 // grails.project.docs.output.dir = 'docs/manual'
 
-def scalaVersion = '2.11.5'
-// def scalaSuffixVersion = '_2.11'  // ok, but not needed here, nor published to webapps ...
+def scalaVersion = '2.10.5'
+// def scalaSuffixVersion = '_2.10'  // ok, but not needed here, nor published to webapps ...
 // to keep things simple, remember to update both values inside the related service ...
 
 grails.project.dependency.resolution = {
@@ -33,9 +33,11 @@ grails.project.dependency.resolution = {
     }
 
     dependencies {
-        String[] compilerAndLibrary = ['compiler', 'library'].collect { "org.scala-lang:scala-$it:$scalaVersion" }
-        build  (compilerAndLibrary)
-        compile(compilerAndLibrary)
+        // String[] compilerAndLibrary = ['compiler', 'library'].collect { "org.scala-lang:scala-$it:$scalaVersion" }
+        // build  (compilerAndLibrary)
+        // compile(compilerAndLibrary)
+        build  ("org.scala-lang:scala-compiler:$scalaVersion", "org.scala-lang:scala-library:$scalaVersion")
+        compile("org.scala-lang:scala-compiler:$scalaVersion", "org.scala-lang:scala-library:$scalaVersion")
         compile('org.codehaus.groovy.modules:groovytransforms:0.2') { transitive = false }
     }
 

grails-app/services/grails_scala/ScalaService.groovy

@@ -58,7 +58,7 @@ class ScalaService
 	 */
 	String getScalaVersion() {
 		// return BuildConfig.scalaVersion  // not possible in a plugin
-		"2.11.5"  // to keep it simple, duplicate the value here ...
+		"2.10.5"  // to keep it simple, duplicate the value here ...
 	}
 
 	/**
@@ -68,6 +68,6 @@ class ScalaService
 	 */
 	String getScalaSuffixVersion() {
 		// return BuildConfig.scalaSuffixVersion  // not possible in a plugin
-		"_2.11"  // to keep it simple, duplicate the value here ...
+		"_2.10"  // to keep it simple, duplicate the value here ...
 	}
 }

src/docs/guide/1.1 History.gdoc

@@ -1,5 +1,11 @@
 h4. History
 
+* May 2015
+** 2.10.5 release
+*** Updated to Scala-2.10.5, last Scala release for 2.10.x
+*** Updated to ScalaTest-2.2.3 (in test webapps)
+*** Small updates/cleanup
+
 * January 2015
 ** 2.11.5 release
 *** Updated to Scala-2.11.5

test/webapp/grails-scala-test/grails-app/conf/BuildConfig.groovy

@@ -22,7 +22,7 @@ grails.project.source.level = 1.6
 
 grails.plugin.location."scala" = "../../../"
 
-def scalaSuffixVersion = '_2.11'
+def scalaSuffixVersion = '_2.10'
 
 grails.project.dependency.resolution = {
     inherits "global"

test/webapp/grails-scala-test24/grails-app/conf/BuildConfig.groovy

@@ -25,7 +25,7 @@ grails.project.source.level = 1.6
 
 grails.plugin.location."scala" = "../../../"
 
-def scalaSuffixVersion = '_2.11'
+def scalaSuffixVersion = '_2.10'
 
 grails.project.fork = [
     // configure settings for compilation JVM, note that if you alter the Groovy version forked compilation is required

web-app/META-INF/SCALA_LICENSE

@@ -11,14 +11,14 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  * Neither the name of the EPFL nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the EPFL nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -39,22 +39,18 @@ which are also included in the `licenses/` directory:
 
 ### [Apache License](http://www.apache.org/licenses/LICENSE-2.0.html)
 This license is used by the following third-party libraries:
-
   * jansi
 
 ### [BSD License](http://www.opensource.org/licenses/bsd-license.php)
 This license is used by the following third-party libraries:
-
   * jline
 
 ### [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
 This license is used by the following third-party libraries:
-
   * asm
 
 ### [MIT License](http://www.opensource.org/licenses/MIT)
 This license is used by the following third-party libraries:
-
   * jquery
   * jquery-ui
   * jquery-layout
@@ -63,6 +59,5 @@ This license is used by the following third-party libraries:
 
 ### Public Domain
 The following libraries are freely available in the public domain:
-
   * forkjoin