Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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 <T : Any> Project.absentProviderCompat(): Provider<T> =
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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
}
}
}
Expand Down
Loading