From b3bcd82a2179f1a87ff09ed5af902380a9c5ac84 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 18 Jul 2011 17:14:22 -0400 Subject: [PATCH] better location for global settings in the precedence chain --- main/Load.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/Load.scala b/main/Load.scala index 88b310767..c5d00f055 100644 --- a/main/Load.scala +++ b/main/Load.scala @@ -172,11 +172,10 @@ object Load val ref = ProjectRef(uri, id) val defineConfig = for(c <- project.configurations) yield ( (configuration in (ref, ConfigKey(c.name))) :== c) val loader = build.unit.definitions.loader - val injected = injectSettings.project ++ injectSettings.projectLoaded(loader) val settings = (thisProject :== project) +: (thisProjectRef :== ref) +: - (injected ++ defineConfig ++ project.settings ++ pluginThisProject ++ configurations(srcs, eval, build.imports)(loader)) + (defineConfig ++ project.settings ++ injectSettings.projectLoaded(loader) ++ pluginThisProject ++ configurations(srcs, eval, build.imports)(loader) ++ injectSettings.project) // map This to thisScope, Select(p) to mapRef(uri, rootProject, p) transformSettings(projectScope(ref), uri, rootProject, settings)