Skip to content
This repository has been archived by the owner. It is now read-only.

Commit 86da515

Browse files
eed3si9need3si9n
authored
Merge pull request #10 from SethTisue/misc-upgrades
housekeeping
2 parents d56304e + 0dcc101 commit 86da515

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+334
-238
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
target/

‎.travis.yml

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,13 @@
1-
sudo: false
2-
dist: xenial
3-
group: stable
1+
version: ~> 1.0 # needed for imports
42

5-
language: scala
6-
7-
scala: 2.12.8
8-
9-
matrix:
10-
include:
11-
- env:
12-
- TRAVIS_JDK=11.0.2.hs-adpt
13-
- env:
14-
- TRAVIS_JDK=8.0.202.hs-adpt
3+
import: scala/scala-dev:travis/default.yml
154

16-
before_install:
17-
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
18-
- "[[ -d /home/travis/.sdkman/ ]] && [[ -d /home/travis/.sdkman/bin/ ]] || rm -rf /home/travis/.sdkman/"
19-
- curl -sL https://get.sdkman.io | bash
20-
- echo sdkman_auto_answer=true > /home/travis/.sdkman/etc/config
21-
- source "/home/travis/.sdkman/bin/sdkman-init.sh"
22-
23-
install:
24-
- sdk install java $TRAVIS_JDK
25-
- unset _JAVA_OPTIONS
26-
- java -Xmx32m -version
27-
# detect sbt version from project/build.properties
28-
- export TRAVIS_SBT=$(grep sbt.version= project/build.properties | sed -e 's/sbt.version=//g' ) && echo "sbt $TRAVIS_SBT"
29-
- sdk install sbt $TRAVIS_SBT
30-
# override Travis CI's SBT_OPTS
31-
- unset SBT_OPTS
32-
- export JAVA_OPTS="-Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M"
5+
language: scala
336

34-
script: sbt -Dfile.encoding=UTF8 mimaReportBinaryIssues headerCheck packageBin doc
7+
scala: 2.12.10
358

36-
before_cache:
37-
- find $HOME/.ivy2/cache -name "*-LM-SNAPSHOT*" -delete
38-
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete
39-
- find $HOME/.sbt -name "*.lock" -delete
9+
env:
10+
- ADOPTOPENJDK=8
11+
- ADOPTOPENJDK=11
4012

41-
cache:
42-
directories:
43-
- $HOME/.ivy2/cache
44-
- $HOME/.sbt/boot
45-
- $HOME/.sdkman
13+
script: sbt -Dfile.encoding=UTF8 compilerInterface/mimaReportBinaryIssues headerCheck packageBin doc

‎LICENSE

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
@@ -187,8 +186,7 @@
187186
same "printed page" as the copyright notice for easier
188187
identification within third-party archives.
189188

190-
Copyright (c) 2011 - 2018, Lightbend, Inc.
191-
Copyright (c) 2008 - 2010, Mark Harrah
189+
Copyright [yyyy] [name of copyright owner]
192190

193191
Licensed under the Apache License, Version 2.0 (the "License");
194192
you may not use this file except in compliance with the License.

