Skip to content

Add omitted copyright headers, update to 2015 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 4, 2015
Merged

Add omitted copyright headers, update to 2015 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78e6ce4
Add omitted copyright headers, update to 2015
retronym May 4, 2015
9eda2f0
Update year in generated copyright header
retronym May 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/CodeGen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ object CodeGen {
private val copyright =
"""
|/*
| * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
| * Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
| */""".stripMargin.trim

private def function0SpecMethods = {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8.wrappers;

public class IteratorPrimitiveDoubleWrapper implements java.util.PrimitiveIterator.OfDouble {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8.wrappers;

public class IteratorPrimitiveIntWrapper implements java.util.PrimitiveIterator.OfInt {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8.wrappers;

public class IteratorPrimitiveLongWrapper implements java.util.PrimitiveIterator.OfLong {
Expand Down
3 changes: 3 additions & 0 deletions src/main/scala/scala/compat/java8/FutureConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8

import scala.concurrent.java8.FuturesConvertersImpl._
Expand Down
3 changes: 3 additions & 0 deletions src/main/scala/scala/compat/java8/OptionConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8

import language.implicitConversions
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8

import language.implicitConversions
Expand Down Expand Up @@ -104,5 +107,3 @@ object PrimitiveIteratorConverters {
def asPrimitive[That](implicit specOp: SpecializerOfIterators[A, That]): That = specOp.fromScala(underlying)
}
}


3 changes: 3 additions & 0 deletions src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.concurrent.java8

// Located in this package to access private[concurrent] members
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/scala/compat/java8/BoxingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8;

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/scala/compat/java8/FutureConvertersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8;

import java.util.concurrent.CompletableFuture;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/scala/compat/java8/LambdaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8;

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/scala/compat/java8/OptionConvertersTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8

import org.junit.Test
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/scala/compat/java8/SpecializedFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8;

import org.junit.Test;
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/scala/compat/java8/SpecializedTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8

import org.junit.Test
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/scala/compat/java8/SpecializedTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (C) 2012-2015 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.compat.java8;

import java.util.Arrays;
Expand Down