Browse Source

Update Gradle to 6.8.1

Little refactor here and there, copyright update

Signed-off-by: PAlex404 <alessandro.parisi406@gmail.com>
PAlex404 4 years ago
parent
commit
6e3ad2866b

+ 4 - 0
build.gradle

@@ -18,8 +18,12 @@ subprojects {
         version = "15.0.1"
         version = "15.0.1"
         modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web' ]
         modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web' ]
     }
     }
+
+    // Workaround for newer Gradle versions (see https://github.com/java9-modularity/gradle-modules-plugin/issues/165)
+    modularity.disableEffectiveArgumentsAdjustment()
 }
 }
 
 
 
 
 
 
 
 
+

+ 4 - 4
demo/build.gradle

@@ -9,9 +9,9 @@ repositories {
 }
 }
 
 
 dependencies {
 dependencies {
-    testCompile "org.testfx:testfx-core:4.0.16-alpha"
-    testCompile "junit:junit:4.13.1"
-    testCompile "org.testfx:testfx-junit:4.0.16-alpha"
+    testImplementation "org.testfx:testfx-core:4.0.16-alpha"
+    testImplementation "junit:junit:4.13.1"
+    testImplementation "org.testfx:testfx-junit:4.0.16-alpha"
 
 
     implementation "fr.brouillard.oss:cssfx:11.4.0"
     implementation "fr.brouillard.oss:cssfx:11.4.0"
     implementation 'org.kordamp.ikonli:ikonli-core:12.2.0'
     implementation 'org.kordamp.ikonli:ikonli-core:12.2.0'
@@ -21,7 +21,7 @@ dependencies {
 }
 }
 
 
 application {
 application {
-    mainClassName = moduleName.concat('/').concat(project.findProperty("chooseMain").toString())
+    getMainClass().set(moduleName.concat('/').concat(project.findProperty("chooseMain").toString()))
 }
 }
 
 
 jlink {
 jlink {

BIN
gradle/wrapper/gradle-wrapper.jar


+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists

+ 0 - 2
gradlew

@@ -82,7 +82,6 @@ esac
 
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
-
 # Determine the Java command to use to start the JVM.
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -130,7 +129,6 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
     JAVACMD=`cygpath --unix "$JAVACMD"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
 
     # We build the pattern for arguments to be converted via cygpath
     # We build the pattern for arguments to be converted via cygpath

+ 0 - 1
gradlew.bat

@@ -84,7 +84,6 @@ set CMD_LINE_ARGS=%*
 
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
-
 @rem Execute Gradle
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 

+ 1 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXCheckTreeView.java

@@ -33,7 +33,7 @@ public class MFXCheckTreeView<T> extends MFXTreeView<T> {
         super();
         super();
     }
     }
 
 
-    public MFXCheckTreeView(MFXTreeItem<T> root) {
+    public MFXCheckTreeView(MFXCheckTreeItem<T> root) {
         super(root);
         super(root);
     }
     }
 
 

+ 1 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXDatePicker.java

@@ -247,7 +247,7 @@ public class MFXDatePicker extends VBox {
     );
     );
 
 
     /**
     /**
-     * Specifies the line color of the date picker
+     * Specifies the line color of the date picker.
      */
      */
     private final StyleableObjectProperty<Paint> lineColor = new SimpleStyleableObjectProperty<>(
     private final StyleableObjectProperty<Paint> lineColor = new SimpleStyleableObjectProperty<>(
             StyleableProperties.LINE_COLOR,
             StyleableProperties.LINE_COLOR,

+ 4 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXTextField.java

@@ -98,6 +98,9 @@ public class MFXTextField extends TextField {
     // Styleable Properties
     // Styleable Properties
     //================================================================================
     //================================================================================
 
 
+    /**
+     * Specifies the maximum text length.
+     */
     private final StyleableIntegerProperty textLimit = new SimpleStyleableIntegerProperty(
     private final StyleableIntegerProperty textLimit = new SimpleStyleableIntegerProperty(
             StyleableProperties.TEXT_LIMIT,
             StyleableProperties.TEXT_LIMIT,
             this,
             this,
@@ -126,7 +129,7 @@ public class MFXTextField extends TextField {
     );
     );
 
 
     /**
     /**
-     * Specifies the lines' width.
+     * Specifies the lines' stroke width.
      */
      */
     private final StyleableDoubleProperty lineStrokeWidth = new SimpleStyleableDoubleProperty(
     private final StyleableDoubleProperty lineStrokeWidth = new SimpleStyleableDoubleProperty(
             StyleableProperties.LINE_STROKE_WIDTH,
             StyleableProperties.LINE_STROKE_WIDTH,

+ 18 - 0
materialfx/src/main/java/io/github/palexdev/materialfx/controls/cell/tableview/MFXTableRow.java

@@ -1,3 +1,21 @@
+/*
+ *     Copyright (C) 2021 Parisi Alessandro
+ *     This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
+ *
+ *     MaterialFX is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     MaterialFX is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.github.palexdev.materialfx.controls.cell.tableview;
 package io.github.palexdev.materialfx.controls.cell.tableview;
 
 
 import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.MFXResourcesLoader;

+ 18 - 0
materialfx/src/main/java/io/github/palexdev/materialfx/controls/tableview/MFXTableView.java

@@ -1,3 +1,21 @@
+/*
+ *     Copyright (C) 2021 Parisi Alessandro
+ *     This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
+ *
+ *     MaterialFX is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     MaterialFX is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.github.palexdev.materialfx.controls.tableview;
 package io.github.palexdev.materialfx.controls.tableview;
 
 
 import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.MFXResourcesLoader;

+ 18 - 0
materialfx/src/main/java/io/github/palexdev/materialfx/skins/tableview/MFXTableViewSkin.java

@@ -1,3 +1,21 @@
+/*
+ *     Copyright (C) 2021 Parisi Alessandro
+ *     This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
+ *
+ *     MaterialFX is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     MaterialFX is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.github.palexdev.materialfx.skins.tableview;
 package io.github.palexdev.materialfx.skins.tableview;
 
 
 import io.github.palexdev.materialfx.controls.factories.MFXAnimationFactory;
 import io.github.palexdev.materialfx.controls.factories.MFXAnimationFactory;

+ 18 - 0
materialfx/src/main/resources/io/github/palexdev/materialfx/css/tableview/mfx-tablerow.css

@@ -1,3 +1,21 @@
+/*
+ *     Copyright (C) 2021 Parisi Alessandro
+ *     This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
+ *
+ *     MaterialFX is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     MaterialFX is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 .mfx-table-row {
 .mfx-table-row {
     -fx-background-insets: 0.0;
     -fx-background-insets: 0.0;
     -fx-text-fill: black;
     -fx-text-fill: black;