Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gradle -> 8.4 #510

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Gradle -> 8.4 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,6 @@ tasks.register("uploadSnapshot") {
}

wrapper {
gradleVersion = "8.0.2"
gradleVersion = "8.4"
distributionType = Wrapper.DistributionType.ALL
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# 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"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ 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.
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=SC3045
# 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=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# 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.

# 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" \
Expand Down
16 changes: 8 additions & 8 deletions src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class IntegrationSpec extends Specification {

where:
agpVersion | gradleVersion || numMethods | numClasses | numFields
"8.1.0-alpha11" | "8.0.2" || 6935 | 1024 | 2528
"8.0.0" | "8.0.2" || 6929 | 1020 | 2528
"8.1.0-alpha11" | "8.4" || 6935 | 1024 | 2528
"8.0.0" | "8.4" || 6929 | 1020 | 2528
"7.4.1" | "7.6" || 7273 | 1065 | 2657
"7.3.1" | "7.6" || 7263 | 1037 | 2666
"7.2.2" | "7.6" || 7410 | 925 | 2666
Expand Down Expand Up @@ -85,8 +85,8 @@ class IntegrationSpec extends Specification {

where:
agpVersion | gradleVersion || numMethods | numClasses | numFields
"8.1.0-alpha11" | "8.0.2" || 4 | 3 | 0
"8.0.0" | "8.0.2" || 4 | 3 | 0
"8.1.0-alpha11" | "8.4" || 4 | 3 | 0
"8.0.0" | "8.4" || 4 | 3 | 0
"7.4.1" | "7.6" || 7 | 5 | 3
"7.3.1" | "7.6" || 7 | 5 | 3
"7.2.2" | "7.6" || 7 | 5 | 3
Expand Down Expand Up @@ -115,8 +115,8 @@ class IntegrationSpec extends Specification {

where:
agpVersion | gradleVersion || numMethods | numClasses | numFields
"8.1.0-alpha11" | "8.0.2" || 4240 | 725 | 1265
"8.0.0" | "8.0.2" || 4240 | 725 | 1265
"8.1.0-alpha11" | "8.4" || 4240 | 725 | 1265
"8.0.0" | "8.4" || 4240 | 725 | 1265
"7.4.1" | "7.6" || 4242 | 726 | 1268
"7.3.1" | "7.6" || 4277 | 745 | 1284
"7.2.2" | "7.6" || 4266 | 723 | 1268
Expand Down Expand Up @@ -145,8 +145,8 @@ class IntegrationSpec extends Specification {

where:
agpVersion | gradleVersion || numMethods | numClasses | numFields
"8.1.0-alpha11" | "8.0.2" || 6935 | 1024 | 2528
"8.0.0" | "8.0.2" || 6929 | 1020 | 2528
"8.1.0-alpha11" | "8.4" || 6935 | 1024 | 2528
"8.0.0" | "8.4" || 6929 | 1020 | 2528
"7.4.1" | "7.6" || 7273 | 1065 | 2657
"7.3.1" | "7.6" || 7263 | 1037 | 2666
"7.2.2" | "7.6" || 7410 | 925 | 2666
Expand Down
Loading