‎NOTICE

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Scala compiler interface
2+
Copyright (c) 2011-2020, Lightbend, Inc.
3+
Copyright (c) 2008-2010, Mark Harrah
4+
5+
Scala includes software developed at
6+
LAMP/EPFL (https://lamp.epfl.ch/) and
7+
Lightbend, Inc. (https://www.lightbend.com/).
8+
9+
Licensed under the Apache License, Version 2.0 (the "License").
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.

‎README.md

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
Compiler Interface
2-
==================
1+
The compiler interface is a binary contract between Zinc and the Scala
2+
compiler. The interface is written in Java. All details are subject
3+
to change.
34

4-
Compiler Interface is an internal implementation of Zinc,
5-
used as a binary contract (written in Java) between Zinc and Scala Compilers.
6-
All details are subject to change.
7-
8-
### about compiler bridges
5+
### About compiler bridges
96

107
An implementation of a compiler interface specific to a Scala version is called a compiler bridge.
118
A build tool is responsible for locating a compiler bridge to use Zinc.
12-
13-
### License
14-
15-
Copyright 2011 - 2019, Lightbend, Inc.
16-
Copyright 2008 - 2010, Mark Harrah
17-
Licensed under Apache v2 license (see LICENSE)

‎build.sbt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
import Util._
22

3-
lazy val scala212 = "2.12.8"
3+
lazy val scala212 = "2.12.10"
44

55
ThisBuild / headerLicense := Some(HeaderLicense.Custom(
6-
s"""Compiler Interface
7-
|
8-
|Copyright 2011 - 2019, Lightbend, Inc.
9-
|Copyright 2008 - 2010, Mark Harrah
10-
|
11-
|Licensed under Apache License 2.0
12-
|(http://www.apache.org/licenses/LICENSE-2.0).
13-
|""".stripMargin
6+
"""Scala compiler interface
7+
|
8+
|Copyright Lightbend, Inc. and Mark Harrah
9+
|
10+
|Licensed under Apache License 2.0
11+
|(http://www.apache.org/licenses/LICENSE-2.0).
12+
|
13+
|See the NOTICE file distributed with this work for
14+
|additional information regarding copyright ownership.
15+
|""".stripMargin
1416
))
1517

1618
def commonSettings: Seq[Setting[_]] = Seq(
@@ -30,17 +32,17 @@ lazy val compilerInterfaceRoot = (project in file("."))
3032
crossScalaVersions := Vector(),
3133
headerLicense := (ThisBuild / headerLicense).value,
3234
onLoadMessage := {
33-
""" _ __ _ __ ____
34-
| _________ ____ ___ ____ (_) /__ _____ (_)___ / /____ _____/ __/___ _________
35+
""" _ __ _ __ ____
36+
| _________ ____ ___ ____ (_) /__ _____ (_)___ / /____ _____/ __/___ _________
3537
| / ___/ __ \/ __ `__ \/ __ \/ / / _ \/ ___/_____/ / __ \/ __/ _ \/ ___/ /_/ __ `/ ___/ _ \
3638
| / /__/ /_/ / / / / / / /_/ / / / __/ / /_____/ / / / / /_/ __/ / / __/ /_/ / /__/ __/
37-
| \___/\____/_/ /_/ /_/ .___/_/_/\___/_/ /_/_/ /_/\__/\___/_/ /_/ \__,_/\___/\___/
38-
| /_/
39+
| \___/\____/_/ /_/ /_/ .___/_/_/\___/_/ /_/_/ /_/\__/\___/_/ /_/ \__,_/\___/\___/
40+
| /_/
3941
|welcome to the build for sbt/compiler-interface.
4042
|""".stripMargin +
4143
(if (sys.props("java.specification.version") != "1.8")
4244
s"""!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
43-
| Java versions is ${sys.props("java.specification.version")}. We recommend 1.8.
45+
| Java version is ${sys.props("java.specification.version")}. We recommend 1.8.
4446
|!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!""".stripMargin
4547
else "")
4648
},

‎compiler-interface/src/main/java/xsbti/AnalysisCallback.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/ArtifactInfo.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/CompileCancelled.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/CompileFailed.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/CompilerInterface1.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/ConsoleInterface1.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/InteractiveConsoleFactory.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/InteractiveConsoleInterface.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/InteractiveConsoleResponse.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/InteractiveConsoleResult.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/Logger.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/Position.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/Problem.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

‎compiler-interface/src/main/java/xsbti/Reporter.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Compiler Interface
2+
* Scala compiler interface
33
*
4-
* Copyright 2011 - 2019, Lightbend, Inc.
5-
* Copyright 2008 - 2010, Mark Harrah
4+
* Copyright Lightbend, Inc. and Mark Harrah
65
*
76
* Licensed under Apache License 2.0
87
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
911
*/
1012

1113
package xsbti;

0 commit comments

Comments
 (0)