Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecation when running on Gradle 8.8 #919

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.distribution.Distribution
import org.gradle.api.distribution.DistributionContainer
import org.gradle.api.file.CopyProcessingSpec
import org.gradle.api.file.CopySpec
import org.gradle.api.plugins.ApplicationPlugin
import org.gradle.api.plugins.JavaApplication
Expand All @@ -17,6 +18,7 @@ import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.application.CreateStartScripts
import org.gradle.jvm.toolchain.JavaLauncher
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.util.GradleVersion

class ShadowApplicationPlugin implements Plugin<Project> {

Expand Down Expand Up @@ -126,7 +128,9 @@ class ShadowApplicationPlugin implements Plugin<Project> {
}
into("bin") {
from(startScripts)
fileMode = 493
filePermissions {
it.unix(493)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class ShadowBasePlugin implements Plugin<Project> {

@Override
void apply(Project project) {
if (GradleVersion.current() < GradleVersion.version("8.0")) {
throw new GradleException("This version of Shadow supports Gradle 8.0+ only. Please upgrade.")
if (GradleVersion.current() < GradleVersion.version("8.3")) {
throw new GradleException("This version of Shadow supports Gradle 8.3+ only. Please upgrade.")
}
project.extensions.create(EXTENSION_NAME, ShadowExtension, project)
createShadowConfiguration(project)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.gradle.api.Action
import org.gradle.api.GradleException
import org.gradle.api.UncheckedIOException
import org.gradle.api.file.FileCopyDetails
import org.gradle.api.file.FilePermissions
import org.gradle.api.file.FileTreeElement
import org.gradle.api.file.RelativePath
import org.gradle.api.internal.DocumentationRegistry
Expand Down Expand Up @@ -510,6 +511,11 @@ class ShadowCopyAction implements CopyAction {
return false
}

@Override
FilePermissions getPermissions() {
return null
}

@Override
String getName() {
return archivePath.pathString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ApplicationSpec extends PluginSpecification {
buildFile << """
apply plugin: 'application'

mainClassName = 'myapp.Main'
application.mainClass = 'myapp.Main'

dependencies {
implementation 'shadow:a:1.0'
Expand Down Expand Up @@ -90,7 +90,7 @@ class ApplicationSpec extends PluginSpecification {
buildFile << """
apply plugin: 'application'

mainClassName = 'myapp.Main'
application.mainClass = 'myapp.Main'

dependencies {
implementation 'shadow:a:1.0'
Expand Down Expand Up @@ -169,7 +169,7 @@ class ApplicationSpec extends PluginSpecification {
buildFile << """
apply plugin: 'application'

mainClassName = 'myapp.Main'
application.mainClass = 'myapp.Main'

dependencies {
shadow 'shadow:a:1.0'
Expand Down Expand Up @@ -219,7 +219,7 @@ class ApplicationSpec extends PluginSpecification {
buildFile << """
apply plugin: 'application'

mainClassName = 'myapp.Main'
application.mainClass = 'myapp.Main'

dependencies {
implementation 'shadow:a:1.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ConfigurationCacheSpec extends PluginSpecification {
buildFile << """
apply plugin: 'application'

mainClassName = 'myapp.Main'
application.mainClass = 'myapp.Main'

dependencies {
implementation 'shadow:a:1.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class ShadowPluginSpec extends PluginSpecification {
assert output.exists()

where:
version << ['8.0']
version << ['8.3']
}

def 'Error in Gradle versions < 8.0'() {
Expand Down