mirror of
https://github.com/revanced/Apktool.git
synced 2025-04-30 22:24:25 +02:00
Support JDK 8
- no proguard if using jdk8 - add jdk8 to travis
This commit is contained in:
parent
e8dae927d4
commit
192ab43112
@ -4,6 +4,7 @@ language: java
|
|||||||
jdk:
|
jdk:
|
||||||
- openjdk7
|
- openjdk7
|
||||||
- oraclejdk7
|
- oraclejdk7
|
||||||
|
- oraclejdk8
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get update -qq
|
- sudo apt-get update -qq
|
||||||
- sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
|
- sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
|
||||||
|
14
build.gradle
14
build.gradle
@ -13,15 +13,17 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
apply plugin: 'java'
|
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
apply from: 'gradle/functions.gradle'
|
apply from: 'gradle/functions.gradle'
|
||||||
|
|
||||||
def apktoolversion_major = '2.0.0'
|
def apktoolversion_major = '2.0.0'
|
||||||
def apktoolversion_minor = 'RC2';
|
def apktoolversion_minor = 'RC2';
|
||||||
|
|
||||||
sourceCompatibility = 1.7
|
allprojects {
|
||||||
targetCompatibility = 1.7
|
apply plugin: 'java'
|
||||||
|
sourceCompatibility = 1.7
|
||||||
|
targetCompatibility = 1.7
|
||||||
|
}
|
||||||
|
|
||||||
if (!('release' in gradle.startParameter.taskNames)) {
|
if (!('release' in gradle.startParameter.taskNames)) {
|
||||||
def hash = getCheckedOutGitCommitHash();
|
def hash = getCheckedOutGitCommitHash();
|
||||||
@ -44,11 +46,11 @@ if (!('release' in gradle.startParameter.taskNames)) {
|
|||||||
build.doFirst {
|
build.doFirst {
|
||||||
def javaVersion = System.getProperty("java.version")
|
def javaVersion = System.getProperty("java.version")
|
||||||
|
|
||||||
//fail the build if we don't have the expected Java version
|
//fail the build if we java 1.5 or 1.6.
|
||||||
if (!javaVersion.startsWith("1.7")) {
|
if (javaVersion.startsWith("1.5") || javaVersion.startsWith("1.6")) {
|
||||||
throw new GradleException("You can fix this problem!\n" +
|
throw new GradleException("You can fix this problem!\n" +
|
||||||
"We found a " + javaVersion + " JDK\n" +
|
"We found a " + javaVersion + " JDK\n" +
|
||||||
"Please update JAVA_HOME to use a 1.7 JDK\n" +
|
"Please update JAVA_HOME to use at least a 1.7 JDK\n" +
|
||||||
"Currently it is set to: " + System.getProperty("java.home")
|
"Currently it is set to: " + System.getProperty("java.home")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
./gradlew build fatJar proguard
|
./gradlew build fatJar
|
||||||
|
Loading…
x
Reference in New Issue
Block a user