build: Remove unneeded JPMS options

Signed-off-by: BJ Hargrave <bj@hargrave.dev>
bndtools · Jul 12, 2022 · 8069153 · 8069153
1 parent 8b8868c
commit 8069153
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 30 deletions.
diff --git a/gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts b/gradle-plugins/biz.aQute.bnd.gradle/build.gradle.kts
@@ -181,14 +181,6 @@ publishing {
 	}
 }
 
-// Handle JPMS options
-val jpmsOptions: List<String>? by rootProject.extra
-jpmsOptions?.let {
-	tasks.withType<GroovyCompile>().configureEach {
-		groovyOptions.fork(mapOf("jvmArgs" to it))
-	}
-}
-
 // Disable gradle module metadata
 tasks.withType<GenerateModuleMetadata>().configureEach {
 	enabled = false

diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
@@ -1,25 +1,3 @@
-if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_1_9)) {
-	val jpmsOptions by extra(listOf(
-		"--add-opens=java.base/java.lang=ALL-UNNAMED",
-		"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
-		"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
-		"--add-opens=java.base/java.io=ALL-UNNAMED",
-		"--add-opens=java.base/java.net=ALL-UNNAMED",
-		"--add-opens=java.base/java.nio=ALL-UNNAMED",
-		"--add-opens=java.base/java.util=ALL-UNNAMED",
-		"--add-opens=java.base/java.util.jar=ALL-UNNAMED",
-		"--add-opens=java.base/java.util.regex=ALL-UNNAMED",
-		"--add-opens=java.base/java.util.zip=ALL-UNNAMED",
-		"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
-		"--add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED",
-		"--add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED",
-		"--add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED",
-		"--add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED",
-		"--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED",
-		"--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED"
-	))
-}
-
 val localrepo: String? = System.getProperty("maven.repo.local")
 localrepo?.let {
 	var rootGradle: Gradle = gradle