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.

Sign up for GitHub

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

Support Gradle 8 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Gradle 8 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion plugin/src/main/kotlin/mb/coronium/plugin/BundlePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class BundlePlugin : Plugin<Project> {
}
if (properties.outputDir != null) {
@Suppress("UnstableApiUsage")
outputDir = project.file(properties.outputDir)
destinationDirectory.set(project.file(properties.outputDir))
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions plugin/src/main/kotlin/mb/coronium/plugin/RepositoryPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,8 @@ class RepositoryPlugin @Inject constructor(
repositoryDir.deleteRecursively()
repositoryDir.mkdirs()
project.javaexec {
main = "-jar"
classpath = project.files(eclipseLauncherPath)
args = mutableListOf(
eclipseLauncherPath,
"-application", "org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher",
"-metadataRepository", "file:/$repositoryDir",
"-artifactRepository", "file:/$repositoryDir",
Expand All @@ -409,9 +408,8 @@ class RepositoryPlugin @Inject constructor(
)
}
project.javaexec {
main = "-jar"
classpath = project.files(eclipseLauncherPath)
args = mutableListOf(
eclipseLauncherPath,
"-application", "org.eclipse.equinox.p2.publisher.CategoryPublisher",
"-metadataRepository", "file:/$repositoryDir",
"-categoryDefinition", "file:/$repositoryXmlFile",
Expand Down
8 changes: 2 additions & 6 deletions plugin/src/main/kotlin/mb/coronium/task/EclipseCreateInstallation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ open class EclipseCreateInstallation : JavaExec() {


init {
main = "-jar"

baseRepositories.value(
listOf(
"https://artifacts.metaborg.org/content/groups/eclipse-2022-06/"
Expand Down Expand Up @@ -129,10 +127,8 @@ open class EclipseCreateInstallation : JavaExec() {
mavenizedExtension.finalizeOsArch()
val mavenized = project.lazilyMavenize()

args(
mavenized.equinoxLauncherPath(),
"-application", "org.eclipse.equinox.p2.director"
)
classpath = project.files(mavenized.equinoxLauncherPath())
args("-application", "org.eclipse.equinox.p2.director")
baseRepositories.finalizeValue()
baseRepositories.get().forEach { args("-repository", it) }
repositories.finalizeValue()
Expand Down
5 changes: 3 additions & 2 deletions plugin/src/main/kotlin/mb/coronium/task/EclipseRun.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ open class EclipseRun : JavaExec() {
product.convention("org.eclipse.platform.ide")

workingDir = eclipseRunConfigFile.parent.toFile()
main = "-Dosgi.configuration.cascaded=true"
}


Expand Down Expand Up @@ -67,12 +66,14 @@ open class EclipseRun : JavaExec() {
mavenizedExtension.finalizeOsArch()
val mavenized = project.lazilyMavenize()

classpath = project.files(mavenized.equinoxLauncherPath())

args(mavenizedExtension.os.get().eclipseExtraJvmArgs)
args(
"-Dosgi.configuration.cascaded=true",
"-Dosgi.sharedConfiguration.area=.",
"-Dosgi.sharedConfiguration.area.readOnly=true",
"-Dosgi.configuration.area=configuration",
"-jar", mavenized.equinoxLauncherPath(),
"-clean", // Clean the OSGi cache so that rewiring occurs, which is needed when bundles change.
"-data", "workspace",
"-consoleLog"
Expand Down
Loading