1.0.2

dubinsky · dubinsky · commit 47cf7ec229d8 · 2026-05-06T15:05:03.000-04:00
- chore: dependency updates;
- chore: cleanup;
- chore: Gradle 9.5.0;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.2] - 2026-05-06
+- chore: dependency updates;
+- chore: cleanup;
+- chore: Gradle 9.5.0;
+
 ## [1.0.1] - 2026-04-13
 - chore: dependency updates;
 - chore: Gradle 9.4.1;
diff --git a/README.adoc b/README.adoc
@@ -4,10 +4,10 @@
 :toc: preamble
 :icons: font
 // INCLUDED ATTRIBUTES
-:attribute-gradleVersionForBadge: 9.5.0--rc--2
+:attribute-gradleVersionForBadge: 9.5.0
 :attribute-pluginBackendProperty: org.podval.tools.backend
-:version-gradle: 9.5.0-rc-2
-:version-plugin: 1.0.1
+:version-gradle: 9.5.0
+:version-plugin: 1.0.2
 :version-scalanative: 0.5.11
 :version-scalajs: 1.21.0
 :version-framework-specs2-scala2: 4.23.0
@@ -23,7 +23,7 @@
 :version-framework-junit4: 0.13.3
 :version-framework-junit4-scala-js: 1.21.0
 :version-framework-junit4-scala-native: 0.5.11
-:version-framework-airspec: 2026.1.5
+:version-framework-airspec: 2026.1.6
 :version-framework-hedgehog: 0.13.0
 :version-framework-munit: 1.3.0
 :version-framework-scalacheck: 1.19.0
@@ -32,7 +32,7 @@
 :version-framework-specs2: 5.9.0
 :version-framework-utest: 0.9.5
 :version-framework-weaver-test: 0.12.0
-:version-framework-ziotest: 2.1.25
+:version-framework-ziotest: 2.1.26
 // INCLUDED ATTRIBUTES
 
 image:https://github.com/dubinsky/scalajs-gradle/actions/workflows/CI.yaml/badge.svg[]
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-  id 'com.github.ben-manes.versions' version '0.53.0'
+  id 'com.github.ben-manes.versions' version '0.54.0'
   id 'scala'
   id 'signing'
-  id 'org.podval.tools.scalajs' version '1.0.0'
+  id 'org.podval.tools.scalajs' version '1.0.1'
   id 'com.gradle.plugin-publish' version '2.1.1'
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.podval.tools.backend = JVM
-version_gradle = 9.5.0-rc-2
-version_plugin = 1.0.1
+version_gradle = 9.5.0
+version_plugin = 1.0.2
 version_scalanative = 0.5.11
 version_scalajs = 1.21.0
 version_framework_specs2_scala2 = 4.23.0
@@ -16,7 +16,7 @@ version_junit = 4.13.2
 version_framework_junit4 = 0.13.3
 version_framework_junit4_scala_js = 1.21.0
 version_framework_junit4_scala_native = 0.5.11
-version_framework_airspec = 2026.1.5
+version_framework_airspec = 2026.1.6
 version_framework_hedgehog = 0.13.0
 version_framework_munit = 1.3.0
 version_framework_scalacheck = 1.19.0
@@ -25,4 +25,4 @@ version_framework_scalatest = 3.2.20
 version_framework_specs2 = 5.9.0
 version_framework_utest = 0.9.5
 version_framework_weaver_test = 0.12.0
-version_framework_ziotest = 2.1.25
+version_framework_ziotest = 2.1.26
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/scala/org/podval/tools/backend/VersionsWriter.scala b/src/main/scala/org/podval/tools/backend/VersionsWriter.scala
@@ -27,8 +27,8 @@ object VersionsWriter:
         versions.map((name, version) => s":version-$name: $version")
     )
 
-  private val gradleVersion: Version = Version("9.5.0-rc-2")
-  private val pluginVersion: Version = Version("1.0.1")
+  private val gradleVersion: Version = Version("9.5.0")
+  private val pluginVersion: Version = Version("1.0.2")
 
   private def attributes: Seq[(String, String)] = Seq(
     "gradleVersionForBadge"    -> gradleVersion.toString.replace("-", "--"),
diff --git a/src/main/scala/org/podval/tools/build/ScalaBinaryVersion.scala b/src/main/scala/org/podval/tools/build/ScalaBinaryVersion.scala
@@ -19,6 +19,8 @@ sealed abstract class ScalaBinaryVersion(
 
   def isInRange(version: Version): Boolean
 
+  def isScala3: Boolean
+
 object ScalaBinaryVersion:
   val group: String = "org.scala-lang"
 
@@ -37,7 +39,8 @@ object ScalaBinaryVersion:
     name = "Scala 3 Library.",
     prefix = Version("3"),
     versionDefault = versionDefault
-  )
+  ):
+    final override def isScala3: Boolean = true
 
   private val versionScala3LibraryCompiledWithScala3: Version = Version("3.8.0")
 
@@ -62,6 +65,7 @@ object ScalaBinaryVersion:
     versionDefault = versionDefault
   ):
     final override def isInRange(version: Version): Boolean = true
