This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 06671fda10 remove outdated jdk9 test setup (#2466)
06671fda10 is described below
commit 06671fda10a610dc96964697935102ceffeddfea
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Nov 9 16:14:33 2025 +0100
remove outdated jdk9 test setup (#2466)
---
.github/workflows/nightly-builds.yml | 15 ------
.github/workflows/verify-jdk9-classes.sh | 33 -------------
build.sbt | 1 -
project/VerifyJDK9Classes.scala | 85 --------------------------------
4 files changed, 134 deletions(-)
diff --git a/.github/workflows/nightly-builds.yml
b/.github/workflows/nightly-builds.yml
index 858c8186ac..0b2f08c972 100644
--- a/.github/workflows/nightly-builds.yml
+++ b/.github/workflows/nightly-builds.yml
@@ -177,18 +177,3 @@ jobs:
sbt \
-Dpekko.build.scalaVersion=${{ matrix.scalaVersion }} \
"++ ${{ matrix.scalaVersion }} ;publishLocal;publishM2"
-
- - name: Install scala-cli
- if: ${{ matrix.javaVersion == 11 }}
- uses:
VirtusLab/scala-cli-setup@77834b5926f3eb70869d8009530c65585f7a039b # v1.9.1
- # run: |-
- # curl -sS "https://virtuslab.github.io/scala-cli-packages/KEY.gpg";
| sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/scala-cli.gpg 2>/dev/null
- # sudo curl -s --compressed -o
/etc/apt/sources.list.d/scala_cli_packages.list
"https://virtuslab.github.io/scala-cli-packages/debian/scala_cli_packages.list";
- # sudo apt update
- # sudo apt install scala-cli
-
- - name: Use Scala-CLI to verify jdk 9 classes
- if: ${{ matrix.javaVersion == 11 }}
- run: |-
- chmod +x .github/workflows/verify-jdk9-classes.sh
- .github/workflows/verify-jdk9-classes.sh
diff --git a/.github/workflows/verify-jdk9-classes.sh
b/.github/workflows/verify-jdk9-classes.sh
deleted file mode 100644
index 4415368e73..0000000000
--- a/.github/workflows/verify-jdk9-classes.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-echo "Starting verification with Scala-CLI..."
-
-for file in stream/target/scala-cli/*.sc; do
- cat $file
- echo "Starting verification for with file: $file."
- if scala-cli "$file" ; then
- echo "Verification successful for $file."
- else
- echo "Error when verifying $file."
- exit 1
- fi
-done
-
-echo "All verifications successful."
diff --git a/build.sbt b/build.sbt
index 53a9218792..9027ac3e50 100644
--- a/build.sbt
+++ b/build.sbt
@@ -446,7 +446,6 @@ lazy val stream = pekkoModule("stream")
.settings(AutomaticModuleName.settings("pekko.stream"))
.settings(OSGi.stream)
.settings(Protobuf.settings)
- .settings(VerifyJDK9Classes.settings)
.enablePlugins(BoilerplatePlugin, DependWalkerPlugin, SbtOsgi)
lazy val streamTestkit = pekkoModule("stream-testkit")
diff --git a/project/VerifyJDK9Classes.scala b/project/VerifyJDK9Classes.scala
deleted file mode 100644
index 6de5e62df0..0000000000
--- a/project/VerifyJDK9Classes.scala
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-object VerifyJDK9Classes {
- import sbt._
- import sbt.Keys._
-
- lazy val settings: Seq[Setting[_]] = inConfig(Compile) {
- Seq {
- sourceGenerators += {
- generateAndWriteScalaCLIScript(target)
- }
- }
- }
-
- def generateAndWriteScalaCLIScript(dir: SettingKey[File]):
Def.Initialize[Task[Seq[sbt.File]]] =
- Def.task[Seq[File]] {
- val scalaVer = scalaVersion.value
- val script = generateScalaCLIScript(version.value, scalaVer)
- val file = dir.value / "scala-cli" / s"VerifyJDK9Classes-${scalaVer}.sc"
- val content = script.stripMargin.format(version.value)
- if (!file.exists || IO.read(file) != content) IO.write(file, content)
- // the generated file is not used.
- Nil
- }
-
- private def generateScalaCLIScript(version: String, scalaBinaryVersion:
String): String =
- s"""
- |//> using scala ${scalaBinaryVersion}
- |//> using dep "org.apache.pekko::pekko-stream:${version}"
- |
- |/*
- | * Licensed to the Apache Software Foundation (ASF) under one or more
- | * contributor license agreements. See the NOTICE file distributed with
- | * this work for additional information regarding copyright ownership.
- | * The ASF licenses this file to You under the Apache License, Version
2.0
- | * (the "License"); you may not use this file except in compliance with
- | * the License. You may obtain a copy of the License at
- | *
- | * http://www.apache.org/licenses/LICENSE-2.0
- | *
- | * Unless required by applicable law or agreed to in writing, software
- | * distributed under the License is distributed on an "AS IS" BASIS,
- | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
- | * See the License for the specific language governing permissions and
- | * limitations under the License.
- | */
- |
- |object VerifyJDK9Classes {
- | def main(args: Array[String]): Unit = {
- | import org.apache.pekko.actor.ActorSystem
- | import org.apache.pekko.stream.scaladsl.{ JavaFlowSupport, Source }
- |
- | import java.lang.System.exit
- | import scala.concurrent.Await
- | import scala.concurrent.duration.DurationInt
- | implicit val system: ActorSystem = ActorSystem.create("test")
- | val future = Source(1 to 3).runWith(
- | JavaFlowSupport.Sink.asPublisher[Int](fanout =
false).mapMaterializedValue { p =>
- | JavaFlowSupport.Source.fromPublisher(p).runFold(0)(_ + _)
- | })
- |
- | val result = Await.result(future, 3.seconds)
- | println(s"Result:" + result)
- | system.terminate()
- | exit(if (result == 6) 0 else 1)
- | }
- |}
- |
- |""".stripMargin
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
