Commit 6c282201 authored by Axel Howind's avatar Axel Howind

cfg dependency version info in gradle.properties

parent aa3fdde1
Pipeline #52170477 passed with stages
in 18 minutes and 33 seconds
...@@ -30,7 +30,7 @@ subprojects { ...@@ -30,7 +30,7 @@ subprojects {
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
group = 'com.dua3.fx' group = 'com.dua3.fx'
version = '0.3.5-BETA1' version = '0.3.5-SNAPSHOT'
ext.moduleName = project.group ext.moduleName = project.group
ext.scm = 'https://gitlab.com/com.dua3/lib/fx.git' ext.scm = 'https://gitlab.com/com.dua3/lib/fx.git'
...@@ -42,50 +42,26 @@ subprojects { ...@@ -42,50 +42,26 @@ subprojects {
ext.developerEmail = 'axel@dua3.com' ext.developerEmail = 'axel@dua3.com'
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// remove module-info.java from eclipse source folder
eclipse.classpath.file.whenMerged {
for (item in entries.findAll{ it.path.matches('src/.*/java') }) {
item.excludes += 'module-info.java'
}
}
repositories { repositories {
jcenter() jcenter()
mavenLocal() mavenLocal()
} }
// get OS (because JavaFX packages are OS dependent)
def currentOS = org.gradle.internal.os.OperatingSystem.current()
def platform
if (currentOS.isWindows()) {
platform = 'win'
} else if (currentOS.isLinux()) {
platform = 'linux'
} else if (currentOS.isMacOsX()) {
platform = 'mac'
}
ext {
dua3UtilityVersion = "4.0.0-BETA2"
javafxversion = '11.0.2'
}
dependencies { dependencies {
api "com.dua3.utility:utility:${dua3UtilityVersion}" api "com.dua3.utility:utility:${System.properties['com.dua3.utility.version']}"
api "com.dua3.utility:utility.db:${dua3UtilityVersion}"
// JavaFX // JavaFX
api "org.openjfx:javafx-base:${javafxversion}:${platform}" implementation "org.openjfx:javafx-base:${System.properties['javafx.version']}:${System.properties['javafx.platform']}"
api "org.openjfx:javafx-fxml:${javafxversion}:${platform}" implementation "org.openjfx:javafx-fxml:${System.properties['javafx.version']}:${System.properties['javafx.platform']}"
api "org.openjfx:javafx-graphics:${javafxversion}:${platform}" implementation "org.openjfx:javafx-graphics:${System.properties['javafx.version']}:${System.properties['javafx.platform']}"
api "org.openjfx:javafx-controls:${javafxversion}:${platform}" implementation "org.openjfx:javafx-controls:${System.properties['javafx.version']}:${System.properties['javafx.platform']}"
api "org.openjfx:javafx-web:${javafxversion}:${platform}" implementation "org.openjfx:javafx-web:${System.properties['javafx.version']}:${System.properties['javafx.platform']}"
api "org.openjfx:javafx-media:${javafxversion}:${platform}" implementation "org.openjfx:javafx-media:${System.properties['javafx.version']}:${System.properties['javafx.platform']}"
// JUnit // JUnit
def junitVersion = '5.3.1' def junitVersion = '5.3.1'
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" testImplementation "org.junit.jupiter:junit-jupiter-api:${System.properties['org.junit.version']}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${System.properties['org.junit.version']}"
} }
test { test {
...@@ -202,7 +178,7 @@ publishing { ...@@ -202,7 +178,7 @@ publishing {
// === SPOTBUGS === > // === SPOTBUGS === >
spotbugs.toolVersion = '3.1.11' spotbugs.toolVersion = '3.1.12'
spotbugs.excludeFilter = rootProject.file('spotbugs-exclude.xml') spotbugs.excludeFilter = rootProject.file('spotbugs-exclude.xml')
tasks.withType(com.github.spotbugs.SpotBugsTask) { tasks.withType(com.github.spotbugs.SpotBugsTask) {
......
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
dependencies { dependencies {
implementation project(':fx.util') implementation project(':fx.util')
implementation "com.dua3.utility:utility.db:${dua3UtilityVersion}" api "com.dua3.utility:utility.db:${System.properties['com.dua3.utility.version']}"
} }
\ No newline at end of file
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
org.gradle.caching=true org.gradle.caching=true
systemProp.javafx.platform=win
systemProp.javafx.version=12
# current version numbers
systemProp.org.junit.version=5.3.1
systemProp.com.dua3.utility.version=4.0.0-BETA2
systemProp.com.dua3.meja.version=2.0-BETA4
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