diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7660375a5342..ab339ec149cf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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 @@ -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 diff --git a/community-build/community-projects/betterfiles b/community-build/community-projects/betterfiles index d098f2799092..faffdb87ec06 160000 --- a/community-build/community-projects/betterfiles +++ b/community-build/community-projects/betterfiles @@ -1 +1 @@ -Subproject commit d098f279909246243643ba3b85f3520a24c377af +Subproject commit faffdb87ec0656f56c9f8e2f0dd9e846285bf4f2 diff --git a/community-build/community-projects/play-json b/community-build/community-projects/play-json index b2b7f8b834a4..627b6266d9a8 160000 --- a/community-build/community-projects/play-json +++ b/community-build/community-projects/play-json @@ -1 +1 @@ -Subproject commit b2b7f8b834a405ec6ba5455dc345b754fab21e8f +Subproject commit 627b6266d9a8de5b8e21d1513d011a86e2149c97 diff --git a/community-build/community-projects/protoquill b/community-build/community-projects/protoquill index 494c2ddc06e7..4d953d774378 160000 --- a/community-build/community-projects/protoquill +++ b/community-build/community-projects/protoquill @@ -1 +1 @@ -Subproject commit 494c2ddc06e71f1c7f13b382675525130feee9a0 +Subproject commit 4d953d774378878a9fb3e379a03974548f666975 diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest index ab674686d089..82f68f988692 160000 --- a/community-build/community-projects/scalatest +++ b/community-build/community-projects/scalatest @@ -1 +1 @@ -Subproject commit ab674686d089f13da2e29c3b78fe6c3ab0211189 +Subproject commit 82f68f988692af63c2fde9fe58811b20708090c9 diff --git a/community-build/community-projects/scalatestplus-junit b/community-build/community-projects/scalatestplus-junit index ce02c8628b56..60bf59058064 160000 --- a/community-build/community-projects/scalatestplus-junit +++ b/community-build/community-projects/scalatestplus-junit @@ -1 +1 @@ -Subproject commit ce02c8628b56c18e3df5405af6084a9e092423be +Subproject commit 60bf59058064f8c003960701f22606591944d384 diff --git a/community-build/community-projects/scalatestplus-testng b/community-build/community-projects/scalatestplus-testng index ea7aaebfb820..76e039d40127 160000 --- a/community-build/community-projects/scalatestplus-testng +++ b/community-build/community-projects/scalatestplus-testng @@ -1 +1 @@ -Subproject commit ea7aaebfb82098204b2ff3ce5e210c820f95853e +Subproject commit 76e039d40127745a2a67edcdb99139216dacea48 diff --git a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala index 6aaaedb8a3dd..055bf83d4fba 100644 --- a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala +++ b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala @@ -68,7 +68,7 @@ trait CommunityBuildRunner: | |""".stripMargin) - val testsCompletedSuccessfully = execTimes(projectDef.build, 3) + val testsCompletedSuccessfully = execTimes(projectDef.build, 1) if !testsCompletedSuccessfully then failWith(s""" diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index df0793b6fb2a..e894f6b7f8e4 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -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 @@ -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( @@ -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( @@ -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(

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