Prefix project name with "scala-".

This way we get correct jar names. We had to tweak properties generation
because over there we use project name as a file name without "scala-"
prefix.

Author: gkossakowski

build.sbt

@@ -177,11 +177,8 @@ lazy val root = (project in file(".")).
  */
 def configureAsSubproject(project: Project): Project = {
   val base = file(".") / "src" / project.id
-  (project in base).settings(scalaSubprojectSettings: _*)//.
-    // uncommenting this line causes `update` to fail with:
-    // [error] a module is not authorized to depend on itself: org.scala-lang#scala-library;2.11.5
-    // Ouch! This is tracked here: https://github.com/sbt/sbt/issues/1872
-    //settings(name := s"scala-${project.id}")
+  (project in base).settings(scalaSubprojectSettings: _*).
+    settings(name := s"scala-${project.id}")
 }
 
 /**
@@ -220,7 +217,7 @@ lazy val copyrightString = settingKey[String]("Copyright string.")
 lazy val generateVersionPropertiesFile = taskKey[File]("Generating version properties file.")
 
 lazy val generateVersionPropertiesFileImpl: Def.Initialize[Task[File]] = Def.task {
-  val propFile = (resourceManaged in Compile).value / s"${name.value}.properties"
+  val propFile = (resourceManaged in Compile).value / s"${thisProject.value.id}.properties"
   val props = new java.util.Properties
 
   /**