diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad87f090..fb431c78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: distribution: 'zulu' java-version: ${{ matrix.java }} - name: Build and test - uses: gradle/gradle-build-action@v2.7.0 + uses: gradle/gradle-build-action@v2.7.1 with: arguments: build shadowJar proguard @@ -93,11 +93,11 @@ jobs: distribution: 'zulu' java-version: 17 - name: Build - uses: gradle/gradle-build-action@v2.7.0 + uses: gradle/gradle-build-action@v2.7.1 with: arguments: build shadowJar proguard - name: Upload uses: actions/upload-artifact@v3 with: name: apktool.jar - path: brut.apktool/apktool-cli/build/libs/apktool-*-small.jar + path: brut.apktool/apktool-cli/build/libs/apktool-*-SNAPSHOT.jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c4..7f93135c 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 c747538f..d11cdd90 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca1..0adc8e1a 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 diff --git a/scripts/linux/apktool b/scripts/linux/apktool index efbe419f..5ef7d329 100755 --- a/scripts/linux/apktool +++ b/scripts/linux/apktool @@ -53,7 +53,7 @@ javaOpts="" # line and adjust the value accordingly. Use "java -X" for a list of options # you can pass here. # -javaOpts="-Xmx512M -Dfile.encoding=utf-8 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true" +javaOpts="-Xmx1024M -Dfile.encoding=utf-8 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true" # Alternatively, this will extract any parameter "-Jxxx" from the command line # and pass them to Java (instead of to dx). This makes it possible for you to diff --git a/scripts/osx/apktool b/scripts/osx/apktool index 0d226244..ce14198e 100755 --- a/scripts/osx/apktool +++ b/scripts/osx/apktool @@ -53,7 +53,7 @@ javaOpts="" # line and adjust the value accordingly. Use "java -X" for a list of options # you can pass here. # -javaOpts="-Xmx512M -Dfile.encoding=utf-8 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true" +javaOpts="-Xmx1024M -Dfile.encoding=utf-8 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true" # Alternatively, this will extract any parameter "-Jxxx" from the command line # and pass them to Java (instead of to dx). This makes it possible for you to diff --git a/scripts/windows/apktool.bat b/scripts/windows/apktool.bat index 06cbd383..08adf635 100755 --- a/scripts/windows/apktool.bat +++ b/scripts/windows/apktool.bat @@ -36,7 +36,7 @@ if "%ATTR:~0,1%"=="-" if "%~x1"==".apk" ( ) :load -"%java_exe%" -jar -Duser.language=en -Dfile.encoding=UTF8 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true "%~dp0%BASENAME%%max%.jar" %fastCommand% %* +"%java_exe%" -jar -Xmx1024M -Duser.language=en -Dfile.encoding=UTF8 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true "%~dp0%BASENAME%%max%.jar" %fastCommand% %* rem Pause when ran non interactively for /f "tokens=2" %%# in ("%cmdcmdline%") do if /i "%%#" equ "/c" pause