0.9.11

- feat: include Scala-version-specific resources, not just Scala sources;
- feat: inclusion of Scala-version-specific Scala sources and resources is idempotent and permanent now;
- feat: include Scala-version-specific Scala sources and resources in the mixed project too;
- cleanup;

Author: dubinsky

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.11] - 2025-09-11
+- feat: include Scala-version-specific resources, not just Scala sources;
+- feat: inclusion of Scala-version-specific Scala sources and resources is idempotent and permanent now;
+- feat: include Scala-version-specific Scala sources and resources in the mixed project too;
+- cleanup;
+
 ## [0.9.10] - 2025-09-10
 - feat: fully shared code in the mixed project root;
 - chore: Scala 3.7.3;

README.adoc

@@ -4,7 +4,7 @@
 :toc: preamble
 :icons: font
 // INCLUDED ATTRIBUTES
-:version-plugin: 0.9.10
+:version-plugin: 0.9.11
 :version-gradle: 9.1.0-rc-3
 :version-scala: 3.7.3
 :version-scala-213: 2.13.16
@@ -78,8 +78,8 @@ Plugin:
 - for `Scala.js`, retrieves and installs the configured version of https://nodejs.org/[Node.js];
 - for `Scala.js`, installs the configured `Node.js` modules using `npm`;
 - augments the `test` task to work with sbt-enabled test frameworks;
-- includes sources shared between backends;
-- includes sources for specific Scala version;
+- includes sources and resources shared between backends;
+- includes sources and resources for specific Scala version;
 - configures project artifacts to include shared code when needed;
 - configures names of the project artifact in accordance with the accepted conventions;
 - exposes, via `scalaBackend` extension,
@@ -194,14 +194,23 @@ for Scala version `x.y.z`, additional Scala source roots are:
 
 - `scala-x.y.z`;
 - `scala-x.y`;
-- `scala-x`;
+- `scala-x`;.
 
-Additional sources are included both in Scala compilation and archives that package Scala sources.
+Similarly, alongside the usual resource root `resources`,
+as in `src/main/resources` and `src/test/resources`,
+plugin includes resources from resource roots specific to the Scala version in use;
+for Scala version `x.y.z`, additional resource roots are:
+
+- `resources-x.y.z`;
+- `resources-x.y`;
+- `resources-x`.
+
+Additional Scala sources and resources are included both in Scala compilation and archives that package Scala sources.
 
 This applies to Scala sources shared between the backends too.
 
-Since only sources appropriate to the Scala version in use are added,
-to work on the version-specific sources in the IDE,
+Since only sources and resources appropriate to the Scala version in use are added,
+to work on the version-specific sources and resources in the IDE,
 you need to set the Gradle property that selects the Scala version
 and re-load the project in the IDE.
 

build.gradle

@@ -2,7 +2,7 @@ plugins {
   id 'com.github.ben-manes.versions' version '0.52.0'
   id 'scala'
   id 'signing'
-  id 'org.podval.tools.scalajs' version '0.9.9'
+  id 'org.podval.tools.scalajs' version '0.9.10'
   id 'com.gradle.plugin-publish' version '2.0.0'
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 org.podval.tools.backend = JVM
-version_plugin = 0.9.10
+version_plugin = 0.9.11
 version_gradle = 9.1.0-rc-3
 version_scala = 3.7.3
 version_scala_213 = 2.13.16

src/main/scala/org/podval/tools/backend/BackendExtension.scala

@@ -2,8 +2,7 @@ package org.podval.tools.backend
 
 import groovy.lang.Closure
 import org.gradle.api.Project
-import org.podval.tools.build.{ScalaBackend, ScalaDependency, ScalaLibrary, ScalaVersion, Version}
-import org.podval.tools.gradle.ScalaExtension
+import org.podval.tools.build.{ScalaBackend, ScalaDependency, ScalaLibrary, Version}
 import org.podval.tools.nonjvm.NonJvmBackend
 import org.podval.tools.test.framework.Framework
 import javax.inject.Inject
@@ -32,15 +31,7 @@ abstract class BackendExtension @Inject(
 
   final lazy val getScalaLibrary: ScalaLibrary =
     val result: ScalaLibrary = ScalaLibrary.fromImplementationConfiguration(project)
-
-    val scalaVersion: ScalaVersion = ScalaExtension
-      .findScalaVersion(project)
-      .getOrElse(error(
-        s"""Scala version data is not supported when Scala version is inferred from the Scala library dependency;
-           |set Scala version on the Scala plugin's extension instead: `scala.scalaVersion=...`""".stripMargin
-      ))
-
-    require(result.scalaVersion == scalaVersion)
+    require(result.scalaVersion == getScalaVersionFromScalaExtension)
     result
 
   def getPluginScalaBinaryVersion: Version = getPluginScalaLibrary.scalaVersion.binaryVersionSuffix

src/main/scala/org/podval/tools/backend/BackendProject.scala

@@ -1,6 +1,9 @@
 package org.podval.tools.backend
 
 import org.gradle.api.Project
+import org.podval.tools.gradle.Sources
 
 abstract class BackendProject(project: Project) extends Logging(project):
   def apply(): Unit
+
+  final def addVersionSpecificSources(): Unit = Sources.addVersionSpecific(project, getScalaVersionFromScalaExtension)

src/main/scala/org/podval/tools/backend/Logging.scala

@@ -1,6 +1,8 @@
 package org.podval.tools.backend
 
 import org.gradle.api.{GradleException, Project}
+import org.podval.tools.build.ScalaVersion
+import org.podval.tools.gradle.ScalaExtension
 import org.podval.tools.platform.IntelliJIdea
 
 abstract class Logging(project: Project) extends WithProject(project):
@@ -15,3 +17,10 @@ abstract class Logging(project: Project) extends WithProject(project):
 
   private def pluginMessage(message: String): String =
     s"Plugin 'org.podval.tools.scalajs' in $project: $message."
+
+  final protected def getScalaVersionFromScalaExtension: ScalaVersion = ScalaExtension
+    .findScalaVersion(project)
+    .getOrElse(error(
+      s"""Scala version data is not supported when Scala version is inferred from the Scala library dependency;
+         |set Scala version on the Scala plugin's extension instead: `scala.scalaVersion=...`""".stripMargin
+    ))

src/main/scala/org/podval/tools/backend/MixedProject.scala

@@ -77,9 +77,14 @@ final class MixedProject private(project: Project, backends: Set[ScalaBackend])
   override def apply(): Unit =
     announce(s"using Scala backends ${ScalaBackend.names(pojectsWithBackend.map(_.backend))}")
 
+    // Disable tasks.
+    Set(
+      classOf[SourceTask],
+      classOf[AbstractArchiveTask]
+    )
+      .foreach(Tasks.disable(project, _))
+
     // Apply plugin to subprojects.
     (pojectsWithBackend ++ sharedProjects).foreach(_.project.getPluginManager.apply(classOf[BackendPlugin]))
 
-    // Disable tasks.
-    Tasks.disable(project, classOf[SourceTask])
-    Tasks.disable(project, classOf[AbstractArchiveTask])
+    project.afterEvaluate((_: Project) => addVersionSpecificSources())

src/main/scala/org/podval/tools/backend/SharedProject.scala

@@ -2,7 +2,7 @@ package org.podval.tools.backend
 
 import org.gradle.api.{Project, Task}
 import org.podval.tools.build.ScalaBackend
-import org.podval.tools.gradle.Tasks
+import org.podval.tools.gradle.{Projects, Tasks}
 
 final class SharedProject(
   project: Project,
@@ -13,7 +13,11 @@ final class SharedProject(
   override def apply(): Unit =
     announce(s"code shared between backends ${ScalaBackend.names(backends)}")
 
-    setScalaVersionFromParentAndAddVersionSpecificSources()
-
     // Disable all tasks.
     Tasks.disable(project, classOf[Task])
+
+    // Set Scala version from parent.
+    setScalaVersionFromParent(Projects.parent(project).get)
+
+    // Add version-specific sources.
+    project.afterEvaluate((_: Project) => addVersionSpecificSources())

src/main/scala/org/podval/tools/backend/SingleBackendProject.scala

@@ -3,7 +3,7 @@ package org.podval.tools.backend
 import org.gradle.api.Project
 import org.gradle.api.plugins.jvm.internal.JvmPluginServices
 import org.podval.tools.build.ScalaBackend
-import org.podval.tools.gradle.Sources
+import org.podval.tools.gradle.{Projects, Sources}
 import org.podval.tools.platform.IntelliJIdea
 
 final class SingleBackendProject(
@@ -26,14 +26,17 @@ final class SingleBackendProject(
       isRunningInIntelliJ
     )
 
-    setScalaVersionFromParentAndAddVersionSpecificSources()
+    // Set Scala version from parent.
+    Projects.parent(project).foreach(setScalaVersionFromParent)
+    
     backend.apply(project, jvmPluginServices, isRunningInIntelliJ)
     backend.registerTasks(project)
 
     project.afterEvaluate: (_: Project) =>
+      addVersionSpecificSources()
       sharedProjects.map(_.project).foreach(Sources.addShared(_, project, isRunningInIntelliJ))
       backend.afterEvaluate(
         project,
         projectScalaLibrary = extension.getScalaLibrary,
-        pluginScalaLibrary = extension.getPluginScalaLibrary
+        pluginScalaLibrary  = extension.getPluginScalaLibrary
       )