+    final override def isScala3: Boolean = false
 
   case object Scala2_13 extends Scala2(
     prefix = Version("2.13"),
diff --git a/src/main/scala/org/podval/tools/build/TestFramework.scala b/src/main/scala/org/podval/tools/build/TestFramework.scala
@@ -17,14 +17,14 @@ abstract class TestFramework(
 ) derives CanEqual:
   final override def toString: String = name
 
-  // Note: `scalaVersion` is needed only to accommodate AirSpec.
-  def isBackendSupported(backend: Backend, scalaVersion: ScalaVersion): Boolean = isBackendSupported(backend)
-
   def isBackendSupported(backend: Backend): Boolean = true
 
+  // Note: `scalaVersion` is needed only to accommodate AirSpec.
+  def isBackendSupported(backend: Backend, isScala3: Boolean): Boolean = isBackendSupported(backend)
+  
   // Note: `scalaLibrary` parameter is needed only to accommodate specs2 -
   // so if the need goes away, this can be simplified ;)
-  def versionDefault(scalaLibrary: ScalaLibrary): Option[Version] = None
+  def versionDefault(isScala3: Boolean): Option[Version] = None
 
   // Note: `isJvm` parameter is needed only to accommodate MUnit,
   // which as of v1.2.4 throws an exception if a JVM-specific parameter is supplied on Scala.js or Scala Native.
@@ -42,7 +42,7 @@ abstract class TestFramework(
       .withVersion(
         scalaLibrary,
         version
-          .orElse(versionDefault(scalaLibrary))
+          .orElse(versionDefault(scalaLibrary.scalaVersion.binaryVersion.isScala3))
           .getOrElse(dependencyForBackend.versionDefault)
       )
 
diff --git a/src/main/scala/org/podval/tools/test/framework/AirSpec.scala b/src/main/scala/org/podval/tools/test/framework/AirSpec.scala
@@ -1,20 +1,18 @@
 package org.podval.tools.test.framework
 
-import org.podval.tools.build.{Backend, ScalaBinaryVersion, ScalaTestFramework, ScalaVersion, Version}
+import org.podval.tools.build.{Backend, ScalaTestFramework, Version}
 import org.podval.tools.scalanative.ScalaNativeBackend
 
 object AirSpec extends ScalaTestFramework(
   name = "AirSpec",
   nameSbt = "airspec",
   group = "org.wvlet.airframe",
   artifact = "airspec",
-  versionDefault = Version("2026.1.5"),
+  versionDefault = Version("2026.1.6"),
   className = "wvlet.airspec.Framework",
   sharedPackages = List("wvlet.airspec")
 ):
   // Note: Scala Native is supported only on Scala 3
-  override def isBackendSupported(backend: Backend, scalaVersion: ScalaVersion): Boolean = backend match
-    case ScalaNativeBackend => scalaVersion.binaryVersion match
-      case _: ScalaBinaryVersion.Scala3 => true
-      case _ => false
+  override def isBackendSupported(backend: Backend, isScala3: Boolean): Boolean = backend match
+    case ScalaNativeBackend => isScala3
     case _ => true
diff --git a/src/main/scala/org/podval/tools/test/framework/Specs2.scala b/src/main/scala/org/podval/tools/test/framework/Specs2.scala
@@ -1,6 +1,6 @@
 package org.podval.tools.test.framework
 
-import org.podval.tools.build.{Backend, ScalaBinaryVersion, ScalaLibrary, ScalaTestFramework, TagOptions, Version}
+import org.podval.tools.build.{ScalaTestFramework, TagOptions, Version}
 
 // http://etorreborre.github.io/specs2/
 // https://github.com/etorreborre/specs2
@@ -51,10 +51,5 @@ object Specs2 extends ScalaTestFramework(
   // Latest version that supports Scala 2; v5 doesn't support it...
   val versionDefaultScala2: Version = Version("4.23.0")
 
-  override def versionDefault(scalaLibrary: ScalaLibrary): Option[Version] =
-    val isScala2: Boolean = scalaLibrary.scalaVersion.binaryVersion match
-      case _: ScalaBinaryVersion.Scala2 => true
-      case _ => false
-    if isScala2
-    then Some(versionDefaultScala2)
-    else None
+  override def versionDefault(isScala3: Boolean): Option[Version] =
+    if isScala3 then None else Some(versionDefaultScala2)
diff --git a/src/main/scala/org/podval/tools/test/framework/ZioTest.scala b/src/main/scala/org/podval/tools/test/framework/ZioTest.scala
@@ -56,7 +56,7 @@ object ZioTest extends ScalaTestFramework(
   nameSbt = s"${io.AnsiColor.UNDERLINED}ZIO Test${io.AnsiColor.RESET}",
   group = "dev.zio",
   artifact = "zio-test-sbt",
-  versionDefault = Version("2.1.25"),
+  versionDefault = Version("2.1.26"),
   className = "zio.test.sbt.ZTestFramework",
   sharedPackages = List("zio.test.sbt"),
   tagOptions = TagOptions.OptionPerValue("-tags", "-ignore-tags"),
diff --git a/src/test/scala/org/podval/tools/test/testproject/GroupingFunSpec.scala b/src/test/scala/org/podval/tools/test/testproject/GroupingFunSpec.scala
@@ -109,7 +109,7 @@ abstract class GroupingFunSpec extends AnyFunSpec:
     backend: Backend,
     scalaVersion: ScalaVersion
   ): Seq[Fixture] = fixtures
-    .filter(_.framework.isBackendSupported(backend, scalaVersion))
+    .filter(_.framework.isBackendSupported(backend, scalaVersion.binaryVersion.isScala3))
 
   private def forBackends(
     projectName: Seq[String],

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ object VersionsWriter:`
`27`	`27`	`versions.map((name, version) => s":version-$name: $version")`
`28`	`28`	`)`
`29`	`29`
`30`		`- private val gradleVersion: Version = Version("9.5.0-rc-2")`
`31`		`- private val pluginVersion: Version = Version("1.0.1")`
	`30`	`+ private val gradleVersion: Version = Version("9.5.0")`
	`31`	`+ private val pluginVersion: Version = Version("1.0.2")`
`32`	`32`
`33`	`33`	`private def attributes: Seq[(String, String)] = Seq(`
`34`	`34`	`"gradleVersionForBadge" -> gradleVersion.toString.replace("-", "--"),`