Gradle Changes to Build Repo with newest Android Studio #135
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
|
There was a problem hiding this comment. Don't we need to update the hash instead of removing it? |
||
| zipStorePath=wrapper/dists | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| #!/bin/sh | ||
|
There was a problem hiding this comment. Not sure we should update the scripts here as this is a security risk and rarely necessary. We do have a github action to verify the files, so maybe it is fine, but then we should use the latest version: https://github.com/onionshare/onionshare-android/blob/main/.github/workflows/build.yml#L13 |
||
|
|
||
| # | ||
| # 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. | ||
|
|
@@ -15,69 +15,104 @@ | |
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
||
| ############################################################################## | ||
| # | ||
| # 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 | ||
|
|
||
| # 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 | ||
|
|
||
| # This is normally unused | ||
| # shellcheck disable=SC2034 | ||
| APP_BASE_NAME=${0##*/} | ||
| # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) | ||
| APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s | ||
| ' "$PWD" ) || exit | ||
|
|
||
| # Use the maximum available, or set MAX_FD != -1 to use that value. | ||
| MAX_FD=maximum | ||
|
|
||
| warn () { | ||
| echo "$*" | ||
| } >&2 | ||
|
|
||
| die () { | ||
| echo | ||
| echo "$*" | ||
| echo | ||
| exit 1 | ||
| } >&2 | ||
|
|
||
| # 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 ;; #( | ||
| MSYS* | MINGW* ) msys=true ;; #( | ||
| NONSTOP* ) nonstop=true ;; | ||
| esac | ||
|
|
||
| CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | ||
|
|
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | |
| 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 | ||
|
|
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the | |
| location of your Java installation." | ||
| fi | ||
| else | ||
| JAVACMD=java | ||
| 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 | ||
| location of your Java installation." | ||
| fi | ||
| fi | ||
|
|
||
| # Increase the maximum file descriptors if we can. | ||
| if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then | ||
| case $MAX_FD in #( | ||
| max*) | ||
| # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. | ||
| # shellcheck disable=SC2039,SC3045 | ||
| MAX_FD=$( ulimit -H -n ) || | ||
| warn "Could not query maximum file descriptor limit" | ||
| esac | ||
| case $MAX_FD in #( | ||
| '' | soft) :;; #( | ||
| *) | ||
| # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. | ||
| # shellcheck disable=SC2039,SC3045 | ||
| ulimit -n "$MAX_FD" || | ||
| warn "Could not set maximum file descriptor limit to $MAX_FD" | ||
| esac | ||
| 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" ) | ||
|
|
||
| # 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 | ||
|
|
||
|
|
||
| # 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" "$@" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you add this? I think we want to be able to use VCS shared run configurations.