Merge branch 'main' into z/projectValidationFixes

slackhq · Oct 30, 2024 · a8bf682 · a8bf682
2 parents b5d93f3 + daa8ac3
commit a8bf682
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Changelog
 - [gradle] Cache global `FoundryProperties` instance for subproject use.
 - [gradle] Add `composeRuntimeOnly()` DSL feature.
 - [cli] Check for non-existent paths before traversing in `Path.walkEachFile()`.
+- [gradle] Don't depend on build sources in mod score if `MODULE_SCORE_INCLUDE_GENERATED` is false
 
 0.21.0
 ------

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 agp = "8.7.1"
-agpAlpha = "8.8.0-alpha07"
+agpAlpha = "8.8.0-alpha08"
 anvil = "2.5.0-beta11"
 # Release notes: https://asm.ow2.io/versions.html
 asm = "9.7.1"
 bugsnagGradle = "8.1.0"
 circuit = "0.25.0"
 compose-jb = "1.7.0"
-compose-jb-stable = "1.7.0"
+compose-jb-stable = "1.7.1+build1894-release-1.7.1"
 coroutines = "1.9.0"
 # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#coroutinesLibraries
 coroutines-ij = "1.9.0"

diff --git a/...dle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/dependencyrake/DependencyRake.kt b/...dle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/dependencyrake/DependencyRake.kt
@@ -83,6 +83,10 @@ constructor(objects: ObjectFactory, providers: ProviderFactory) : AbstractPostPr
   @get:InputFile
   abstract val buildFileProperty: RegularFileProperty
 
+  init {
+    @Suppress("LeakingThis") doNotTrackState("This task modifies build scripts in place.")
+  }
+
   @get:Input
   val modes: SetProperty<AnalysisMode> =
     objects

diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/stats/ModuleStats.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/stats/ModuleStats.kt
@@ -162,8 +162,10 @@ public object ModuleStatsTasks {
 
     val generatedSourcesAdded = AtomicBoolean()
     val addGeneratedSources = {
-      if (locTask != null && generatedSourcesAdded.compareAndSet(false, true)) {
-        locTask.configure {
+      val shouldConfigure =
+        locTask != null && generatedSourcesAdded.compareAndSet(false, true) && includeGenerated
+      if (shouldConfigure) {
+        locTask!!.configure {
           generatedSrcsDir.setDisallowChanges(project.layout.buildDirectory.dir("generated"))
         }
       }