Merge pull request #187 from SethTisue/version-bump

SethTisue · web-flow · commit e5cde43baaf3 · 2018-02-07T13:32:49.000-08:00
bump version numbers &amp; years &amp; company names
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2014 EPFL
-Copyright (C) 2012-2014 Typesafe, Inc.
+Copyright (C) 2012-2018 EPFL
+Copyright (C) 2012-2018 Lightbend, Inc.
 
 All rights reserved.
 
diff --git a/README.md b/README.md
@@ -1,29 +1,31 @@
-# scala-async [<img src="https://img.shields.io/travis/scala/async.svg"/>](https://travis-ci.org/scala/async) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.10.svg?label=latest%20release%20for%202.10"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.10) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.12)
+# scala-async [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.12)
 
-Note: this branch targets Scala 2.11.x, support for Scala 2.10.x has been moved to [this branch](https://github.com/scala/async/tree/2.10.x).
+## Supported Scala versions
+
+This branch targets Scala 2.11, 2.12, and 2.13.
+
+Support for Scala 2.10 is [on a branch](https://github.com/scala/async/tree/2.10.x).
 
 ## Quick start
 
 To include scala-async in an existing project use the library published on Maven Central.
 For sbt projects add the following to your build definition - build.sbt or project/Build.scala:
 
 ```scala
-libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.6"
+libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.7"
 ```
 
-For Maven projects add the following to your <dependencies> (make sure to use the correct Scala version prefix, _2.10 or _2.11,
-to match your project’s Scala version):
+For Maven projects add the following to your <dependencies> (make sure to use the correct Scala version suffix
+to match your project’s Scala binary version):
 
 ```scala
 <dependency>
 	<groupId>org.scala-lang.modules</groupId>
-	<artifactId>scala-async_2.11</artifactId>
-	<version>0.9.6</version>
+	<artifactId>scala-async_2.12</artifactId>
+	<version>0.9.7</version>
 </dependency>
 ```
 
-Scala 2.12 support is introduced in 0.9.6-RC5.
-
 After adding a scala-async to your classpath, write your first `async` block:
 
 ```scala
@@ -155,6 +157,7 @@ difficult to understand.
    - an `apply(): Unit` method that starts the computation.
 
 ## Limitations
+
  - See the [neg](https://github.com/scala/async/tree/master/src/test/scala/scala/async/neg) test cases
    for constructs that are not allowed in an `async` block.
  - See the [issue list](https://github.com/scala/async/issues?state=open) for which of these restrictions are planned
diff --git a/build.sbt b/build.sbt
@@ -3,9 +3,9 @@ import ScalaModulePlugin._
 scalaModuleSettings
 
 scalaVersionsByJvm in ThisBuild := {
-  val v211 = "2.11.11"
-  val v212 = "2.12.3"
-  val v213 = "2.13.0-M2"
+  val v211 = "2.11.12"
+  val v212 = "2.12.4"
+  val v213 = "2.13.0-M3"
 
   Map(
     6 -> List(v211 -> true),
@@ -17,12 +17,12 @@ scalaVersionsByJvm in ThisBuild := {
 name := "scala-async"
 repoName := "async"
 
-version := "0.9.7-SNAPSHOT"
+version := "0.9.8-SNAPSHOT"
 
 libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
 libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test" // for ToolBox
-libraryDependencies += "junit" % "junit-dep" % "4.10" % "test"
-libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
+libraryDependencies += "junit" % "junit" % "4.12" % "test"
+libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
 
 enableOptimizer
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s")
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=0.13.17
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13")
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncAnalysis.scala b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncBase.scala b/src/main/scala/scala/async/internal/AsyncBase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncId.scala b/src/main/scala/scala/async/internal/AsyncId.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncUtils.scala b/src/main/scala/scala/async/internal/AsyncUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.async.internal
 
diff --git a/src/main/scala/scala/async/internal/ExprBuilder.scala b/src/main/scala/scala/async/internal/ExprBuilder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.async.internal
 
diff --git a/src/main/scala/scala/async/internal/FutureSystem.scala b/src/main/scala/scala/async/internal/FutureSystem.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.async.internal
 
diff --git a/src/main/scala/scala/async/internal/StateAssigner.scala b/src/main/scala/scala/async/internal/StateAssigner.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 package scala.async.internal
 
diff --git a/src/test/scala/scala/async/TestLatch.scala b/src/test/scala/scala/async/TestLatch.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/package.scala b/src/test/scala/scala/async/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala
diff --git a/src/test/scala/scala/async/run/WarningsSpec.scala b/src/test/scala/scala/async/run/WarningsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
 package run
 package await0
 
 /**
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 import language.{reflectiveCalls, postfixOps}
diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/hygiene/Hygiene.scala b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse4/IfElse4.scala b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala b/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014-2013 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014-2013 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/match0/Match0.scala b/src/test/scala/scala/async/run/match0/Match0.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/stackoverflow/StackOverflowSpec.scala b/src/test/scala/scala/async/run/stackoverflow/StackOverflowSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async
diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package scala.async

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.13.16`
	`1`	`+sbt.version=0.13.17`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")`
	`1`	`+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13")`