@@ -63,12 +63,17 @@ object DangerFileScriptDefinition : ScriptCompilationConfiguration(
63
63
)
64
64
65
65
class DangerFileKtsConfigurator : RefineScriptCompilationConfigurationHandler {
66
-
67
- private val resolver = CompoundDependenciesResolver (
68
- FileSystemDependenciesResolver (DANGER_LIBS_FLAT_DIR ),
69
- FileSystemDependenciesResolver (),
66
+ private val externalDependenciesResolvers = setOf (
70
67
MavenDependenciesResolver ()
71
68
)
69
+ private val resolvers = DANGER_DEFAULT_FLAT_DIRS
70
+ .map { File (it) }
71
+ .filter { it.exists() }
72
+ .map { FileSystemDependenciesResolver (it) } +
73
+ FileSystemDependenciesResolver () +
74
+ externalDependenciesResolvers
75
+
76
+ private val resolver = CompoundDependenciesResolver (resolvers)
72
77
73
78
override operator fun invoke (context : ScriptConfigurationRefinementContext ): ResultWithDiagnostics <ScriptCompilationConfiguration > =
74
79
processAnnotations(context)
@@ -136,7 +141,13 @@ class DangerFileKtsConfigurator : RefineScriptCompilationConfigurationHandler {
136
141
}
137
142
138
143
private companion object {
139
- const val DANGER_DEFAULT_FLAT_DIR = " /usr/local/lib/danger/libs"
140
- private val DANGER_LIBS_FLAT_DIR = File (DANGER_DEFAULT_FLAT_DIR )
144
+ val DANGER_DEFAULT_FLAT_DIRS = setOf (
145
+ " /usr/local" , // x86 location
146
+ " /opt/local" , // Arm
147
+ " /opt/homebrew" , // Homebrew Arm
148
+ " /usr" , // Fallback
149
+ ).map {
150
+ " $it /lib/danger/libs"
151
+ }
141
152
}
142
- }
153
+ }
0 commit comments