ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-12 22:07:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2602 from Goooler/gradle7

Browse Source 
Bump gradle to 7.1 & update dependencies
This commit is contained in:
Connor Tumbleson 2021-07-02 06:14:00 -04:00 committed by GitHub
commit 5599e30206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brut.apktool/apktool-lib/build.gradle
View File

@ -22,9 +22,11 @@ processResources {
include '**/*.properties' include '**/*.properties'
into 'properties' into 'properties'
filter(ReplaceTokens, tokens: [version: project.apktool_version, gitrev: project.hash] ) filter(ReplaceTokens, tokens: [version: project.apktool_version, gitrev: project.hash] )
duplicatesStrategy = DuplicatesStrategy.INCLUDE
} }
from('src/main/resources/') { from('src/main/resources/') {
include '**/*.jar' include '**/*.jar'
duplicatesStrategy = DuplicatesStrategy.INCLUDE
} }
includeEmptyDirs = false includeEmptyDirs = false

8
build.gradle
View File

@ -26,12 +26,12 @@ buildscript {
depends = [ depends = [
baksmali : 'org.smali:baksmali:2.5.2', baksmali : 'org.smali:baksmali:2.5.2',
commons_cli : 'commons-cli:commons-cli:1.4', commons_cli : 'commons-cli:commons-cli:1.4',
commons_io : 'commons-io:commons-io:2.8.0', commons_io : 'commons-io:commons-io:2.10.0',
commons_lang : 'org.apache.commons:commons-lang3:3.12.0', commons_lang : 'org.apache.commons:commons-lang3:3.12.0',
guava : 'com.google.guava:guava:30.1.1-jre', guava : 'com.google.guava:guava:30.1.1-jre',
junit : 'junit:junit:4.13.2', junit : 'junit:junit:4.13.2',
proguard_gradle: 'com.guardsquare:proguard-gradle:7.0.1', proguard_gradle: 'com.guardsquare:proguard-gradle:7.1.0',
snakeyaml : 'org.yaml:snakeyaml:1.28:android', snakeyaml : 'org.yaml:snakeyaml:1.29:android',
smali : 'org.smali:smali:2.5.2', smali : 'org.smali:smali:2.5.2',
xmlpull : 'xpp3:xpp3:1.1.4c', xmlpull : 'xpp3:xpp3:1.1.4c',
xmlunit : 'xmlunit:xmlunit:1.6', xmlunit : 'xmlunit:xmlunit:1.6',
@ -47,7 +47,7 @@ buildscript {
} }
plugins { plugins {
id 'com.github.hierynomus.license' version '0.15.0' id 'com.github.hierynomus.license' version '0.16.1'
} }
apply from: 'gradle/functions.gradle' apply from: 'gradle/functions.gradle'

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

21
gradlew.bat vendored
View File

@ -40,7 +40,7 @@ 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%" == "0" goto execute
echo. echo.
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.
@ -54,7 +54,7 @@ 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.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -64,21 +64,6 @@ echo location of your Java installation.
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
@ -86,7 +71,7 @@ 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