Skip to content

Commit 873e689

Browse files
committed
Merge pull request #34 from retronym/topic/header
Add omitted copyright headers, update to 2015
2 parents 68c2523 + 9eda2f0 commit 873e689

15 files changed

+39
-5
lines changed

project/CodeGen.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ object CodeGen {
288288
private val copyright =
289289
"""
290290
|/*
291-
| * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
291+
| * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
292292
| */""".stripMargin.trim
293293

294294
private def function0SpecMethods = {

src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8.wrappers;
25

36
public class IteratorPrimitiveDoubleWrapper implements java.util.PrimitiveIterator.OfDouble {

src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8.wrappers;
25

36
public class IteratorPrimitiveIntWrapper implements java.util.PrimitiveIterator.OfInt {

src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8.wrappers;
25

36
public class IteratorPrimitiveLongWrapper implements java.util.PrimitiveIterator.OfLong {

src/main/scala/scala/compat/java8/FutureConverters.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8
25

36
import scala.concurrent.java8.FuturesConvertersImpl._

src/main/scala/scala/compat/java8/OptionConverters.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8
25

36
import language.implicitConversions

src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8
25

36
import language.implicitConversions
@@ -104,5 +107,3 @@ object PrimitiveIteratorConverters {
104107
def asPrimitive[That](implicit specOp: SpecializerOfIterators[A, That]): That = specOp.fromScala(underlying)
105108
}
106109
}
107-
108-

src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.concurrent.java8
25

36
// Located in this package to access private[concurrent] members

src/test/java/scala/compat/java8/BoxingTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
33
*/
44
package scala.compat.java8;
55

src/test/java/scala/compat/java8/FutureConvertersTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8;
25

36
import java.util.concurrent.CompletableFuture;

src/test/java/scala/compat/java8/LambdaTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
33
*/
44
package scala.compat.java8;
55

src/test/java/scala/compat/java8/OptionConvertersTest.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8
25

36
import org.junit.Test

src/test/java/scala/compat/java8/SpecializedFactoryTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8;
25

36
import org.junit.Test;

src/test/java/scala/compat/java8/SpecializedTest.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8
25

36
import org.junit.Test

src/test/java/scala/compat/java8/SpecializedTestSupport.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
3+
*/
14
package scala.compat.java8;
25

36
import java.util.Arrays;

0 commit comments

Comments
 (0)