Permalink
Browse files

Move wrapper to root, bump version numbers, cleanup

  • Loading branch information...
jose.pereda
jose.pereda committed Apr 28, 2018
1 parent 4840ab6 commit d601ab262b2cd2184865f2da64cb30424bdc66e3
@@ -10,7 +10,7 @@ buildscript {
plugins {
id 'com.github.hierynomus.license' version '0.13.1'
id 'maven-publish'
id 'net.nemerosa.versioning' version '2.4.0'
id 'net.nemerosa.versioning' version '2.6.1'
id 'com.jfrog.bintray' version '1.7.2'
id 'com.github.ben-manes.versions' version '0.13.0'
}
@@ -41,7 +41,7 @@ if (!hasProperty('mainClass')) {
}
dependencies {
compile 'org.controlsfx:controlsfx:8.40.12'
compile 'org.controlsfx:controlsfx:8.40.14'
compile 'org.reactfx:reactfx:2.0-M5'
try {
@@ -1,7 +1,7 @@
plugins {
id 'com.github.hierynomus.license' version '0.13.1'
id 'maven-publish'
id 'net.nemerosa.versioning' version '2.4.0'
id 'net.nemerosa.versioning' version '2.6.1'
id 'com.jfrog.bintray' version '1.7.2'
id 'com.github.ben-manes.versions' version '0.13.0'
}
@@ -13,11 +13,11 @@ A JavaFX 3D Visualization and Component Library
The project is managed by gradle. To build, type
gradle assemble
./gradlew assemble
To deploy it to your local Maven repository, type:
gradle publishToMavenLocal
./gradlew publishToMavenLocal
## Use of FXyz3D Core
@@ -75,9 +75,8 @@ and create a JavaFX Application class:
### FXSampler
To use the FXSampler and visualize all the samples and the different options available, clone the repository, and run:
To use the FXSampler and visualize all the samples and the different options available, run:
cd Fxyz-Samples
./gradlew run
There is a hidden side popup menu at the left, from where different samples can be selected. From the right panels different options can be applied dynamically to the 3D shape.
@@ -1,43 +1,28 @@
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
}
}
task wrapper(type: Wrapper) {
gradleVersion = '2.0'
}
apply plugin: 'java'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'base'
Properties cfg = new Properties()
cfg.load(new FileInputStream("$rootDir/fxyz-build.properties"))
ext {
artifact_suffix = cfg.artifact_suffix
specification_title = cfg.fxyz_specification_title
specification_version = cfg.fxyz_specification_version
fxyz_name = 'FXyzLibs'
fxyz_sampler_name = 'FXyz-Sampler'
fxyz_sampler_version = cfg.fxyz_sampler_specification_version + artifact_suffix
fxyz_sampler_mainClass = 'org.fxyz3d.client.FXyzClient'
fxyz_group = cfg.fxyz_group
}
subprojects {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'com.github.johnrengelman.shadow'
// run: gradle repairHeaders
apply from: 'http://gradle-plugins.mihosoft.eu/latest/vlicenseheader.gradle'
repairHeaders.licenseHeaderText = new File(rootDir,'fxyz-license.txt')
Properties cfg = new Properties()
cfg.load(new FileInputStream("$rootDir/fxyz-build.properties"))
ext {
artifact_suffix = cfg.artifact_suffix
specification_title = cfg.fxyz_specification_title
specification_version = cfg.fxyz_specification_version
fxyz_name = 'FXyzLibs'
fxyz_sampler_name = 'FXyz-Sampler'
fxyz_sampler_version = cfg.fxyz_sampler_specification_version + artifact_suffix
fxyz_sampler_mainClass = 'org.fxyz3d.client.FXyzClient'
}
group = 'org.fxyz3d'
group = fxyz_group
version = specification_version + artifact_suffix
sourceCompatibility = '1.8'
@@ -48,9 +33,7 @@ subprojects {
}
dependencies {
compile ('eu.mihosoft.vrl.jcsg:jcsg:0.5.6') {
exclude group: 'eu.mihosoft.ext.org.fxyz'
}
compile 'eu.mihosoft.vrl.jcsg:jcsg:0.5.7'
compile 'org.orbisgis:poly2tri-core:0.1.2'
testCompile 'junit:junit:[4,)'
}
@@ -63,7 +46,7 @@ subprojects {
}
task wrapper(type: Wrapper) {
gradleVersion = '2.0'
gradleVersion = '4.7'
}
compileJava {
File renamed without changes.
File renamed without changes.
@@ -1,23 +1,3 @@
include "FXyz-Core", "FXyz-Client", "FXyz-Samples"
rootProject.name = "FXyzLibs"
/*rootProject.name = 'FXyzLibs'
// Find the directories containing a "build.gradle" file in the root directory
// of the project. That is, every directory containing a "build.gradle" will
// be automatically the subproject of this project.
def subDirs = rootDir.listFiles(new FileFilter() {
public boolean accept(File file) {
if (!file.isDirectory()) {
return false
}
if (file.name == 'buildSrc') {
return false
}
return new File(file, 'build.gradle').isFile()
}
});
subDirs.each { File dir ->
include dir.name
} */
rootProject.name = "FXyzLibs"

0 comments on commit d601ab2

Please sign in to comment.