-
Notifications
You must be signed in to change notification settings - Fork 950
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add minimum Java version so the grails forge cli can pull that proper…
…ty instead of defaulting based on its own version
- Loading branch information
1 parent
59a2ad9
commit b18e77c
Showing
2 changed files
with
11 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -414,6 +414,14 @@ subprojects { project -> | |
email = '[email protected]' | ||
} | ||
} | ||
|
||
// Specify the minimum supported java version so that the grails-forge cli can pull this value | ||
// out of the pom.xml instead of defaulting the version of java that the cli uses | ||
withXml { | ||
asNode().appendNode('properties').with { | ||
appendNode('maven.compiler.release', project.findProperty('minimumJavaVersion')) | ||
} | ||
} | ||
} | ||
|
||
from components.java | ||
|
@@ -441,8 +449,8 @@ subprojects { project -> | |
if (project.name == 'grails-dependencies') return | ||
if (project.name == 'grails-bom') return | ||
|
||
sourceCompatibility = "1.11" | ||
targetCompatibility = "1.11" | ||
sourceCompatibility = project.findProperty('minimumJavaVersion') | ||
targetCompatibility = project.findProperty('minimumJavaVersion') | ||
|
||
if (project.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) { | ||
dependencies { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters