update dependencies
This commit is contained in:
		
							parent
							
								
									332b3df632
								
							
						
					
					
						commit
						a4ce4504c6
					
				
							
								
								
									
										23
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								build.gradle
									
									
									
									
									
								
							@ -17,23 +17,9 @@ repositories {
 | 
				
			|||||||
	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 | 
						// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 | 
				
			||||||
	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 | 
						// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 | 
				
			||||||
	// for more information about repositories.
 | 
						// for more information about repositories.
 | 
				
			||||||
	maven { url 'https://maven.siphalor.de/' }
 | 
					 | 
				
			||||||
	maven { url 'https://jitpack.io' }
 | 
					 | 
				
			||||||
    maven { url "https://maven.shedaniel.me/" }
 | 
					 | 
				
			||||||
    maven { url "https://maven.terraformersmc.com/releases/" }
 | 
					 | 
				
			||||||
    maven {
 | 
					 | 
				
			||||||
        name = 'Ladysnake Mods'
 | 
					 | 
				
			||||||
        url = 'https://ladysnake.jfrog.io/artifactory/mods'
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    maven {
 | 
					    maven {
 | 
				
			||||||
        url = "https://api.modrinth.com/maven"
 | 
					        url = "https://api.modrinth.com/maven"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    maven {
 | 
					 | 
				
			||||||
        url = uri("https://ueaj.dev/maven")
 | 
					 | 
				
			||||||
        // for 0.4.2 and older
 | 
					 | 
				
			||||||
        // url uri("https://raw.githubusercontent.com/Devan-Kerman/Devan-Repo/master/")
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -46,14 +32,9 @@ dependencies {
 | 
				
			|||||||
	// Fabric API. This is technically optional, but you probably want it anyway.
 | 
						// Fabric API. This is technically optional, but you probably want it anyway.
 | 
				
			||||||
	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 | 
						modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Uncomment the following line to enable the deprecated Fabric API modules.
 | 
					 | 
				
			||||||
	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    modImplementation  "maven.modrinth:midnightlib:${project.midnightlib_version}"
 | 
					    modImplementation  "maven.modrinth:midnightlib:${project.midnightlib_version}"
 | 
				
			||||||
    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 | 
					    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version")
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 | 
						// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -92,6 +73,7 @@ jar {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.modrinth.minotaur.dependencies.DependencyType
 | 
				
			||||||
import com.modrinth.minotaur.dependencies.ModDependency
 | 
					import com.modrinth.minotaur.dependencies.ModDependency
 | 
				
			||||||
 | 
					
 | 
				
			||||||
modrinth {
 | 
					modrinth {
 | 
				
			||||||
@ -99,7 +81,8 @@ modrinth {
 | 
				
			|||||||
    uploadFile = remapJar // Tells Minotaur to use the remapped jar
 | 
					    uploadFile = remapJar // Tells Minotaur to use the remapped jar
 | 
				
			||||||
    versionType = "alpha"
 | 
					    versionType = "alpha"
 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
            new ModDependency('P7dR8mSH', 'required'), //required dependency on Fabric API
 | 
								new ModDependency('P7dR8mSH', DependencyType.REQUIRED), //required dependency on Fabric API
 | 
				
			||||||
 | 
								new ModDependency('codAaoxh', DependencyType.EMBEDDED), //embedded midnightlib
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
// configure the maven publication
 | 
					// configure the maven publication
 | 
				
			||||||
 | 
				
			|||||||
@ -1,17 +1,16 @@
 | 
				
			|||||||
org.gradle.jvmargs  = -Xmx1G
 | 
					org.gradle.jvmargs  = -Xmx1G
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#Fabric properties
 | 
					#Fabric properties
 | 
				
			||||||
minecraft_version=1.21
 | 
					minecraft_version=1.21.1
 | 
				
			||||||
yarn_mappings=1.21+build.8
 | 
					yarn_mappings=1.21.1+build.3
 | 
				
			||||||
loader_version=0.15.11
 | 
					loader_version=0.16.7
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Fabric API
 | 
					# Fabric API
 | 
				
			||||||
fabric_version=0.100.6+1.21
 | 
					fabric_version=0.105.0+1.21.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#Mod properties
 | 
					#Mod properties
 | 
				
			||||||
mod_version         = 0.10.2
 | 
					mod_version         = 0.10.2
 | 
				
			||||||
maven_group         = quimufu.simple_creator
 | 
					maven_group         = quimufu.simple_creator
 | 
				
			||||||
archives_base_name  = simple_creator
 | 
					archives_base_name  = simple_creator
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cloth_config_version=15.0.127
 | 
					midnightlib_version=1.6.3-fabric
 | 
				
			||||||
midnightlib_version=1.5.7-fabric
 | 
					 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@ -1,5 +1,7 @@
 | 
				
			|||||||
distributionBase=GRADLE_USER_HOME
 | 
					distributionBase=GRADLE_USER_HOME
 | 
				
			||||||
distributionPath=wrapper/dists
 | 
					distributionPath=wrapper/dists
 | 
				
			||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 | 
					distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 | 
				
			||||||
 | 
					networkTimeout=10000
 | 
				
			||||||
 | 
					validateDistributionUrl=true
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
zipStorePath=wrapper/dists
 | 
					zipStorePath=wrapper/dists
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										295
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										295
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							@ -1,7 +1,7 @@
 | 
				
			|||||||
#!/usr/bin/env sh
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Copyright 2015 the original author or authors.
 | 
					# Copyright © 2015-2021 the original authors.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Licensed under the Apache License, Version 2.0 (the "License");
 | 
					# Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
# you may not use this file except in compliance with the License.
 | 
					# you may not use this file except in compliance with the License.
 | 
				
			||||||
@ -17,78 +17,111 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
##############################################################################
 | 
					##############################################################################
 | 
				
			||||||
##
 | 
					#
 | 
				
			||||||
##  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/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 | 
				
			||||||
 | 
					#       within the Gradle project.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					#       You can find Gradle at https://github.com/gradle/gradle/.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
##############################################################################
 | 
					##############################################################################
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Attempt to set APP_HOME
 | 
					# Attempt to set APP_HOME
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Resolve links: $0 may be a link
 | 
					# Resolve links: $0 may be a link
 | 
				
			||||||
PRG="$0"
 | 
					app_path=$0
 | 
				
			||||||
# Need this for relative symlinks.
 | 
					
 | 
				
			||||||
while [ -h "$PRG" ] ; do
 | 
					# Need this for daisy-chained symlinks.
 | 
				
			||||||
    ls=`ls -ld "$PRG"`
 | 
					while
 | 
				
			||||||
    link=`expr "$ls" : '.*-> \(.*\)$'`
 | 
					    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
 | 
				
			||||||
    if expr "$link" : '/.*' > /dev/null; then
 | 
					    [ -h "$app_path" ]
 | 
				
			||||||
        PRG="$link"
 | 
					do
 | 
				
			||||||
    else
 | 
					    ls=$( ls -ld "$app_path" )
 | 
				
			||||||
        PRG=`dirname "$PRG"`"/$link"
 | 
					    link=${ls#*' -> '}
 | 
				
			||||||
    fi
 | 
					    case $link in             #(
 | 
				
			||||||
 | 
					      /*)   app_path=$link ;; #(
 | 
				
			||||||
 | 
					      *)    app_path=$APP_HOME$link ;;
 | 
				
			||||||
 | 
					    esac
 | 
				
			||||||
done
 | 
					done
 | 
				
			||||||
SAVED="`pwd`"
 | 
					 | 
				
			||||||
cd "`dirname \"$PRG\"`/" >/dev/null
 | 
					 | 
				
			||||||
APP_HOME="`pwd -P`"
 | 
					 | 
				
			||||||
cd "$SAVED" >/dev/null
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
APP_NAME="Gradle"
 | 
					# This is normally unused
 | 
				
			||||||
APP_BASE_NAME=`basename "$0"`
 | 
					# shellcheck disable=SC2034
 | 
				
			||||||
 | 
					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.
 | 
					# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
 | 
				
			||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 | 
					APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
 | 
					# Use the maximum available, or set MAX_FD != -1 to use that value.
 | 
				
			||||||
MAX_FD="maximum"
 | 
					MAX_FD=maximum
 | 
				
			||||||
 | 
					
 | 
				
			||||||
warn () {
 | 
					warn () {
 | 
				
			||||||
    echo "$*"
 | 
					    echo "$*"
 | 
				
			||||||
}
 | 
					} >&2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
die () {
 | 
					die () {
 | 
				
			||||||
    echo
 | 
					    echo
 | 
				
			||||||
    echo "$*"
 | 
					    echo "$*"
 | 
				
			||||||
    echo
 | 
					    echo
 | 
				
			||||||
    exit 1
 | 
					    exit 1
 | 
				
			||||||
}
 | 
					} >&2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# OS specific support (must be 'true' or 'false').
 | 
					# OS specific support (must be 'true' or 'false').
 | 
				
			||||||
cygwin=false
 | 
					cygwin=false
 | 
				
			||||||
msys=false
 | 
					msys=false
 | 
				
			||||||
darwin=false
 | 
					darwin=false
 | 
				
			||||||
nonstop=false
 | 
					nonstop=false
 | 
				
			||||||
case "`uname`" in
 | 
					case "$( uname )" in                #(
 | 
				
			||||||
  CYGWIN* )
 | 
					  CYGWIN* )         cygwin=true  ;; #(
 | 
				
			||||||
    cygwin=true
 | 
					  Darwin* )         darwin=true  ;; #(
 | 
				
			||||||
    ;;
 | 
					  MSYS* | MINGW* )  msys=true    ;; #(
 | 
				
			||||||
  Darwin* )
 | 
					  NONSTOP* )        nonstop=true ;;
 | 
				
			||||||
    darwin=true
 | 
					 | 
				
			||||||
    ;;
 | 
					 | 
				
			||||||
  MINGW* )
 | 
					 | 
				
			||||||
    msys=true
 | 
					 | 
				
			||||||
    ;;
 | 
					 | 
				
			||||||
  NONSTOP* )
 | 
					 | 
				
			||||||
    nonstop=true
 | 
					 | 
				
			||||||
    ;;
 | 
					 | 
				
			||||||
esac
 | 
					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
 | 
				
			||||||
        # IBM's JDK on AIX uses strange locations for the executables
 | 
					        # IBM's JDK on AIX uses strange locations for the executables
 | 
				
			||||||
        JAVACMD="$JAVA_HOME/jre/sh/java"
 | 
					        JAVACMD=$JAVA_HOME/jre/sh/java
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
        JAVACMD="$JAVA_HOME/bin/java"
 | 
					        JAVACMD=$JAVA_HOME/bin/java
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
    if [ ! -x "$JAVACMD" ] ; then
 | 
					    if [ ! -x "$JAVACMD" ] ; then
 | 
				
			||||||
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 | 
					        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 | 
				
			||||||
@ -97,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 | 
				
			|||||||
location of your Java installation."
 | 
					location of your Java installation."
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
else
 | 
					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.
 | 
					    if ! command -v java >/dev/null 2>&1
 | 
				
			||||||
 | 
					    then
 | 
				
			||||||
 | 
					        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
 | 
					Please set the JAVA_HOME variable in your environment to match the
 | 
				
			||||||
location of your Java installation."
 | 
					location of your Java installation."
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Increase the maximum file descriptors if we can.
 | 
					# Increase the maximum file descriptors if we can.
 | 
				
			||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
 | 
					if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
 | 
				
			||||||
    MAX_FD_LIMIT=`ulimit -H -n`
 | 
					    case $MAX_FD in #(
 | 
				
			||||||
    if [ $? -eq 0 ] ; then
 | 
					      max*)
 | 
				
			||||||
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
 | 
					        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
 | 
				
			||||||
            MAX_FD="$MAX_FD_LIMIT"
 | 
					        # shellcheck disable=SC2039,SC3045
 | 
				
			||||||
        fi
 | 
					        MAX_FD=$( ulimit -H -n ) ||
 | 
				
			||||||
        ulimit -n $MAX_FD
 | 
					            warn "Could not query maximum file descriptor limit"
 | 
				
			||||||
        if [ $? -ne 0 ] ; then
 | 
					    esac
 | 
				
			||||||
            warn "Could not set maximum file descriptor limit: $MAX_FD"
 | 
					    case $MAX_FD in  #(
 | 
				
			||||||
        fi
 | 
					      '' | soft) :;; #(
 | 
				
			||||||
    else
 | 
					      *)
 | 
				
			||||||
        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
 | 
					        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
 | 
				
			||||||
    fi
 | 
					        # shellcheck disable=SC2039,SC3045
 | 
				
			||||||
fi
 | 
					        ulimit -n "$MAX_FD" ||
 | 
				
			||||||
 | 
					            warn "Could not set maximum file descriptor limit to $MAX_FD"
 | 
				
			||||||
# 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
 | 
					    esac
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Escape application args
 | 
					# Collect all arguments for the java command, stacking in reverse order:
 | 
				
			||||||
save () {
 | 
					#   * args from the command line
 | 
				
			||||||
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
 | 
					#   * the main class name
 | 
				
			||||||
    echo " "
 | 
					#   * -classpath
 | 
				
			||||||
}
 | 
					#   * -D...appname settings
 | 
				
			||||||
APP_ARGS=$(save "$@")
 | 
					#   * --module-path (only if needed)
 | 
				
			||||||
 | 
					#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
 | 
					# For Cygwin or MSYS, switch paths to Windows format before running java
 | 
				
			||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 | 
					if "$cygwin" || "$msys" ; then
 | 
				
			||||||
 | 
					    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
 | 
				
			||||||
 | 
					    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
 | 
					    JAVACMD=$( cygpath --unix "$JAVACMD" )
 | 
				
			||||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
 | 
					
 | 
				
			||||||
  cd "$(dirname "$0")"
 | 
					    # Now convert the arguments - kludge to limit ourselves to /bin/sh
 | 
				
			||||||
 | 
					    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
 | 
				
			||||||
 | 
					        # 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
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# 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"'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Collect all arguments for the java command:
 | 
				
			||||||
 | 
					#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 | 
				
			||||||
 | 
					#     and any embedded shellness will be escaped.
 | 
				
			||||||
 | 
					#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 | 
				
			||||||
 | 
					#     treated as '${Hostname}' itself on the command line.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# 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" "$@"
 | 
					exec "$JAVACMD" "$@"
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										54
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										54
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							@ -26,9 +26,13 @@ if "%OS%"=="Windows_NT" setlocal
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
set DIRNAME=%~dp0
 | 
					set DIRNAME=%~dp0
 | 
				
			||||||
if "%DIRNAME%"=="" set DIRNAME=.
 | 
					if "%DIRNAME%"=="" set DIRNAME=.
 | 
				
			||||||
 | 
					@rem This is normally unused
 | 
				
			||||||
set APP_BASE_NAME=%~n0
 | 
					set APP_BASE_NAME=%~n0
 | 
				
			||||||
set APP_HOME=%DIRNAME%
 | 
					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.
 | 
					@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"
 | 
					set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -37,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
set JAVA_EXE=java.exe
 | 
					set JAVA_EXE=java.exe
 | 
				
			||||||
%JAVA_EXE% -version >NUL 2>&1
 | 
					%JAVA_EXE% -version >NUL 2>&1
 | 
				
			||||||
if "%ERRORLEVEL%" == "0" goto init
 | 
					if %ERRORLEVEL% equ 0 goto execute
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 | 
					echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo Please set the JAVA_HOME variable in your environment to match the
 | 
					echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 | 
				
			||||||
echo location of your Java installation.
 | 
					echo location of your Java installation. 1>&2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
goto fail
 | 
					goto fail
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -51,48 +55,36 @@ goto fail
 | 
				
			|||||||
set JAVA_HOME=%JAVA_HOME:"=%
 | 
					set JAVA_HOME=%JAVA_HOME:"=%
 | 
				
			||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 | 
					set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if exist "%JAVA_EXE%" goto init
 | 
					if exist "%JAVA_EXE%" goto execute
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 | 
					echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo Please set the JAVA_HOME variable in your environment to match the
 | 
					echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 | 
				
			||||||
echo location of your Java installation.
 | 
					echo location of your Java installation. 1>&2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
goto fail
 | 
					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
 | 
					:execute
 | 
				
			||||||
@rem Setup the command line
 | 
					@rem Setup the command line
 | 
				
			||||||
 | 
					
 | 
				
			||||||
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 %*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
:end
 | 
					:end
 | 
				
			||||||
@rem End local scope for the variables with windows NT shell
 | 
					@rem End local scope for the variables with windows NT shell
 | 
				
			||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
 | 
					if %ERRORLEVEL% equ 0 goto mainEnd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
:fail
 | 
					:fail
 | 
				
			||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 | 
					rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 | 
				
			||||||
rem the _cmd.exe /c_ return code!
 | 
					rem the _cmd.exe /c_ return code!
 | 
				
			||||||
if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
 | 
					set EXIT_CODE=%ERRORLEVEL%
 | 
				
			||||||
exit /b 1
 | 
					if %EXIT_CODE% equ 0 set EXIT_CODE=1
 | 
				
			||||||
 | 
					if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
 | 
				
			||||||
 | 
					exit /b %EXIT_CODE%
 | 
				
			||||||
 | 
					
 | 
				
			||||||
:mainEnd
 | 
					:mainEnd
 | 
				
			||||||
if "%OS%"=="Windows_NT" endlocal
 | 
					if "%OS%"=="Windows_NT" endlocal
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user