Skip to content

Commit

Permalink
Bump scalac to 2.13.5 (#1531)
Browse files Browse the repository at this point in the history
  • Loading branch information
iamrecursion authored Mar 1, 2021
1 parent 2bba2cc commit 2b4f0ef
Show file tree
Hide file tree
Showing 118 changed files with 250 additions and 2,734 deletions.
4 changes: 2 additions & 2 deletions .jvmopts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-Xss16M
-Xmx3G
-Xmx4G
-XX:+UseCompressedOops
--upgrade-module-path=engine/runtime/build-cache/truffle-api.jar
--upgrade-module-path=engine/runtime/build-cache/truffle-api.jar
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import java.io.File
// === Global Configuration ===================================================
// ============================================================================

val scalacVersion = "2.13.3"
val scalacVersion = "2.13.5"
val rustVersion = "1.40.0-nightly (b520af6fd 2019-11-03)"
val graalVersion = "21.0.0.2"
val javaVersion = "11"
Expand Down Expand Up @@ -355,7 +355,7 @@ val scalaCompiler = Seq(

// === Splain =================================================================

val splainVersion = "0.5.7"
val splainVersion = "0.5.8"
val splainOptions = Seq(
"-P:splain:infix:true",
"-P:splain:foundreq:true",
Expand Down Expand Up @@ -385,7 +385,7 @@ val directoryWatcherVersion = "0.9.10"
val flatbuffersVersion = "1.12.0"
val guavaVersion = "29.0-jre"
val jlineVersion = "3.15.0"
val kindProjectorVersion = "0.11.2"
val kindProjectorVersion = "0.11.3"
val mockitoScalaVersion = "1.14.8"
val newtypeVersion = "0.4.4"
val pprintVersion = "0.5.9"
Expand Down
27 changes: 16 additions & 11 deletions distribution/engine/THIRD-PARTY/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-annotations-2.11.1`.


'scala-reflect', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.3`.


'jline', licensed under the The BSD License, is distributed with the engine.
The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-3.15.0`.
Expand Down Expand Up @@ -81,6 +76,11 @@ The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `com.beachape.enumeratum-macros_2.13-1.6.1`.


'scala-reflect', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-reflect-2.13.5`.


'auto-common', licensed under the Apache 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.auto.auto-common-0.10`.
Expand Down Expand Up @@ -191,6 +191,11 @@ The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http-core_2.13-10.2.0-RC1`.


'jline', licensed under the The BSD License, is distributed with the engine.
The license file can be found at `licenses/BSD-3-Clause`.
Copyright notices related to this dependency can be found in the directory `org.jline.jline-3.19.0`.


'akka-parsing_2.13', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-parsing_2.13-10.2.0-RC1`.
Expand Down Expand Up @@ -306,6 +311,11 @@ The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.


'scala-compiler', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-compiler-2.13.5`.


'alleycats-core_2.13', licensed under the MIT, is distributed with the engine.
The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `org.typelevel.alleycats-core_2.13-2.1.1`.
Expand Down Expand Up @@ -348,7 +358,7 @@ Copyright notices related to this dependency can be found in the directory `com.

'scala-library', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.3`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.5`.


'jackson-databind', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
Expand Down Expand Up @@ -386,11 +396,6 @@ The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `com.google.j2objc.j2objc-annotations-1.3`.


'scala-compiler', licensed under the Apache-2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-compiler-2.13.3`.


'refined_2.13', licensed under the MIT, is distributed with the engine.
The license information can be found along with the copyright notices.
Copyright notices related to this dependency can be found in the directory `eu.timepit.refined_2.13-0.9.14`.
Expand Down
9 changes: 9 additions & 0 deletions distribution/engine/THIRD-PARTY/licenses/BSD-3-Clause
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19 changes: 19 additions & 0 deletions distribution/engine/THIRD-PARTY/org.jline.jline-3.19.0/NOTICES
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
this work for additional information regarding copyright ownership.

Copyright (C) 2009-2018 the original author(s).

regarding copyright ownership. The ASF licenses this file

Copyright (c) 2000-2005 Dieter Wimberger

Copyright (c) 2002-2017, the original author or authors.

Copyright (c) 2002-2019, the original author or authors.

Copyright (c) 2002-2021, the original author or authors.

Copyright (c) 2002-2020, the original author or authors.

Copyright (c) 2002-2018, the original author or authors.

Copyright (c) 2002-2016, the original author or authors.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Copyright 2005-2013 LAMP/EPFL

Copyright 2005-2017 LAMP/EPFL and Lightbend, Inc

Copyright 2005-2017 LAMP/EPFL and Lightbend, Inc.

Copyright EPFL and Lightbend, Inc.

additional information regarding copyright ownership.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2b4f0ef

Please sign in to comment.