diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt index f131cf7f6..7e8f1fea5 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt @@ -23,6 +23,7 @@ import org.gradle.api.provider.Provider import org.gradle.api.provider.SetProperty import org.gradle.api.tasks.SourceSetContainer import org.gradle.jvm.toolchain.JavaToolchainService +import org.gradle.util.GradleVersion @Suppress("NOTHING_TO_INLINE") internal inline fun gradleError(message: String, cause: Throwable? = null): Nothing = @@ -68,6 +69,14 @@ internal fun Project.addBuildScanCustomValues() { } } +/** TODO: this could be removed after bumping the min Gradle requirement to 9.9 or above. */ +internal fun Project.absentProviderCompat(): Provider = + if (GradleVersion.current() >= GradleVersion.version("9.9")) { + providers.absent() + } else { + provider { null } + } + internal fun FileTreeElement.inputStream(): InputStream = try { // Open is more performant than getFile, it doesn't extract the zip files. diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt index 7f36db284..b1708d731 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt @@ -7,6 +7,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowDsl import com.github.jengelman.gradle.plugins.shadow.internal.DefaultDependencyFilter import com.github.jengelman.gradle.plugins.shadow.internal.DefaultInheritManifest import com.github.jengelman.gradle.plugins.shadow.internal.DefaultMinimizeSpec +import com.github.jengelman.gradle.plugins.shadow.internal.absentProviderCompat import com.github.jengelman.gradle.plugins.shadow.internal.classPathAttributeKey import com.github.jengelman.gradle.plugins.shadow.internal.createZipOutputStream import com.github.jengelman.gradle.plugins.shadow.internal.fileCollection @@ -275,8 +276,7 @@ public abstract class ShadowJar : Jar() { } else { // Leave it absent so it isn't registered as a task output when sources JAR generation // is disabled, keeping `outputs.files` to the shadowed JAR only. - // TODO: replace with `providers.absent()` once the min Gradle version is 9.9. - objectFactory.fileProperty() + project.absentProviderCompat() } } }