ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-04-30 06:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to Gradle 5.1; fixed two issues, caused by the changes of the version upgrade; RESULT: build succeeds on Ubuntu 18.04 with openJDK 11; version details see below

Browse Source 
Gradle        5.1
Build time:   2019-01-02 18:57:47 UTC
Revision:     d09c2e354576ac41078c322815cc6db2b66d976e

Kotlin DSL:   1.1.0
Kotlin:       1.3.11
Groovy:       2.5.4
Ant:          Apache Ant(TM) version 1.9.13 compiled on July 10 2018
JVM:          11.0.2 (Oracle Corporation 11.0.2+9-Ubuntu-3ubuntu118.04.3)
OS:           Linux 4.15.0-47-generic amd64
Distro:       Ubuntu 18.04.2 LTS
This commit is contained in:
Gergely Nagy 2019-05-05 17:55:33 +02:00 committed by Ben Gruver
parent 76867f0ae9
commit c70a7008f6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -185,7 +185,7 @@ buildscript {
} }
} }
task wrapper(type: Wrapper) { wrapper {
gradleVersion = '4.6' gradleVersion = '5.1'
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
} }

4
dexlib2/build.gradle
View File

@ -81,7 +81,7 @@ task generateAccessorTestDex(type: JavaExec, dependsOn: compileAccessorTestJava)
def outputDex = file('src/test/resources/accessorTest.dex') def outputDex = file('src/test/resources/accessorTest.dex')
file(outputDex.parent).mkdirs() file(outputDex.parent).mkdirs()
inputs.dir(project.sourceSets.accessorTest.output.classesDir) inputs.dir(project.sourceSets.accessorTest.output.classesDirs)
outputs.file outputDex outputs.file outputDex
main 'com.android.dx.command.Main' main 'com.android.dx.command.Main'
@ -90,7 +90,7 @@ task generateAccessorTestDex(type: JavaExec, dependsOn: compileAccessorTestJava)
args '--dex' args '--dex'
args '--no-strict' args '--no-strict'
args "--output=${outputDex}" args "--output=${outputDex}"
args sourceSets.accessorTest.output.classesDir args sourceSets.accessorTest.output.classesDirs
} }
uploadArchives { uploadArchives {

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-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradlew vendored
View File

@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="" DEFAULT_JVM_OPTS='"-Xmx64m"'
# 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"

2
gradlew.bat vendored
View File

@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@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= set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome