Merge pull request #6662 from eed3si9n/wip/jdk17

JDK 17
This commit is contained in:
eugene yokota 2021-09-19 02:14:51 -04:00 committed by GitHub
commit 45d6e13163
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 15 deletions

View File

@ -10,31 +10,31 @@ jobs:
matrix:
include:
- os: ubuntu-latest
java: 11
java: "17.0-custom=tgz+https://download.java.net/java/GA/jdk17/0d483333a00540d886896bac774ff48b/35/GPL/openjdk-17_linux-x64_bin.tar.gz"
jobtype: 1
- os: ubuntu-latest
java: 11
java: "17.0-custom=tgz+https://download.java.net/java/GA/jdk17/0d483333a00540d886896bac774ff48b/35/GPL/openjdk-17_linux-x64_bin.tar.gz"
jobtype: 2
- os: ubuntu-latest
java: 11
java: "17.0-custom=tgz+https://download.java.net/java/GA/jdk17/0d483333a00540d886896bac774ff48b/35/GPL/openjdk-17_linux-x64_bin.tar.gz"
jobtype: 3
- os: ubuntu-latest
java: 11
java: "17.0-custom=tgz+https://download.java.net/java/GA/jdk17/0d483333a00540d886896bac774ff48b/35/GPL/openjdk-17_linux-x64_bin.tar.gz"
jobtype: 4
- os: ubuntu-latest
java: 11
java: "17-custom=tgz+https://download.java.net/java/GA/jdk17/0d483333a00540d886896bac774ff48b/35/GPL/openjdk-17_linux-x64_bin.tar.gz"
jobtype: 5
- os: ubuntu-latest
java: 8
java: "adopt@1.8"
jobtype: 6
- os: ubuntu-latest
java: 8
java: "adopt@1.8"
jobtype: 7
- os: macos-latest
java: 8
java: "adopt@1.8"
jobtype: 8
- os: windows-latest
java: 8
java: "adopt@1.8"
jobtype: 9
runs-on: ${{ matrix.os }}
env:
@ -72,7 +72,7 @@ jobs:
- name: Setup
uses: olafurpg/setup-scala@v13
with:
java-version: "adopt@1.${{ matrix.java }}"
java-version: "${{ matrix.java }}"
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:

View File

@ -7,6 +7,7 @@
package sbt
import scala.annotation.nowarn
import scala.reflect.Manifest
import scala.collection.concurrent.TrieMap
import java.lang.ref.WeakReference
@ -32,6 +33,7 @@ import TrapExit._
* do not terminate, or if concurrent AWT applications are run.
* This category of code should only be called by forking a new JVM.
*/
@nowarn
object TrapExit {
/**
@ -144,6 +146,7 @@ object TrapExit {
* It also allows disposing AWT windows if the application created any.
* Only one AWT application is supported at a time, however.
*/
@nowarn
private final class TrapExit(delegateManager: SecurityManager) extends SecurityManager {
/** Tracks the number of running applications in order to short-cut SecurityManager checks when no applications are active.*/

View File

@ -1,4 +1,4 @@
scalaVersion in ThisBuild := "2.12.3"
ThisBuild / scalaVersion := "2.12.15"
libraryDependencies ++= Seq(
"com.novocode" % "junit-interface" % "0.5" % Test,

View File

@ -1,4 +1,4 @@
scalaVersion := "2.9.2"
ThisBuild / scalaVersion := "2.12.15"
libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-api" % "1.7.2",

View File

@ -1,5 +1,5 @@
// ThisBuild / useCoursier := false
ThisBuild / scalaVersion := "2.12.6"
ThisBuild / scalaVersion := "2.12.15"
ThisBuild / organization := "org.example"
ThisBuild / version := "0.1"

View File

@ -1,3 +1,5 @@
ThisBuild / scalaVersion := "2.12.15"
import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
import sbt.internal.Inspect
import sjsonnew._, BasicJsonProtocol._
@ -11,8 +13,6 @@ val buildInfo = taskKey[Seq[File]]("The task that generates the build info.")
lazy val root = (project in file("."))
.settings(
Global / cancelable := true,
ThisBuild / scalaVersion := "2.12.3",
console / scalacOptions += "-deprecation",
Compile / console / scalacOptions += "-Ywarn-numeric-widen",
projA / Compile / console / scalacOptions += "-feature",