Skip to content

Commit a434b89

Browse files
authored
Update spotlight version (#121)
1 parent 7898521 commit a434b89

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

gradle-plugin/src/main/kotlin/xyz/block/artifactswap/ArtifactSwapModuleSelectionValueSource.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
package xyz.block.artifactswap
44

5+
import com.fueledbycaffeine.spotlight.buildscript.GradlePath
56
import com.fueledbycaffeine.spotlight.buildscript.SpotlightProjectList
67
import com.fueledbycaffeine.spotlight.buildscript.SpotlightRulesList
7-
import com.fueledbycaffeine.spotlight.buildscript.graph.StrictModeTypeSafeProjectAccessorRule
8+
import com.fueledbycaffeine.spotlight.buildscript.graph.TypeSafeProjectAccessorRule
89
import java.io.Serializable
910
import org.gradle.api.file.DirectoryProperty
1011
import org.gradle.api.logging.Logging
@@ -54,7 +55,8 @@ internal abstract class ArtifactSwapModuleSelectionValueSource :
5455
val config = parameters.config.get()
5556

5657
// Read project lists
57-
val ideProjectsList = SpotlightProjectList.ideProjects(rootDir).read()
58+
val allProjectsList = SpotlightProjectList.allProjects(rootDir).read()
59+
val ideProjectsList = SpotlightProjectList.ideProjects(rootDir) { allProjectsList }.read()
5860
val requestedProjects =
5961
ideProjectsList.ifEmpty {
6062
// If empty, load all projects
@@ -71,7 +73,9 @@ internal abstract class ArtifactSwapModuleSelectionValueSource :
7173

7274
// Read spotlight rules
7375
val spotlightRules = SpotlightRulesList(rootDir).read()
74-
val typeSafeAccessorRule = StrictModeTypeSafeProjectAccessorRule(rootProjectName)
76+
val rootProjectAccessor = GradlePath(rootDir, rootProjectName).typeSafeAccessorName
77+
val typeSafeAccessorMap = allProjectsList.associateBy { it.typeSafeAccessorName }
78+
val typeSafeAccessorRule = TypeSafeProjectAccessorRule(rootProjectAccessor, typeSafeAccessorMap)
7579
val allRules = spotlightRules.implicitRules + typeSafeAccessorRule
7680

7781
val selector = ArtifactSwapModuleSelectorFactory.create(rootDir, config, allRules)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ picocli = "4.7.7"
2323
okhttp = "5.3.2"
2424
okio = "3.16.4"
2525
retrofit = "3.0.0"
26-
spotlight = "1.4.1"
26+
spotlight = "1.5.1"
2727
wire = "5.4.0"
2828
ktfmt = "0.59"
2929
ktfmt-gradle = "0.25.0"

0 commit comments

Comments
 (0)