Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

chore: bump the CB to run with Java 17 #23963

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.

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

Draft
hamzaremmal wants to merge 9 commits into scala:main
base: main
Choose a base branch
Loading
from hamzaremmal:bump-cb
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@ jobs:

steps:
######################################################################################
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 17. ##
######################################################################################
- name: Set JDK 8 as default
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Set JDK 17 as default
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Reset existing repo
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
Expand Down Expand Up @@ -318,10 +318,10 @@ jobs:

steps:
######################################################################################
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 17. ##
######################################################################################
- name: Set JDK 8 as default
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Set JDK 17 as default
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Reset existing repo
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
Expand Down Expand Up @@ -375,10 +375,10 @@ jobs:

steps:
######################################################################################
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 17. ##
######################################################################################
- name: Set JDK 8 as default
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Set JDK 17 as default
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Reset existing repo
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
Expand Down
2 changes: 1 addition & 1 deletion community-build/community-projects/betterfiles
Open in desktop
Submodule betterfiles updated 67 files
+0 −55 .circleci/config.yml
+1 −0 .gitattributes
+72 −0 .github/workflows/build.yml
+25 −166 .gitignore
+3 −0 .jvmopts
+17 −7 .scalafmt.conf
+0 −5 .travis.yml
+104 −15 CHANGES.md
+1 −1 LICENSE
+301 −134 README.md
+0 −24 benchmarks/README.md
+57 −144 build.sbt
+0 −342 core/src/main/scala/better/files/Implicits.scala
+0 −171 core/src/main/scala/better/files/ManagedResource.scala
+0 −67 core/src/main/scala/better/files/package.scala
+0 −20 core/src/test/scala/better/files/CommonSpec.scala
+0 −15 project/Dependencies.scala
+1 −1 project/build.properties
+6 −13 project/plugins.sbt
+10 −0 release.sh
+0 −33 shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala
+0 −16 site/index.html
+31 −0 src/main/scala-2.11/better/files/CloseableIteratorCompat.scala
+18 −0 src/main/scala-2.12/better/files/CloseableIteratorCompat.scala
+16 −0 src/main/scala-2.13/better/files/CloseableIteratorCompat.scala
+89 −0 src/main/scala-2/better/files/ResourceCompat.scala
+16 −0 src/main/scala-3/better/files/CloseableIteratorCompat.scala
+115 −0 src/main/scala-3/better/files/ResourceCompat.scala
+77 −0 src/main/scala/better/files/CloseableIterator.scala
+118 −0 src/main/scala/better/files/Dispose.scala
+29 −48 src/main/scala/better/files/Dsl.scala
+484 −590 src/main/scala/better/files/File.scala
+11 −20 src/main/scala/better/files/FileMonitor.scala
+448 −0 src/main/scala/better/files/Implicits.scala
+19 −22 src/main/scala/better/files/ReaderInputStream.scala
+118 −0 src/main/scala/better/files/Resource.scala
+70 −81 src/main/scala/better/files/Scanner.scala
+2 −6 src/main/scala/better/files/TeeOutputStream.scala
+33 −26 src/main/scala/better/files/UnicodeCharset.scala
+19 −23 src/main/scala/better/files/WriterOutputStream.scala
+80 −0 src/main/scala/better/files/package.scala
+43 −0 src/site-preprocess/index.html
+ − src/site/tech_talk_preview.png
+1 −1 src/test/java/better/files/benchmarks/ArrayBufferScanner.java
+ − src/test/resources/better/files/issue-624.zip
+ − src/test/resources/better/files/issues-262.zip
+47 −0 src/test/resources/better/files/issues-326.txt
+3 −0 src/test/resources/better/files/test-file.txt
+3 −0 src/test/resources/better/files/test_pkg/another-test-file.txt
+35 −5 src/test/scala-2/better/files/ShapelessScannerSpec.scala
+165 −0 src/test/scala/better/files/CloseableIteratorSpec.scala
+18 −0 src/test/scala/better/files/CommonSpec.scala
+51 −42 src/test/scala/better/files/DisposeSpec.scala
+16 −10 src/test/scala/better/files/FileMonitorSpec.scala
+221 −143 src/test/scala/better/files/FileSpec.scala
+30 −40 src/test/scala/better/files/GlobSpec.scala
+79 −0 src/test/scala/better/files/ResourceSpec.scala
+3 −3 src/test/scala/better/files/ScannerSpec.scala
+19 −8 src/test/scala/better/files/akka/FileWatcher.scala
+18 −13 src/test/scala/better/files/akka/FileWatcherSpec.scala
+1 −1 src/test/scala/better/files/akka/README.md
+3 −3 src/test/scala/better/files/benchmarks/Benchmark.scala
+17 −13 src/test/scala/better/files/benchmarks/EncodingBenchmark.scala
+13 −10 src/test/scala/better/files/benchmarks/ScannerBenchmark.scala
+23 −40 src/test/scala/better/files/benchmarks/Scanners.scala
+8 −0 src/test/scala/better/files/test_pkg/ResourceSpecHelper.scala
+0 −1 version.sbt
2 changes: 1 addition & 1 deletion community-build/community-projects/play-json
Open in desktop
Submodule play-json updated 137 files
2 changes: 1 addition & 1 deletion community-build/community-projects/protoquill
Open in desktop
Submodule protoquill updated 491 files
2 changes: 1 addition & 1 deletion community-build/community-projects/scalatest
Open in desktop
Submodule scalatest updated 1786 files
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ trait CommunityBuildRunner:
|
|""".stripMargin)

val testsCompletedSuccessfully = execTimes(projectDef.build, 3)
val testsCompletedSuccessfully = execTimes(projectDef.build, 1)

if !testsCompletedSuccessfully then
failWith(s"""
Expand Down
15 changes: 8 additions & 7 deletions community-build/src/scala/dotty/communitybuild/projects.scala
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ object projects:
"""set genRegularTests4 / Test / managedSources ~= (_.filterNot(_.getName == "FrameworkSuite.scala").filterNot(_.getName == "GeneratorSpec.scala").filterNot(_.getName == "CommonGeneratorsSpec.scala").filterNot(_.getName == "ParallelTestExecutionSpec.scala").filterNot(_.getName == "DispatchReporterSpec.scala").filterNot(_.getName == "TestThreadsStartingCounterSpec.scala").filterNot(_.getName == "EventuallySpec.scala"))""",
"scalacticTestDotty/test; scalatestTestDotty/test; scalacticDottyJS/compile; scalatestDottyJS/compile"
).mkString("; "),
sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal; scalacticDottyJS/publishLocal; scalatestDottyJS/publishLocal",
sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal; scalacticDottyJS/publishLocal; scalatestDottyJS/publishLocal; scalatestCompatible/publishLocal",
sbtDocCommand = ";scalacticDotty/doc", // fails with missing type ;scalatestDotty/doc"
// cannot take signature of (test: org.scalatest.concurrent.ConductorFixture#OneArgTest):
// org.scalatest.Outcome
Expand All @@ -292,7 +292,7 @@ object projects:
project = "scalatestplus-junit",
sbtTestCommand = "scalatestplus-junit/test",
sbtPublishCommand = "scalatestplus-junit/publishLocal",
dependencies = List(scalatest)
//dependencies = List(scalatest) DO NOT DEPEND ON SCALATEST, THEY ARE BREAKING THINGS IN MAIN...
)

