diff options
author | Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | 2020-09-08 18:09:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-08 18:09:40 -0400 |
commit | f018442fd4b70608898dc908e493b1f9eab26274 (patch) | |
tree | b4ece1c909c2f3b41ca2862abf019c8bebb7ff43 /javaEE | |
parent | 9e77ff43b1450f656e8ae6405a8da6bb435e5127 (diff) | |
download | sdl_android-f018442fd4b70608898dc908e493b1f9eab26274.tar.gz |
Clean up duplicate gradle files (#1486)
* cleanup gradle files
* Update android.yml
* Update gitignore
* Fix build.gradle in javaEE
* Update .gitignore
Co-authored-by: Robert Henigan <robert.henigan@livio.io>
* Fix IMAGE_DIR path
Co-authored-by: Robert Henigan <robert.henigan@livio.io>
Diffstat (limited to 'javaEE')
-rw-r--r-- | javaEE/gradle/wrapper/gradle-wrapper.jar (renamed from javaEE/javaEE/gradle/wrapper/gradle-wrapper.jar) | bin | 55190 -> 55190 bytes | |||
-rw-r--r-- | javaEE/gradle/wrapper/gradle-wrapper.properties (renamed from javaEE/javaEE/gradle/wrapper/gradle-wrapper.properties) | 0 | ||||
-rwxr-xr-x | javaEE/gradlew (renamed from javaEE/javaEE/gradlew) | 0 | ||||
-rw-r--r-- | javaEE/gradlew.bat (renamed from javaEE/javaEE/gradlew.bat) | 0 | ||||
-rw-r--r-- | javaEE/hello_sdl_java_ee/build.gradle | 2 | ||||
-rw-r--r-- | javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar | bin | 56172 -> 0 bytes | |||
-rw-r--r-- | javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties | 6 | ||||
-rwxr-xr-x | javaEE/hello_sdl_java_ee/gradlew | 172 | ||||
-rw-r--r-- | javaEE/hello_sdl_java_ee/gradlew.bat | 84 | ||||
-rw-r--r-- | javaEE/hello_sdl_java_ee/settings.gradle | 3 | ||||
-rw-r--r-- | javaEE/javaEE/settings.gradle | 1 | ||||
-rw-r--r-- | javaEE/settings.gradle | 3 |
12 files changed, 2 insertions, 269 deletions
diff --git a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.jar b/javaEE/gradle/wrapper/gradle-wrapper.jar Binary files differindex 87b738cbd..87b738cbd 100644 --- a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.jar +++ b/javaEE/gradle/wrapper/gradle-wrapper.jar diff --git a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.properties b/javaEE/gradle/wrapper/gradle-wrapper.properties index df8be2c19..df8be2c19 100644 --- a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.properties +++ b/javaEE/gradle/wrapper/gradle-wrapper.properties diff --git a/javaEE/javaEE/gradlew b/javaEE/gradlew index af6708ff2..af6708ff2 100755 --- a/javaEE/javaEE/gradlew +++ b/javaEE/gradlew diff --git a/javaEE/javaEE/gradlew.bat b/javaEE/gradlew.bat index 6d57edc70..6d57edc70 100644 --- a/javaEE/javaEE/gradlew.bat +++ b/javaEE/gradlew.bat diff --git a/javaEE/hello_sdl_java_ee/build.gradle b/javaEE/hello_sdl_java_ee/build.gradle index 5c1b1eb70..105285adf 100644 --- a/javaEE/hello_sdl_java_ee/build.gradle +++ b/javaEE/hello_sdl_java_ee/build.gradle @@ -20,7 +20,7 @@ configurations { dependencies { extraLibs fileTree(dir: 'libs', include: ['*.jar']) //testCompile group: 'junit', name: 'junit', version: '4.12' - extraLibs project(path: ':sdl_java_ee') + extraLibs project(path: ':javaEE') configurations.implementation.extendsFrom(configurations.extraLibs) } diff --git a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar b/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar Binary files differdeleted file mode 100644 index 28861d273..000000000 --- a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar +++ /dev/null diff --git a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties b/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 16f7ff6d1..000000000 --- a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Mar 18 15:56:54 EDT 2019 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/javaEE/hello_sdl_java_ee/gradlew b/javaEE/hello_sdl_java_ee/gradlew deleted file mode 100755 index cccdd3d51..000000000 --- a/javaEE/hello_sdl_java_ee/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/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/javaEE/hello_sdl_java_ee/gradlew.bat b/javaEE/hello_sdl_java_ee/gradlew.bat deleted file mode 100644 index f9553162f..000000000 --- a/javaEE/hello_sdl_java_ee/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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 diff --git a/javaEE/hello_sdl_java_ee/settings.gradle b/javaEE/hello_sdl_java_ee/settings.gradle deleted file mode 100644 index 8a8a05513..000000000 --- a/javaEE/hello_sdl_java_ee/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -rootProject.name = 'hello_sdl_java_ee' -include ":sdl_java_ee" -project (":sdl_java_ee").projectDir = new File(rootProject.projectDir, "../javaEE/")
\ No newline at end of file diff --git a/javaEE/javaEE/settings.gradle b/javaEE/javaEE/settings.gradle deleted file mode 100644 index 4da4ab327..000000000 --- a/javaEE/javaEE/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'javaEE' diff --git a/javaEE/settings.gradle b/javaEE/settings.gradle index 7ada092e5..82ab998de 100644 --- a/javaEE/settings.gradle +++ b/javaEE/settings.gradle @@ -1,2 +1 @@ -include ':javaEE', ':hello_sdl_java_ee', ':sdl_java_ee' -project (":sdl_java_ee").projectDir = new File("/javaEE/") +include ':javaEE', ':hello_sdl_java_ee'
\ No newline at end of file |