From 92077203d88564f34fd049d02391b3b66a24f7b5 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 14 Oct 2015 07:55:47 -0500
Subject: [PATCH] have travis use github public URLs

attempt to run tests with default tasks

remove notifications & override install command

add git config setup for travis-ci

set email/name globally on travis-ci

run applyPatches before compileJava

remove incremental java build

add "build fatJar proguard" to script run

applyPatches before running script

Update build.gradle

add wrapper to footer (post cleanup)
---
 .travis.yml  | 17 ++++++++---------
 build.gradle | 15 ++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8cf5ccbf..93d8b798 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 env:
    - TERM=dumb
 language: java
+git:
+  submodules: false
 jdk:
   - openjdk7
   - oraclejdk7
@@ -8,18 +10,15 @@ jdk:
 os:
   - linux
 before_install:
+  - git config --global user.email "travis@connortumbleson.com"
+  - git config --global user.name "Travis CI Bot"
   - sudo apt-get update -qq
   - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
-script: ./scripts/travis-ci/run-tests.sh
+  - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
+  - git submodule update --init --recursive
+install: ./gradlew applyPatches
+script: ./gradlew build fatJar proguard
 branches:
   only:
     - master
     - stable
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#apktool"
-    on_success: change
-    on_failure: always
-    template:
-      - "%{repository_name} (%{commit}) : %{duration} - %{message}"
diff --git a/build.gradle b/build.gradle
index 44b7f3f1..3e0dfaf7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,6 @@ buildscript {
     }
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.incremental = true
     }
     dependencies {
         classpath 'eu.appsatori:gradle-fatjar-plugin:0.3'
@@ -36,7 +35,7 @@ apply from: 'gradle/functions.gradle'
 def apktoolversion_major = '2.0.3'
 def apktoolversion_minor = 'SNAPSHOT';
 
-defaultTasks 'clean', 'applyPatches', 'build', 'fatJar', 'proguard'
+defaultTasks 'build', 'fatJar', 'proguard'
 
 allprojects {
     apply plugin: 'java'
@@ -77,18 +76,12 @@ build.doFirst {
                 "Currently it is set to: " + System.getProperty("java.home")
         );
     }
-
-    println 'Applying smali patches...'
-    rootProject.tasks.applyPatches
 }
 
 clean.doFirst {
     delete "${rootDir}/brut.apktool.smali"
     println "deleting ${rootDir}/brut.apktool.smali in favor of smali"
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.3'
+    println "You will need to run applyPatches again, as they have been wiped."
 }
 
 // used for official releases only. Please don't use
@@ -138,3 +131,7 @@ subprojects {
         }
     }
 }
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.3'
+}