Remove old nbproject

Add Gradlew, wrapper Update build.gradle and add module-info
JonathanGiles · Dec 9, 2018 · 0d106be818da8710f90842167717badb7570630a · 0d106be
1 parent 8ecb422
commit 0d106be818da8710f90842167717badb7570630a
diff --git a/build.gradle b/build.gradle
@@ -1,48 +1,64 @@
-  
-apply plugin: 'java'
-  
-apply plugin: 'maven'
-  
-apply plugin: 'application'
+  
+plugins {
+  
+    id 'application'
+  
+    id 'org.openjfx.javafxplugin' version '0.0.5'
+  
+    id 'org.beryx.jlink' version '2.1.8-gradle4'
+  
+}
-  
-mainClassName = "org.scenicview.ScenicView"
+  
+mainClassName = "org.scenicview.scenicview/org.scenicview.ScenicView"
 group = 'org.scenic-view'
-  
-version = '9.0.0'
+  
+version = '11.0.1'
 defaultTasks 'install'
 repositories {
-  
-    mavenLocal()
+  
+    mavenCentral()
 }
 configurations {
    jdk
    binTray
 }
-  
-dependencies {
-  
-    jdk files("${System.properties['java.home']}/../lib/tools.jar")
-  
-    try {
-  
-        jdk files(svJFXRTJar)
-  
-    } catch (MissingPropertyException pne) {
-  
-        jdk files("${System.properties['java.home']}/lib/ext/jfxrt.jar")
-  
-    }
-  
-}
-  
-
-  
-
 sourceSets {
    main {
        compileClasspath += configurations.jdk
    }
 }
