From 17591736c4630f6d9ad34d5e5d5347dd0c55df8c Mon Sep 17 00:00:00 2001
From: Leijurv <leijurv@gmail.com>
Date: Tue, 25 Sep 2018 07:33:16 -0700
Subject: [PATCH] version only in build.gradle

---
 .travis.yml  | 27 ++++++++++++++++-----------
 proguard.pro |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9b1a5881..32c19128 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,30 +5,35 @@ install:
 - ./gradlew build
 
 script:
+- VERSION = $(cat ../../build.gradle| grep "version '" | cut -d "'" -f 2-2)
 - wget https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip
 - unzip proguard6.0.3.zip 2>&1 > /dev/null
 - cd build/libs
-- cat ../../proguard.pro | grep -v "this is the rt jar" > proguard.pro
-- echo "-libraryjars '$(java -verbose 2>/dev/null | sed -ne '1 s/\[Opened \(.*\)\]/\1/p')'" >> proguard.pro
-- tail proguard.pro
-- wget https://www.dropbox.com/s/zmc2l3jnwdvzvak/tempLibraries.zip?dl=1
+- cat ../../proguard.pro | grep -v "this is the rt jar" | grep -v "\-injars" > api.pro # remove default rt jar and injar lines
+- echo "-libraryjars '$(java -verbose 2>/dev/null | sed -ne '1 s/\[Opened \(.*\)\]/\1/p')'" >> api.pro # insert correct rt.jar location
+- echo "-injars 'baritone-$VERSION.jar'" >> api.pro # insert current version
+- tail api.pro # debug, print out what the previous two commands generated
+- cat api.pro | grep -v "\-keep class baritone.api" > standalone.pro # standalone doesn't keep baritone api
+- wget https://www.dropbox.com/s/zmc2l3jnwdvzvak/tempLibraries.zip?dl=1 # i'm sorry
 - mv tempLibraries.zip?dl=1 tempLibraries.zip
 - unzip tempLibraries.zip
-- java -jar ../../proguard6.0.3/lib/proguard.jar @proguard.pro
-- mv Obfuscated/baritone-0.0.2.jar ../../baritone-optimized-0.0.2.jar
-- mv baritone-0.0.2.jar ../../baritone-0.0.2.jar
+- mkdir ../../dist
+- java -jar ../../proguard6.0.3/lib/proguard.jar @api.pro
+- mv Obfuscated/baritone-$VERSION.jar ../../dist/baritone-api-$VERSION.jar
+- java -jar ../../proguard6.0.3/lib/proguard.jar @standalone.pro
+- mv Obfuscated/baritone-$VERSION.jar ../../dist/baritone-standalone-$VERSION.jar
+- mv baritone-$VERSION.jar ../../dist/baritone-unoptimized-$VERSION.jar
 - cd ../..
-- shasum baritone-0.0.2.jar
-- shasum baritone-optimized-0.0.2.jar
+- shasum dist/*
 
 deploy:
   provider: releases
   api_key:
     secure: YOuiXoJNpB4bW89TQoY2IGXg0tqOKls55YMXsSPU6Mx8WzRu8CjjO/A8KA9nGfNrKM+NucjiKr/h53O2Dp2uyy0i0SLvav/G0MaBMeB1NlPRwFopi6tVPNaoZsvr8NW4BIURhspckYLpOTYWnfmOkIv8q7AxrjUZWPKDlq0dte20UxEqUE6msHJ7U9XlKo/4fX40kvWMfwGI2hTyAtL0cRT1QPsd+uW3OQjAPcQj+jKaWld46V8pBK8g9Qde9mo8HC9NBv97zw1bBF1EFkynW569kElHvaS2Opl2QLGaf66guDbpnqDpGHMhQrDdxsZHJ4RksyITn+8A9UArmbkU35BxKqBeQqOWxod2+M0axdLh1pvX43Q1t9n7RiZBf7GvV8vkXL5Sjf8v6Y4LqkJGhvQkTUwpH+0knwrE761DMCtBC34AiWG70D4u7msmhurkflr9kmRHSj/3lyJ1Q2lkt8L+FOAlQBVs64vXTsfgc6Yge7N0O3UD5hCkrDNoz3BzhNBdCkbdxdKCGip71UZgUNkPy9o3ui8jATNj9ypx3+U8ovqP0XWlJqUZmyeXyNGW9NrLeCkRLTlLnZ/dv6OPONa1oAu4TwF1w5A+TGRFZcZjH/PnZKZDQ1OYQOR6drLKRYdr2unvuf5KUKUGqZ7aYtLGhP0rBvGWddRV7DSmX/s=
   all_branches: true
+  file_glob: true
   file:
-    - baritone-0.0.2.jar
-    - baritone-optimized-0.0.2.jar
+  - dist/*
   skip_cleanup: true
   on:
     tags: true
diff --git a/proguard.pro b/proguard.pro
index 12ea2337..bafdfc90 100644
--- a/proguard.pro
+++ b/proguard.pro
@@ -1,4 +1,4 @@
--injars baritone-0.0.2.jar # idk if a wildcard would work here
+-injars baritone-0.0.2.jar
 -outjars Obfuscated