Permalink
Browse files

some cleanup

  • Loading branch information...
1 parent 102fd12 commit 5f499f39e72cac4b8e1ef41e221ce8773df1ce10 @ldaley ldaley committed Feb 12, 2012
Showing with 2 additions and 17 deletions.
  1. +2 −17 src/main/groovy/org/grails/gradle/plugin/GrailsTask.groovy
@@ -52,7 +52,7 @@ class GrailsTask extends DefaultTask {
@TaskAction
def executeCommand() {
def launchArgs = [NameUtils.toScriptName(command), args ?: ""]
- if (env) launchArgs << end
+ if (env) launchArgs << env
def result = createLauncher().launch(*launchArgs)
if (result != 0) {
@@ -64,21 +64,6 @@ class GrailsTask extends DefaultTask {
grailsHome ?: (project.hasProperty('grailsHome') ? project.grailsHome : null)
}
- protected void verifyGrailsDependencies() {
- if (command == "create-app") return
-
- def runtimeDeps = project.configurations.runtime.resolvedConfiguration.resolvedArtifacts
- def grailsDep = runtimeDeps.find { it.resolvedDependency.moduleGroup == 'org.grails' && it.name.startsWith('grails-') }
- if (!grailsDep) {
- throw new RuntimeException("[GrailsPlugin] Your project does not contain any 'grails-*' dependencies in 'compile' or 'runtime'.")
- }
-
- def loggingDep = runtimeDeps.find { it.resolvedDependency.moduleGroup == 'org.slf4j' && it.name.startsWith('slf4j-') }
- if (!loggingDep) {
- throw new RuntimeException("[GrailsPlugin] Your project does not contain an SLF4J logging implementation dependency.")
- }
- }
-
protected void addToolsJarIfNecessary(Collection<URL> classpath) {
// Add the "tools.jar" to the classpath so that the Grails
// scripts can run native2ascii. First assume that "java.home"
@@ -129,7 +114,7 @@ class GrailsTask extends DefaultTask {
grailsLauncher.compileDependencies = compileClasspath.files as List
grailsLauncher.testDependencies = testClasspath.files as List
grailsLauncher.runtimeDependencies = runtimeClasspath.files as List
- grailsLauncher.projectWorkDir = project.buildDir
+ grailsLauncher.projectWorkDir = targetDir
grailsLauncher.classesDir = targetFile("classes")
grailsLauncher.testClassesDir = targetFile("test-classes")
grailsLauncher.resourcesDir = targetFile("resources")

0 comments on commit 5f499f3

Please sign in to comment.