Commit a2829288 authored by Axel Howind's avatar Axel Howind

use the OpenJFX Gradle plugin

parent 321d3a08
Pipeline #108614863 passed with stages
in 10 minutes and 22 seconds
Changelog
=========
#### Version 0.6.4 (to be released)
#### Version 0.6.4
- use the OpenJFX Gradle plugin; this should remove platform dependencies
#### Version 0.6.3
- merge code for determining initial dir for saveAs() and open() and add some logging
......
......@@ -17,15 +17,16 @@ plugins {
id 'com.adarshr.test-logger' version '1.7.0' apply false
id 'com.github.spotbugs' version '2.0.0' apply false
id 'com.jfrog.bintray' version '1.8.4' apply false
id "org.openjfx.javafxplugin" version '0.0.8' apply false
}
subprojects {
ext.fast_build = project.findProperty("fast_build")!=null
ext.run_spotbugs = !fast_build
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'org.openjfx.javafxplugin'
apply plugin: 'maven-publish'
apply plugin: 'idea'
apply plugin: 'com.dua3.gradle.jpms'
......@@ -34,7 +35,7 @@ subprojects {
/////////////////////////////////////////////////////////////////////////////
group = 'com.dua3.fx'
version = '0.6.4-SNAPSHOT'
version = '0.6.4'
ext.moduleName = project.group
ext.scm = 'https://gitlab.com/com.dua3/lib/fx.git'
......@@ -73,29 +74,8 @@ subprojects {
}
}
// get OS (because JavaFX packages are OS dependent)
def currentOS = org.gradle.internal.os.OperatingSystem.current()
if (currentOS.isWindows()) {
ext.platform = 'win'
} else if (currentOS.isLinux()) {
ext.platform = 'linux'
} else if (currentOS.isMacOsX()) {
ext.platform = 'mac'
}
// dependencies
dependencies {
// com.dua3 libraries
implementation "com.dua3.utility:utility:${dua3_utility_version}"
// JavaFX
implementation "org.openjfx:javafx-base:${javafx_version}:${platform}"
implementation "org.openjfx:javafx-fxml:${javafx_version}:${platform}"
implementation "org.openjfx:javafx-graphics:${javafx_version}:${platform}"
implementation "org.openjfx:javafx-controls:${javafx_version}:${platform}"
implementation "org.openjfx:javafx-web:${javafx_version}:${platform}"
implementation "org.openjfx:javafx-media:${javafx_version}:${platform}"
// JUnit
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
......
......@@ -12,6 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics' ]
}
dependencies {
api project(':fx-util')
implementation "com.dua3.utility:utility:${dua3_utility_version}"
}
......@@ -12,6 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics' ]
}
dependencies {
compile project(':fx-util')
implementation "com.dua3.utility:utility:${dua3_utility_version}"
}
......@@ -12,7 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.base', 'javafx.fxml', 'javafx.graphics', 'javafx.web' ]
}
dependencies {
api project(':fx-util')
api project(':fx-web')
implementation "com.dua3.utility:utility:${dua3_utility_version}"
}
......@@ -46,8 +46,14 @@ node {
nodeModulesDir = file("${project.projectDir}/node")
}
javafx {
modules = [ 'javafx.base', 'javafx.fxml', 'javafx.graphics', 'javafx.web' ]
}
dependencies {
api project(':fx-editors')
implementation "com.dua3.utility:utility:${dua3_utility_version}"
}
def distFolder = './node/dist'
......
......@@ -12,5 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
dependencies {
javafx {
modules = [ 'javafx.controls', 'javafx.graphics' ]
}
......@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.graphics' ]
}
dependencies {
api project(':fx-icons')
......
......@@ -16,12 +16,18 @@ plugins {
id 'application'
}
javafx {
modules = [ 'javafx.base', 'javafx.fxml', 'javafx.controls' ]
}
dependencies {
compile project(':fx-util')
compile project(':fx-controls')
compile project(':fx-icons')
runtime project(':fx-icons:fx-icons-ikonli')
runtime "org.kordamp.ikonli:ikonli-fontawesome-pack:${ikonli_version}"
implementation "com.dua3.utility:utility:${dua3_utility_version}"
}
// set main
......
......@@ -12,7 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.base', 'javafx.controls', 'javafx.graphics' ]
}
dependencies {
implementation project(':fx-util')
api "com.dua3.utility:utility-db:${dua3_utility_version}"
}
\ No newline at end of file
}
......@@ -12,6 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.controls', 'javafx.graphics', 'javafx.fxml' ]
}
dependencies {
implementation project(':fx-icons')
}
\ No newline at end of file
implementation "com.dua3.utility:utility:${dua3_utility_version}"
}
......@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
javafx {
modules = [ 'javafx.web' ]
}
dependencies {
compile project(':fx-util')
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment