Merge remote-tracking branch 'upstream/master' into merge-master-to-java7

Author: lrytz

.gitignore

@@ -6,23 +6,10 @@
 # If it is the latter, you can augment this list with
 # entries in .git/info/excludes
 #
-# see also test/files/.gitignore
-#
 
 *.jar
 *~
 
-build.properties
-
-# target directories for ant build
-/build/
-/dists/
-
-# other
-/out/
-/bin/
-/sandbox/
-
 # eclipse, intellij
 /.classpath
 /.project
@@ -39,9 +26,6 @@ scala-swing.iml
 # bak files produced by ./cleanup-commit
 *.bak
 
-# Standard symbolic link to build/quick/bin
-qbin
-
 # Mac specific, but that is common enough a dev platform to warrant inclusion.
 .DS_Store
 

.travis.yml

@@ -16,7 +16,7 @@ scala:
 jdk:
   - openjdk7
   - oraclejdk7
-  
+
 notifications:
   email:
     - [email protected]

README.md

@@ -1,7 +1,9 @@
 scala-swing (mostly-unsupported)
 =========
 
-[<img src="https://api.travis-ci.org/scala/scala-swing.png?branch=java7"/>](https://travis-ci.org/scala/scala-swing?branch=java7)
+[<img src="https://img.shields.io/travis/scala/scala-swing/java7.svg"/>](https://travis-ci.org/scala/scala-swing)
+[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-swing_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.11)
+[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-swing_2.12*.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.12*)
 [![Stories in Ready](https://badge.waffle.io/scala/scala-swing.svg?label=ready&title=Ready)](http://waffle.io/scala/scala-swing)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-swing)
 
@@ -77,6 +79,22 @@ Versions
 _Reason for different versions can be found at [SI-3634](https://issues.scala-lang.org/browse/SI-3634)_
 
 
-Notes:
 
-- Visual appearance of combo boxes using the GTK LaF is broken on JDKs < 1.7b30. This is a Java Swing problem.
+ScalaDocs
+---
+
+Documentation for scala-swing included in 2.11.1 is can be found [here](http://www.scala-lang.org/api/2.11.1/scala-swing/#scala.swing.package)
+
+Other version can be found at [http://www.scala-lang.org/documentation/api.html](http://www.scala-lang.org/documentation/api.html) 
+
+
+Current Work
+---
+
+Current changes are being made on the **java7** branch. This is to mainly because of the EOL of java6 and the generification that happened between jdk6 and jdk7 requiring a difference in the source code. This class files are targeted at java6 and will run with all versions upwards. 
+
+<br>
+
+_Notes:_
+
+- Visual appearance of combo boxes using the GTK LaF is broken on JDKs < 1.7b30. This is a Java Swing problem.

build.sbt

@@ -2,8 +2,6 @@ import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
 
 scalaModuleSettings
 
-organization := "org.scala-lang.modules"
-
 name                       := "scala-swing"
 
 version := "2.0.0-SNAPSHOT"
@@ -12,28 +10,16 @@ scalaVersion := "2.11.1"
 
 scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.6")
 
-snapshotScalaBinaryVersion := "2.11"
-
 // important!! must come here (why?)
 scalaModuleOsgiSettings
 
 OsgiKeys.exportPackage     := Seq(s"scala.swing.*;version=${version.value}")
 
-//MimaPlugin.mimaDefaultSettings
-//
-//MimaKeys.previousArtifact  := Some(organization.value % s"${name.value}_2.11" % "1.0.1")
-//
-//// run mima during tests
-//test in Test := {
-//  MimaKeys.reportBinaryIssues.value
-//  (test in Test).value
-//}
-
+mimaPreviousVersion := Some("1.0.1")
 
 // set the prompt (for this build) to include the project id.
 shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project + "> " }
 
-
 lazy val swing = project.in( file(".") )
 
 lazy val examples = project.in( file("examples") )
@@ -51,8 +37,3 @@ lazy val uitest = project.in( file("uitest") )
     fork in run := true,
     fork := true
   )
-
-
-
-
-

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.8

project/plugins.sbt

@@ -1,3 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2")
-
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
+addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.3")