From 966c861d2fdfb8975a101fdca8360394278d1b2a Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Mon, 8 May 2017 08:45:39 -0400 Subject: [PATCH] s/fatJar/shadowJar --- .travis.yml | 2 +- INTERNAL.md | 4 ++-- scripts/travis-ci/run-tests.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73192ef7..1f720399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect - git submodule update --init --recursive -script: ./gradlew build fatJar proguard +script: ./gradlew build shadowJar proguard branches: only: - master diff --git a/INTERNAL.md b/INTERNAL.md index dc72bdbb..24e79772 100644 --- a/INTERNAL.md +++ b/INTERNAL.md @@ -33,11 +33,11 @@ For example for the `2.2.1` release. In order to maintain a clean slate. Run `gradlew clean` to start from a clean slate. Now lets build the new version. We should not have any new commits since the tagged commit. - ./gradlew build fatJar proguard release + ./gradlew build shadowJar proguard release The build should tell you what version you are building and it should match the commits you made previously. - ➜ Apktool git:(master) ./gradlew build fatJar proguard release + ➜ Apktool git:(master) ./gradlew build shadowJar proguard release Building RELEASE (master): 2.2.2 ### Testing the binary. diff --git a/scripts/travis-ci/run-tests.sh b/scripts/travis-ci/run-tests.sh index 347df4f6..563869ce 100755 --- a/scripts/travis-ci/run-tests.sh +++ b/scripts/travis-ci/run-tests.sh @@ -1,2 +1,2 @@ #!/usr/bin/env sh -./gradlew build fatJar +./gradlew build shadowJar