Skip to content

Commit 3bd608a

Browse files
authored
Merge pull request #15179 from codeconsole/7.0.x-buildSettingsFix-forked-solution-3
use stripped PROJECT_TARGET_DIR for setting TARGET_DIR
2 parents 9dad14e + 12fd7e6 commit 3bd608a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

grails-gradle/model/src/main/groovy/grails/util/BuildSettings.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class BuildSettings {
253253
}
254254
BASE_DIR = System.getProperty(APP_BASE_DIR) ? new File(System.getProperty(APP_BASE_DIR)) : (IOUtils.findApplicationDirectoryFile() ?: new File('.'))
255255
GRAILS_APP_DIR_PRESENT = new File(BASE_DIR, 'grails-app').exists() || new File(BASE_DIR, 'Application.groovy').exists()
256-
TARGET_DIR = System.getProperty(PROJECT_TARGET_DIR) ? new File(BASE_DIR, System.getProperty(PROJECT_TARGET_DIR)) : new File(BASE_DIR, 'build')
256+
TARGET_DIR = new File(BASE_DIR, System.getProperty('project.target.dir') ?: 'build')
257257
RESOURCES_DIR = !GRAILS_APP_DIR_PRESENT ? null : (System.getProperty(PROJECT_RESOURCES_DIR) ? new File(System.getProperty(PROJECT_RESOURCES_DIR)) : new File(TARGET_DIR, 'resources/main'))
258258
}
259259
}

0 commit comments

Comments
 (0)