diff --git a/DatabaseTest-RoboVM/build.gradle b/DatabaseTest-RoboVM/build.gradle index 693c170..dcaaab8 100644 --- a/DatabaseTest-RoboVM/build.gradle +++ b/DatabaseTest-RoboVM/build.gradle @@ -1,19 +1,20 @@ apply plugin: "java" repositories { - jcenter() + gradlePluginPortal() maven { url 'https://maven.fabric.io/public' } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/releases/" } } dependencies { - compile project(":gdx-sqlite") + implementation project(":DatabaseTest") + implementation project(":gdx-sqllite-robovm") - compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" - compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" - compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" - compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" + implementation "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" + implementation "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" + implementation "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" + implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" } sourceSets.main.java.srcDirs = [ "src/" ] diff --git a/DatabaseTest-android/AndroidManifest.xml b/DatabaseTest-android/AndroidManifest.xml index cdcac30..394a044 100644 --- a/DatabaseTest-android/AndroidManifest.xml +++ b/DatabaseTest-android/AndroidManifest.xml @@ -2,16 +2,14 @@ - - + android:name=".MainActivity" + android:label="@string/app_name" + android:screenOrientation="landscape" + android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:exported="true"> @@ -19,4 +17,4 @@ - \ No newline at end of file + diff --git a/DatabaseTest-android/build.gradle b/DatabaseTest-android/build.gradle index 082f62f..b7b1b83 100644 --- a/DatabaseTest-android/build.gradle +++ b/DatabaseTest-android/build.gradle @@ -4,14 +4,14 @@ configurations { natives } repositories { /** The default repository for Android Studio projects */ - jcenter() + gradlePluginPortal() } dependencies { - compile project(":DatabaseTest") + implementation project(":DatabaseTest") + implementation project(":gdx-sqlite-android") - compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" - natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi" + implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" @@ -23,7 +23,7 @@ android { buildToolsVersion android_version defaultConfig { - minSdkVersion 9 + minSdkVersion 16 targetSdkVersion android_compile_version versionCode 1 versionName "1.0.0" @@ -75,26 +75,34 @@ task run(type: Exec) { // called every time gradle gets executed, takes the native dependencies of // the natives configuration, and extracts them to the proper libs/ folders // so they get packed with the APK. -task copyAndroidNatives() { - file("libs/armeabi/").mkdirs(); - file("libs/armeabi-v7a/").mkdirs(); - file("libs/x86/").mkdirs(); - file("libs/x86_64/").mkdirs(); - file("libs/arm64-v8a/").mkdirs(); +task copyAndroidNatives { + doFirst { + file("libs/armeabi/").mkdirs() + file("libs/armeabi-v7a/").mkdirs() + file("libs/x86/").mkdirs() + file("libs/x86_64/").mkdirs() + file("libs/arm64-v8a/").mkdirs() - configurations.natives.files.each { jar -> - def outputDir = null - if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") - if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") - if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") - if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") - if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") - if (outputDir != null) { - copy { - from zipTree(jar) - into outputDir - include "*.so" + configurations.natives.copy().files.each { jar -> + def outputDir = null + if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") + if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") + if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") + if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") + if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") + if (outputDir != null) { + copy { + from zipTree(jar) + into outputDir + include "*.so" + } } } } } + +tasks.whenTaskAdded { packageTask -> + if (packageTask.name.contains("package")) { + packageTask.dependsOn 'copyAndroidNatives' + } +} diff --git a/DatabaseTest-desktop/build.gradle b/DatabaseTest-desktop/build.gradle index 1e53947..980e9e7 100644 --- a/DatabaseTest-desktop/build.gradle +++ b/DatabaseTest-desktop/build.gradle @@ -2,11 +2,12 @@ apply plugin: "java" sourceCompatibility = 1.7 sourceSets.main.java.srcDirs = [ "src/" ] +sourceSets.main.resources.srcDirs = [ "../DatabaseTest-android/assets" ] dependencies { - compile project(":DatabaseTest") - compile project(":gdx-sqlite-desktop") + implementation project(":DatabaseTest") + implementation project(":gdx-sqlite-desktop") - compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" - compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" + implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" + implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" } diff --git a/DatabaseTest/build.gradle b/DatabaseTest/build.gradle index 203a87f..e470f4c 100644 --- a/DatabaseTest/build.gradle +++ b/DatabaseTest/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'java' +apply plugin: 'java-library' sourceCompatibility = "1.7" targetCompatibility = "1.7" @@ -6,10 +6,10 @@ targetCompatibility = "1.7" sourceSets.main.java.srcDirs = [ "src/" ] dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar']) - compile "com.badlogicgames.gdx:gdx:$gdxVersion" - compile project (':gdx-sqlite') + api "com.badlogicgames.gdx:gdx:$gdxVersion" + api project (':gdx-sqlite') - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' } diff --git a/build.gradle b/build.gradle index 138ecb9..e1ead79 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ buildscript { repositories { - jcenter() + gradlePluginPortal() maven { url 'https://maven.fabric.io/public' } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + google() } // these dependencies are for build process only (not for actual code) dependencies { - classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' - classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + classpath 'org.wisepersist:gwt-gradle-plugin:1.1.19' + classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.18' } } @@ -19,16 +19,15 @@ allprojects { version = '1.0' ext { gdxVersion = '1.9.6' - roboVMVersion = '2.3.0' + roboVMVersion = '2.3.18' // Set defaults for android - android_compile_version = 25 - android_version = '25.0.1' - appcompat_library_version = '25.0.1' - support_library_version = '25.0.1' + android_compile_version = 33 + android_version = '33.0.0' } repositories { - jcenter() + gradlePluginPortal() maven { url 'https://maven.fabric.io/public' } + google() } } diff --git a/gdx-sqlite-android/build.gradle b/gdx-sqlite-android/build.gradle index 1f716e8..bbcbccc 100644 --- a/gdx-sqlite-android/build.gradle +++ b/gdx-sqlite-android/build.gradle @@ -1,15 +1,14 @@ apply plugin: "com.android.library" -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'maven-publish' group = 'com.badlogic.gdx.sqlite' version = '0.1' dependencies { - testCompile 'junit:junit:4.12' - compile "com.android.support:appcompat-v7:${appcompat_library_version}" + testImplementation 'junit:junit:4.13.2' - compile project(":gdx-sqlite") - compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" + api project(":gdx-sqlite") + api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" } android { @@ -17,7 +16,7 @@ android { buildToolsVersion android_version defaultConfig { - minSdkVersion 9 + minSdkVersion 16 targetSdkVersion android_compile_version versionCode 1 versionName "1.0" @@ -38,10 +37,22 @@ android { jniLibs.srcDirs = ['libs'] } - instrumentTest.setRoot('tests') } - // TODO : do we really need this? - lintOptions { - abortOnError false + + publishing { + singleVariant("release") { + withSourcesJar() + withJavadocJar() + } + } +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + } + } } } diff --git a/gdx-sqlite-desktop/build.gradle b/gdx-sqlite-desktop/build.gradle index c90f907..dc62497 100644 --- a/gdx-sqlite-desktop/build.gradle +++ b/gdx-sqlite-desktop/build.gradle @@ -1,5 +1,9 @@ -apply plugin: "java" -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: "java-library" +apply plugin: 'maven-publish' + +repositories { + mavenCentral() +} group = 'com.badlogic.gdx.sqlite' version = '0.1' @@ -8,6 +12,19 @@ sourceCompatibility = 1.7 sourceSets.main.java.srcDirs = [ "src/" ] dependencies { - compile project(":gdx-sqlite") - compile "org.xerial:sqlite-jdbc:3.15.1" + api project(":gdx-sqlite") + api "org.xerial:sqlite-jdbc:3.39.2.1" +} + +java { + withJavadocJar() + withSourcesJar() +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } } diff --git a/gdx-sqlite/build.gradle b/gdx-sqlite/build.gradle index 74a4bfb..9b08f0f 100644 --- a/gdx-sqlite/build.gradle +++ b/gdx-sqlite/build.gradle @@ -1,5 +1,5 @@ -apply plugin: 'java' -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'java-library' +apply plugin: 'maven-publish' group = 'com.badlogic.gdx.sqlite' version = '0.1' @@ -10,9 +10,22 @@ sourceSets.main.java.srcDirs = [ "src/" ] dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar']) - compile "com.badlogicgames.gdx:gdx:$gdxVersion" + api "com.badlogicgames.gdx:gdx:$gdxVersion" - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' +} + +java { + withJavadocJar() + withSourcesJar() +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } } diff --git a/gdx-sqlite/src/com/badlogic/gdx/sqlite/Database.java b/gdx-sqlite/src/com/badlogic/gdx/sqlite/Database.java index fd5fb2c..0217dcb 100644 --- a/gdx-sqlite/src/com/badlogic/gdx/sqlite/Database.java +++ b/gdx-sqlite/src/com/badlogic/gdx/sqlite/Database.java @@ -28,11 +28,10 @@ public interface Database { /** Closes the opened database and releases all the resources related to this database. * @throws com.badlogic.gdx.sqlite.SQLiteGdxException */ public void closeDatabase () throws com.badlogic.gdx.sqlite.SQLiteGdxException; - + /** * Get a prepared statement. - * - * @param prepStat give the {@link com.badlogic.gdx.sqlite.PreparedStatement prepared statement} to use + * * @param query the query to prepare * @return the prepared statement of the query * @throws com.badlogic.gdx.sqlite.SQLiteGdxRuntimeException @@ -40,7 +39,7 @@ public interface Database { public com.badlogic.gdx.sqlite.PreparedStatement getPreparedStatement(String query) throws com.badlogic.gdx.sqlite.SQLiteGdxException; public void beginTransaction() throws com.badlogic.gdx.sqlite.SQLiteGdxException; - + public void setTransactionSuccessful() throws com.badlogic.gdx.sqlite.SQLiteGdxException; public void endTransaction() throws com.badlogic.gdx.sqlite.SQLiteGdxException; @@ -65,10 +64,10 @@ public interface Database { * @return the passed {@link com.badlogic.gdx.sqlite.DatabaseCursor}. * @throws com.badlogic.gdx.sqlite.SQLiteGdxException */ public com.badlogic.gdx.sqlite.DatabaseCursor rawQuery (com.badlogic.gdx.sqlite.DatabaseCursor cursor, String sql) throws com.badlogic.gdx.sqlite.SQLiteGdxException; - + /** * Return the last insert query generated id. - * + * * @return the last generated id */ public long getLastRowId() throws com.badlogic.gdx.sqlite.SQLiteGdxException; diff --git a/gdx-sqlite/src/com/badlogic/gdx/sqlite/DatabaseCursor.java b/gdx-sqlite/src/com/badlogic/gdx/sqlite/DatabaseCursor.java index 7b11159..0ee725f 100644 --- a/gdx-sqlite/src/com/badlogic/gdx/sqlite/DatabaseCursor.java +++ b/gdx-sqlite/src/com/badlogic/gdx/sqlite/DatabaseCursor.java @@ -85,8 +85,7 @@ public interface DatabaseCursor { public boolean next (); /** Returns the numbers of rows in the cursor. - * @return number of rows - * @throws SQLiteGdxException */ + * @return number of rows */ public int getCount (); /** Closes the Cursor, releasing all of its resources and making it completely invalid. */ diff --git a/gdx-sqllite-robovm/build.gradle b/gdx-sqllite-robovm/build.gradle index 8965c8a..b7e1396 100644 --- a/gdx-sqllite-robovm/build.gradle +++ b/gdx-sqllite-robovm/build.gradle @@ -1,25 +1,38 @@ -apply plugin: "java" -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: "java-library" +apply plugin: 'maven-publish' group = 'com.badlogic.gdx.sqlite' version = '0.1' repositories { - jcenter() + gradlePluginPortal() maven { url 'https://maven.fabric.io/public' } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/releases/" } } dependencies { - compile project(":gdx-sqlite") + api project(":gdx-sqlite") - compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" - compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" - compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" + api "com.mobidevelop.robovm:robovm-rt:$roboVMVersion" + api "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" + api "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" } sourceSets.main.java.srcDirs = [ "src/" ] sourceCompatibility = '1.7' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' + +java { + withJavadocJar() + withSourcesJar() +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372ae..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb3b0e0..8fad3f5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Apr 18 22:49:41 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew index 9d82f78..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -1,74 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# 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 - 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -85,76 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..f127cfd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + @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 +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,44 +64,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal