scala · eed3si9n · Feb 18, 2020 · Feb 18, 2020 · Feb 18, 2020 · Feb 18, 2020
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/.travis.yml b/.travis.yml
@@ -1,45 +1,13 @@
-sudo: false
-dist: xenial
-group: stable
+version: ~> 1.0 # needed for imports
 
-language: scala
-
-scala: 2.12.8
-
-matrix:
-  include:
-  - env:
-      - TRAVIS_JDK=11.0.2.hs-adpt
-  - env:
-      - TRAVIS_JDK=8.0.202.hs-adpt
+import: scala/scala-dev:travis/default.yml
 
-before_install:
-  # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
-  - "[[ -d /home/travis/.sdkman/ ]] && [[ -d /home/travis/.sdkman/bin/ ]] || rm -rf /home/travis/.sdkman/"
-  - curl -sL https://get.sdkman.io | bash
-  - echo sdkman_auto_answer=true > /home/travis/.sdkman/etc/config
-  - source "/home/travis/.sdkman/bin/sdkman-init.sh"
-
-install:
-  - sdk install java $TRAVIS_JDK
-  - unset _JAVA_OPTIONS
-  - java -Xmx32m -version
-  # detect sbt version from project/build.properties
-  - export TRAVIS_SBT=$(grep sbt.version= project/build.properties | sed -e 's/sbt.version=//g' ) && echo "sbt $TRAVIS_SBT"
-  - sdk install sbt $TRAVIS_SBT
-  # override Travis CI's SBT_OPTS
-  - unset SBT_OPTS
-  - export JAVA_OPTS="-Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M"
+language: scala
 
-script: sbt -Dfile.encoding=UTF8 mimaReportBinaryIssues headerCheck packageBin doc
+scala: 2.12.10
 
-before_cache:
-  - find $HOME/.ivy2/cache -name "*-LM-SNAPSHOT*" -delete
-  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete
-  - find $HOME/.sbt        -name "*.lock"               -delete
+env:
+  - ADOPTOPENJDK=8
+  - ADOPTOPENJDK=11
 
-cache:
-  directories:
-    - $HOME/.ivy2/cache
-    - $HOME/.sbt/boot
-    - $HOME/.sdkman
+script: sbt -Dfile.encoding=UTF8 compilerInterface/mimaReportBinaryIssues headerCheck packageBin doc
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -187,8 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2011 - 2018, Lightbend, Inc.
-   Copyright (c) 2008 - 2010, Mark Harrah
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/NOTICE b/NOTICE
@@ -0,0 +1,14 @@
+Scala compiler interface
+Copyright (c) 2011-2020, Lightbend, Inc.
+Copyright (c) 2008-2010, Mark Harrah
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/README.md b/README.md
@@ -1,17 +1,8 @@
-Compiler Interface
-==================
+The compiler interface is a binary contract between Zinc and the Scala
+compiler.  The interface is written in Java.  All details are subject
+to change.
 
-Compiler Interface is an internal implementation of Zinc,
-used as a binary contract (written in Java) between Zinc and Scala Compilers.
-All details are subject to change.
-
-### about compiler bridges
+### About compiler bridges
 
 An implementation of a compiler interface specific to a Scala version is called a compiler bridge.
 A build tool is responsible for locating a compiler bridge to use Zinc.
-
-### License
-
-Copyright 2011 - 2019, Lightbend, Inc.
-Copyright 2008 - 2010, Mark Harrah
-Licensed under Apache v2 license (see LICENSE)
diff --git a/build.sbt b/build.sbt
@@ -1,16 +1,18 @@
 import Util._
 
