Skip to content

Commit 9fbd2e0

Browse files
GRAILS-6422 - change to dependency management dsl syntax. Instead of "defaultDependenciesProvided = true", now use "defaultDependenciesProvided true"
1 parent 6515bcc commit 9fbd2e0

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,11 @@ class IvyDomainSpecificLanguageEvaluator {
688688
}
689689
}
690690

691+
692+
void defaultDependenciesProvided(boolean b) {
693+
delegate.defaultDependenciesProvided = b
694+
}
695+
691696
void inherits(String name, Closure configurer) {
692697
// plugins can't configure inheritance
693698
if(plugin) return

src/test/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,16 +415,35 @@ public class IvyDependencyManagerTests extends GroovyTestCase{
415415
}
416416

417417
void testDefaultDependencyDefinitionWithDefaultDependenciesProvided() {
418-
Message.setDefaultLogger new DefaultMessageLogger(Message.MSG_INFO)
419-
def manager = new IvyDependencyManager("test", "0.1")
420-
def grailsVersion = getCurrentGrailsVersion()
421-
manager.defaultDependenciesProvided = true
422-
manager.parseDependencies(IvyDependencyManager.getDefaultDependencies(grailsVersion))
418+
419+
def settings = new BuildSettings()
420+
def grailsVersion = getCurrentGrailsVersion()
423421

422+
def manager = new IvyDependencyManager("project", "0.1",settings)
423+
def defaultDependencyClosure = IvyDependencyManager.getDefaultDependencies(grailsVersion)
424+
manager.parseDependencies {
425+
defaultDependenciesProvided true
426+
defaultDependencyClosure.delegate = delegate
427+
defaultDependencyClosure()
428+
}
429+
424430
assertEquals 0, manager.listDependencies('runtime').size()
425431
assertEquals 3, manager.listDependencies('test').size()
426432
assertEquals 18, manager.listDependencies('build').size()
427433
assertEquals 55, manager.listDependencies('provided').size()
434+
435+
manager = new IvyDependencyManager("project", "0.1",settings)
436+
defaultDependencyClosure = IvyDependencyManager.getDefaultDependencies(grailsVersion)
437+
manager.parseDependencies {
438+
defaultDependenciesProvided false
439+
defaultDependencyClosure.delegate = delegate
440+
defaultDependencyClosure()
441+
}
442+
443+
assertEquals 53, manager.listDependencies('runtime').size()
444+
assertEquals 56, manager.listDependencies('test').size()
445+
assertEquals 18, manager.listDependencies('build').size()
446+
assertEquals 2, manager.listDependencies('provided').size()
428447
}
429448

430449
def getCurrentGrailsVersion() {

0 commit comments

Comments
 (0)