+  
+javafx {
+  
+    modules = ['javafx.web', 'javafx.fxml', 'javafx.swing']
+  
+}
+  
+
 jar {
    manifest {
        attributes(
-  
-            'Main-Class': 'org.scenicview.ScenicView',            /* Used for standalone Scenic View */
-  
-            'Agent-Class': 'org.fxconnector.remote.RuntimeAttach',/* But the standalone Scenic View starts up this agent when in runtime attach mode */
-  
-            'Premain-Class': 'org.scenicview.ScenicView'          /* Alternatively, this will be called if Scenic View is started as an agent */
+  
+                'Main-Class': 'org.scenicview.ScenicView',            /* Used for standalone Scenic View */
+  
+                'Agent-Class': 'org.fxconnector.remote.RuntimeAttach',/* But the standalone Scenic View starts up this agent when in runtime attach mode */
+  
+                'Premain-Class': 'org.scenicview.ScenicView',          /* Alternatively, this will be called if Scenic View is started as an agent */
+  
+                'Automatic-Module-Name': 'org.scenicview.scenicview'
        )
    }
+  
+    archiveName = 'scenicview.jar'
 }
 artifacts {
    archives(jar)
+  
+}
+  
+
+  
+ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
+  
+
+  
+jlink {
+  
+    options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
+  
+    launcher {
+  
+        name = 'scenicView'
+  
+    }
+  
+    imageZip = project.file("${buildDir}/dist/scenicView-${platform}.zip")
+  
+}
+  
+
+  
+tasks.jlink.doLast {
+  
+    // Copy scenicView.jar to lib, it is required as loading Agent
+  
+    copy {
+  
+        from "${buildDir}/libs/scenicview.jar"
+  
+        into "${buildDir}/image/lib"
+  
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+  
+distributionBase=GRADLE_USER_HOME
+  
+distributionPath=wrapper/dists
+  
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+  
+zipStoreBase=GRADLE_USER_HOME
+  
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -0,0 +1,172 @@
+  
+#!/usr/bin/env sh
+  
+
+  
+##############################################################################
+  
+##
+  
+##  Gradle start up script for UN*X
+  
+##
+  
+##############################################################################
+  
+
+  
+# Attempt to set APP_HOME
+  
+# Resolve links: $0 may be a link
+  
+PRG="$0"
+  
+# Need this for relative symlinks.
+  
+while [ -h "$PRG" ] ; do
+  
+    ls=`ls -ld "$PRG"`
+  
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+  
+    if expr "$link" : '/.*' > /dev/null; then
+  
+        PRG="$link"
+  
+    else
+  
+        PRG=`dirname "$PRG"`"/$link"
+  
+    fi
+  
+done
+  
+SAVED="`pwd`"
+  
+cd "`dirname \"$PRG\"`/" >/dev/null
+  
+APP_HOME="`pwd -P`"
+  
+cd "$SAVED" >/dev/null
+  
+
+  
+APP_NAME="Gradle"
+  
+APP_BASE_NAME=`basename "$0"`
+  
+
+  
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+  
+DEFAULT_JVM_OPTS=""
+  
+
+  
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+  
+MAX_FD="maximum"
+  
+
+  
+warn () {
+  
+    echo "$*"
+  
+}
+  
+
+  
+die () {
+  
+    echo
+  
+    echo "$*"
+  
+    echo
+  
+    exit 1
+  
+}
+  
+
+  
+# OS specific support (must be 'true' or 'false').
+  
+cygwin=false
+  
+msys=false
+  
+darwin=false
+  
+nonstop=false
+  
+case "`uname`" in
+  
+  CYGWIN* )
+  
+    cygwin=true
+  
+    ;;
+  
+  Darwin* )
+  
+    darwin=true
+  
+    ;;
+  
+  MINGW* )
+  
+    msys=true
+  
+    ;;
+  
+  NONSTOP* )
+  
+    nonstop=true
+  
+    ;;
+  
+esac
+  
+
+  
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+  
+
+  
+# Determine the Java command to use to start the JVM.
+  
+if [ -n "$JAVA_HOME" ] ; then
+  
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+  
+        # IBM's JDK on AIX uses strange locations for the executables
+  
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+  
+    else
+  
+        JAVACMD="$JAVA_HOME/bin/java"
+  
+    fi
+  
+    if [ ! -x "$JAVACMD" ] ; then
+  
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+  
+
+  
+Please set the JAVA_HOME variable in your environment to match the
+  
+location of your Java installation."
+  
+    fi
+  
+else
+  
+    JAVACMD="java"
+  
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+  
+
+  
+Please set the JAVA_HOME variable in your environment to match the
+  
+location of your Java installation."
+  
+fi
+  
+
+  
+# Increase the maximum file descriptors if we can.
+  
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+  
+    MAX_FD_LIMIT=`ulimit -H -n`
+  
+    if [ $? -eq 0 ] ; then
+  
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+  
+            MAX_FD="$MAX_FD_LIMIT"
+  
+        fi
+  
+        ulimit -n $MAX_FD
+  
+        if [ $? -ne 0 ] ; then
+  
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+  
+        fi
+  
+    else
+  
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+  
+    fi
+  
+fi
+  
+
+  
+# For Darwin, add options to specify how the application appears in the dock
+  
+if $darwin; then
+  
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+  
+fi
+  
+
+  
+# For Cygwin, switch paths to Windows format before running java
+  
+if $cygwin ; then
+  
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+  
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+  
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+  
+
+  
+    # We build the pattern for arguments to be converted via cygpath
+  
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+  
+    SEP=""
+  
+    for dir in $ROOTDIRSRAW ; do
+  
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+  
+        SEP="|"
+  
+    done
+  
+    OURCYGPATTERN="(^($ROOTDIRS))"
+  
+    # Add a user-defined pattern to the cygpath arguments
+  
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+  
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+  
+    fi
+  
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+  
+    i=0
+  
+    for arg in "$@" ; do
+  
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+  
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+  
+
+  
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+  
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+  
+        else
+  
+            eval `echo args$i`="\"$arg\""
+  
+        fi
+  
+        i=$((i+1))
+  
+    done
+  
+    case $i in
+  
+        (0) set -- ;;
+  
+        (1) set -- "$args0" ;;
+  
+        (2) set -- "$args0" "$args1" ;;
+  
+        (3) set -- "$args0" "$args1" "$args2" ;;
+  
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+  
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+  
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+  
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+  
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+  
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+  
+    esac
+  
+fi
+  
+
+  
+# Escape application args
+  
+save () {
+  
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+  
+    echo " "
+  
+}
+  
+APP_ARGS=$(save "$@")
+  
+
+  
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+  
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+  
+
+  
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+  
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  
+  cd "$(dirname "$0")"
+  
+fi
+  
+
+  
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -0,0 +1,85 @@
+  
+@if "%DEBUG%" == "" @echo off
+  
+
+  
+@rem ##########################################################################
+  
+@rem
+  
+@rem  Gradle startup script for Windows
+  
+@rem
+  
+@rem ##########################################################################
+  
+
+  
+@rem Set local scope for the variables with windows NT shell
+  
+if "%OS%"=="Windows_NT" setlocal
+  
+
+  
+set DIRNAME=%~dp0
+  
+if "%DIRNAME%" == "" set DIRNAME=.
+  
+set APP_BASE_NAME=%~n0
+  
+set APP_HOME=%DIRNAME%
+  
+
+  
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+  
+set DEFAULT_JVM_OPTS=
+  
+
+  
+@rem Find java.exe
+  
+if defined JAVA_HOME goto findJavaFromJavaHome
+  
+
+  
+set JAVA_EXE=java.exe
+  
+%JAVA_EXE% -version >NUL 2>&1
+  
+if "%ERRORLEVEL%" == "0" goto init
+  
+
+  
+echo.
+  
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+  
+echo.
+  
+echo Please set the JAVA_HOME variable in your environment to match the
+  
+echo location of your Java installation.
+  
+
+  
+goto fail
+  
+
+  
+:findJavaFromJavaHome
+  
+set JAVA_HOME=%JAVA_HOME:"=%
+  
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+  
+
+  
+if exist "%JAVA_EXE%" goto init
+  
+
+  
+echo.
+  
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+  
+echo.
+  
+echo Please set the JAVA_HOME variable in your environment to match the
+  
+echo location of your Java installation.
+  
+
+  
+goto fail
+  
+
+  
+:init
+  
+@rem Get command-line arguments, handling Windows variants
+  
+
+  
+if not "%OS%" == "Windows_NT" goto win9xME_args
+  
+
+  
+:win9xME_args
+  
+@rem Slurp the command line arguments.
+  
+set CMD_LINE_ARGS=
+  
+set _SKIP=2
+  
+
+  
+:win9xME_args_slurp
+  
+if "x%~1" == "x" goto execute
+  
+
+  
+set CMD_LINE_ARGS=%*
+  
+
+  
+:execute
+  
+@rem Setup the command line
+  
+
+  
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+  
+
+  
+@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%
+  
+
+  
+:end
+  
+@rem End local scope for the variables with windows NT shell
+  
+if "%ERRORLEVEL%"=="0" goto mainEnd
+  
+
+  
+:fail
+  
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+  
+rem the _cmd.exe /c_ return code!
+  
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+  
+exit /b 1
+  
+
+  
+:mainEnd
+  
+if "%OS%"=="Windows_NT" endlocal
+  
+
+  
+:omega