ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-08 18:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use newer jcommander version for release

Browse Source 
The newer version has some fixes we need, but we should still ensure
that we can compile against the old version, since that's the version
currently in AOSP.
This commit is contained in:
Ben Gruver 2017-03-21 21:22:06 -07:00
parent 9e3e86fda0
commit 75fdec6e1d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -32,8 +32,13 @@
apply plugin: 'idea' apply plugin: 'idea'
version = '2.2b4' version = '2.2b4'
def jcommanderVersion = ''
if (!('release' in gradle.startParameter.taskNames)) { if (!('release' in gradle.startParameter.taskNames)) {
// we compile against 1.48 normally, to match what's in AOSP, but switch to a newer version
// for release, because it has some fixes required when running on Android
jcommanderVersion = 'com.beust:jcommander:1.48'
def versionSuffix def versionSuffix
try { try {
def git = org.eclipse.jgit.api.Git.open(file('.')) def git = org.eclipse.jgit.api.Git.open(file('.'))
@ -51,6 +56,8 @@ if (!('release' in gradle.startParameter.taskNames)) {
version += "-${versionSuffix}" version += "-${versionSuffix}"
} else { } else {
jcommanderVersion = 'com.beust:jcommander:1.64'
if (System.env.JDK6_HOME == null && !JavaVersion.current().isJava6()) { if (System.env.JDK6_HOME == null && !JavaVersion.current().isJava6()) {
throw new InvalidUserDataException("bzzzzzzzt. Release builds must be performed with java 6. " + throw new InvalidUserDataException("bzzzzzzzt. Release builds must be performed with java 6. " +
"Either run gradle with java 6, or define the JDK6_HOME environment variable.") "Either run gradle with java 6, or define the JDK6_HOME environment variable.")
@ -109,7 +116,7 @@ subprojects {
proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1', proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1',
dx: 'com.google.android.tools:dx:1.7', dx: 'com.google.android.tools:dx:1.7',
gson: 'com.google.code.gson:gson:2.3.1', gson: 'com.google.code.gson:gson:2.3.1',
jcommander: 'com.beust:jcommander:1.48' jcommander: jcommanderVersion
] ]
} }