Skip to content

Commit 9607b5a

Browse files
committed
Rename dist and spec
1 parent cb6ed4c commit 9607b5a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,27 +96,27 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
9696
}
9797

9898
protected open fun Project.configureDistribution() {
99-
distributions.register(DISTRIBUTION_NAME) {
100-
it.distributionBaseName.convention(
99+
distributions.register(DISTRIBUTION_NAME) { dist ->
100+
dist.distributionBaseName.convention(
101101
provider {
102102
// distributionBaseName defaults to `$project.name-$distribution.name`, applicationName defaults to project.name
103103
// so we append the suffix to match the default distributionBaseName. Modified from `ApplicationPlugin.configureDistribution()`.
104104
"${applicationExtension.applicationName}-$DISTRIBUTION_NAME"
105105
},
106106
)
107-
it.contents { shadowDist ->
108-
shadowDist.from(file("src/dist"))
109-
shadowDist.into("lib") { lib ->
107+
dist.contents { distSpec ->
108+
distSpec.from(file("src/dist"))
109+
distSpec.into("lib") { lib ->
110110
lib.from(tasks.shadowJar)
111111
// Reflects the value of the `Class-Path` attribute in the JAR manifest.
112112
lib.from(configurations.shadow)
113113
}
114114
// Defaults to bin dir.
115-
shadowDist.into(provider(applicationExtension::getExecutableDir)) { bin ->
115+
distSpec.into(provider(applicationExtension::getExecutableDir)) { bin ->
116116
bin.from(tasks.startShadowScripts)
117117
bin.filePermissions { permissions -> permissions.unix(UNIX_SCRIPT_PERMISSIONS) }
118118
}
119-
shadowDist.with(applicationExtension.applicationDistribution)
119+
distSpec.with(applicationExtension.applicationDistribution)
120120
}
121121
}
122122
}

0 commit comments

Comments
 (0)