Skip to content

Commit

Permalink
Reapply "Enable ./gradlew run on Windows if more dependencies are u…
Browse files Browse the repository at this point in the history
…sed (#11451)"

This reverts commit 2a04955.
  • Loading branch information
koppor committed Jul 8, 2024
1 parent b91e030 commit 0dffe52
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ plugins {

id 'me.champeau.jmh' version '0.7.2'

id 'org.javamodularity.moduleplugin' version '1.8.15'
// This is https://github.com/java9-modularity/gradle-modules-plugin/pull/282
id 'com.github.koppor.gradle-modules-plugin' version 'jitpack-SNAPSHOT'

id 'org.openjfx.javafxplugin' version '0.1.0'

Expand Down Expand Up @@ -496,6 +497,8 @@ run {
'javafx.controls/javafx.scene.control.skin' : 'org.controlsfx.controls',
'javafx.graphics/javafx.scene' : 'org.controlsfx.controls'
]

createCommandLineArgumentFile = true
}

if (project.hasProperty('component')){
Expand Down
20 changes: 20 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
pluginManagement {
resolutionStrategy {
eachPlugin {
// Hint from https://github.com/jitpack/jitpack.io/issues/1459#issuecomment-1279851731
// Updated solution at https://github.com/foodiestudio/convention-plugins?tab=readme-ov-file#convention-plugins
if (requested.id.id.startsWith("com.github.koppor")) {
// This is https://github.com/java9-modularity/gradle-modules-plugin/pull/282
useModule("com.github.koppor:gradle-modules-plugin:jitpack-SNAPSHOT")
}
}
}

repositories {
maven {
url 'https://jitpack.io'
}
gradlePluginPortal()
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
Expand Down

0 comments on commit 0dffe52

Please sign in to comment.