-lazy val scala212 = "2.12.8"
+lazy val scala212 = "2.12.10"
 
 ThisBuild / headerLicense  := Some(HeaderLicense.Custom(
-  s"""Compiler Interface
-     |
-     |Copyright 2011 - 2019, Lightbend, Inc.
-     |Copyright 2008 - 2010, Mark Harrah
-     |
-     |Licensed under Apache License 2.0
-     |(http://www.apache.org/licenses/LICENSE-2.0).
-     |""".stripMargin
+  """Scala compiler interface
+    |
+    |Copyright Lightbend, Inc. and Mark Harrah
+    |
+    |Licensed under Apache License 2.0
+    |(http://www.apache.org/licenses/LICENSE-2.0).
+    |
+    |See the NOTICE file distributed with this work for
+    |additional information regarding copyright ownership.
+    |""".stripMargin
 ))
 
 def commonSettings: Seq[Setting[_]] = Seq(
@@ -30,17 +32,17 @@ lazy val compilerInterfaceRoot = (project in file("."))
     crossScalaVersions := Vector(),
     headerLicense := (ThisBuild / headerLicense).value,
     onLoadMessage := {
-      """                                _ __                _       __            ____              
-        |    _________  ____ ___  ____  (_) /__  _____      (_)___  / /____  _____/ __/___ _________ 
+      """                                _ __                _       __            ____
+        |    _________  ____ ___  ____  (_) /__  _____      (_)___  / /____  _____/ __/___ _________
         |   / ___/ __ \/ __ `__ \/ __ \/ / / _ \/ ___/_____/ / __ \/ __/ _ \/ ___/ /_/ __ `/ ___/ _ \
         |  / /__/ /_/ / / / / / / /_/ / / /  __/ /  /_____/ / / / / /_/  __/ /  / __/ /_/ / /__/  __/
-        |  \___/\____/_/ /_/ /_/ .___/_/_/\___/_/        /_/_/ /_/\__/\___/_/  /_/  \__,_/\___/\___/ 
-        |                     /_/                                                                   
+        |  \___/\____/_/ /_/ /_/ .___/_/_/\___/_/        /_/_/ /_/\__/\___/_/  /_/  \__,_/\___/\___/
+        |                     /_/
         |welcome to the build for sbt/compiler-interface.
         |""".stripMargin +
           (if (sys.props("java.specification.version") != "1.8")
             s"""!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-               |  Java versions is ${sys.props("java.specification.version")}. We recommend 1.8.
+               |  Java version is ${sys.props("java.specification.version")}. We recommend 1.8.
                |!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!""".stripMargin
           else "")
     },

diff --git a/compiler-interface/src/main/java/xsbti/AnalysisCallback.java b/compiler-interface/src/main/java/xsbti/AnalysisCallback.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/ArtifactInfo.java b/compiler-interface/src/main/java/xsbti/ArtifactInfo.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/CompileCancelled.java b/compiler-interface/src/main/java/xsbti/CompileCancelled.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/CompileFailed.java b/compiler-interface/src/main/java/xsbti/CompileFailed.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/CompilerInterface1.java b/compiler-interface/src/main/java/xsbti/CompilerInterface1.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/ConsoleInterface1.java b/compiler-interface/src/main/java/xsbti/ConsoleInterface1.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/InteractiveConsoleFactory.java b/compiler-interface/src/main/java/xsbti/InteractiveConsoleFactory.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/InteractiveConsoleInterface.java b/compiler-interface/src/main/java/xsbti/InteractiveConsoleInterface.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/InteractiveConsoleResponse.java b/compiler-interface/src/main/java/xsbti/InteractiveConsoleResponse.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/InteractiveConsoleResult.java b/compiler-interface/src/main/java/xsbti/InteractiveConsoleResult.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/Logger.java b/compiler-interface/src/main/java/xsbti/Logger.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/Position.java b/compiler-interface/src/main/java/xsbti/Position.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/Problem.java b/compiler-interface/src/main/java/xsbti/Problem.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;

diff --git a/compiler-interface/src/main/java/xsbti/Reporter.java b/compiler-interface/src/main/java/xsbti/Reporter.java
@@ -1,11 +1,13 @@
 /*
- * Compiler Interface
+ * Scala compiler interface
  *
- * Copyright 2011 - 2019, Lightbend, Inc.
- * Copyright 2008 - 2010, Mark Harrah
+ * Copyright Lightbend, Inc. and Mark Harrah
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  */
 
 package xsbti;