lazy val scalatestplusTestNG = SbtCommunityProject(
Expand All @@ -317,8 +317,9 @@ object projects:

lazy val betterfiles = SbtCommunityProject(
project = "betterfiles",
sbtTestCommand = "dotty-community-build/compile",
sbtDocCommand = ";core/doc ;akka/doc ;shapelessScanner/doc"
sbtTestCommand = "test",
sbtDocCommand = "doc",
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xfatal-warnings"), // allow warnings for now
)

lazy val scalaPB = SbtCommunityProject(
Expand Down Expand Up @@ -670,9 +671,9 @@ object projects:

lazy val playJson = SbtCommunityProject(
project = "play-json",
sbtTestCommand = "test",
sbtPublishCommand = "publishLocal",
dependencies = List(scalatest, scalatestplusScalacheck),
sbtTestCommand = "play-jsonJVM/test; play-jsonJS/test; play-functionalJVM/test; play-functionalJS/test; play-json-joda/test",
sbtPublishCommand = "play-jsonJVM/publishLocal; play-jsonJS/publishLocal; play-functionalJVM/publishLocal; play-functionalJS/publishLocal; play-json-joda/publishLocal",
//dependencies = List(scalatest, scalatestplusScalacheck),
)

lazy val munitCatsEffect = SbtCommunityProject(
Expand Down
Loading

AltStyle によって変換されたページ (->オリジナル) /