gradle/actions
1
0
Fork 0
mirror of https://github.com/gradle/actions.git synced 2025-04-23 03:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set both old and new external application marker properties

Browse Source
This commit is contained in:
Pavlo Shevchenko 2024-03-20 14:19:43 +01:00 committed by daz
parent 5ebc5d3853
commit e36e909388
No known key found for this signature in database
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/src/resources/init-scripts/gradle-actions.inject-develocity.init.gradle
View File

@ -301,8 +301,11 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {
void applyPluginExternally(def pluginManager, String pluginClassName) { void applyPluginExternally(def pluginManager, String pluginClassName) {
def externallyApplied = 'develocity.externally-applied' def externallyApplied = 'develocity.externally-applied'
def externallyAppliedDeprecated = 'gradle.enterprise.externally-applied'
def oldValue = System.getProperty(externallyApplied) def oldValue = System.getProperty(externallyApplied)
def oldValueDeprecated = System.getProperty(externallyAppliedDeprecated)
System.setProperty(externallyApplied, 'true') System.setProperty(externallyApplied, 'true')
System.setProperty(externallyAppliedDeprecated, 'true')
try { try {
pluginManager.apply(initscript.classLoader.loadClass(pluginClassName)) pluginManager.apply(initscript.classLoader.loadClass(pluginClassName))
} finally { } finally {
@ -311,6 +314,11 @@ void applyPluginExternally(def pluginManager, String pluginClassName) {
} else { } else {
System.setProperty(externallyApplied, oldValue) System.setProperty(externallyApplied, oldValue)
} }
if (oldValueDeprecated == null) {
System.clearProperty(externallyAppliedDeprecated)
} else {
System.setProperty(externallyAppliedDeprecated, oldValueDeprecated)
}
} }
} }