Skip to content

Commit 4fe8964

Browse files
committed
No longer call Configuration.setVisible(false) in Gradle 9+
This flag is a no-op since Gradle 9 and is now deprecated.
1 parent 60c5b1a commit 4fe8964

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.gradle.nativeplatform.MachineArchitecture;
4848
import org.gradle.nativeplatform.OperatingSystemFamily;
4949
import org.gradle.testing.base.TestSuite;
50+
import org.gradle.util.GradleVersion;
5051
import org.gradlex.javamodule.packaging.internal.HostIdentification;
5152
import org.gradlex.javamodule.packaging.model.Target;
5253
import org.gradlex.javamodule.packaging.tasks.Jpackage;
@@ -64,6 +65,7 @@
6465
import static org.gradle.nativeplatform.OperatingSystemFamily.WINDOWS;
6566

6667
abstract public class JavaModulePackagingExtension {
68+
private static final boolean MIN_GRADLE_9_0 = GradleVersion.current().compareTo(GradleVersion.version("9.0.0")) >= 0;
6769
private static final Attribute<Boolean> JAVA_MODULE_ATTRIBUTE = Attribute.of("javaModule", Boolean.class);
6870
private static final String INTERNAL = "internal";
6971
private static final String JPACKAGE = "jpackage";
@@ -190,7 +192,7 @@ private void newTarget(Target target) {
190192
Configuration internal = maybeCreateInternalConfiguration();
191193
configurations.create(target.getName() + capitalize(sourceSet.getCompileClasspathConfigurationName()), c -> {
192194
c.setCanBeConsumed(false);
193-
c.setVisible(false);
195+
setInvisible(c);
194196
configureJavaStandardAttributes(c, Usage.JAVA_API);
195197
configureTargetAttributes(c, target);
196198
c.extendsFrom(
@@ -201,7 +203,7 @@ private void newTarget(Target target) {
201203
});
202204
Configuration runtimeClasspath = configurations.create(target.getName() + capitalize(sourceSet.getRuntimeClasspathConfigurationName()), c -> {
203205
c.setCanBeConsumed(false);
204-
c.setVisible(false);
206+
setInvisible(c);
205207
configureJavaStandardAttributes(c, Usage.JAVA_RUNTIME);
206208
configureTargetAttributes(c, target);
207209
c.extendsFrom(
@@ -311,4 +313,11 @@ private Configuration maybeCreateInternalConfiguration() {
311313
private String capitalize(String s) {
312314
return s.substring(0, 1).toUpperCase() + s.substring(1);
313315
}
316+
317+
@SuppressWarnings("deprecation")
318+
private void setInvisible(Configuration c) {
319+
if (!MIN_GRADLE_9_0) {
320+
c.setVisible(false);
321+
}
322+
}
314323
}

0 commit comments

Comments
 (0)