From e96651d20e8acfdb773ba209ebe76ec53083700e Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 2 Jul 2017 22:55:52 -0400
Subject: Update tar

---
 .travis.yml         |   2 +-
 app/build.gradle    |  16 ++++++++++------
 build.gradle        |   1 +
 files/frost.tar.enc | Bin 20496 -> 20496 bytes
 files/travis.sh     |  10 ++++++++++
 5 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 files/travis.sh

diff --git a/.travis.yml b/.travis.yml
index b053a80b..ce4d2533 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
 after_success:
 - chmod +x ./generate-apk-release.sh
 - "./generate-apk-release.sh"
-- "./gradlew publishApkRelease"
+- "./gradlew app:publishApkRelease"
 script:
 - cd $TRAVIS_BUILD_DIR/
 - "./gradlew assembleReleaseTest"
diff --git a/app/build.gradle b/app/build.gradle
index 10d0239e..921517e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,12 +8,21 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 
+play {
+    jsonFile = file('../files/gplay-keys.json')
+    track = 'beta'
+    uploadImages = false
+    untrackOld = true
+}
+
 android {
     compileSdkVersion Integer.parseInt(project.TARGET_SDK)
     buildToolsVersion project.BUILD_TOOLS
 
+	def offset = System.getenv("TRAVIS_BUILD_NUMBER") ?: 0
+	
     androidGitVersion {
-        baseCode System.getEnv('TRAVIS_BUILD_NUMBER') ?: 0
+        baseCode offset
         codeFormat = 'MMNNPPXX'
         prefix 'v'
     }
@@ -31,7 +40,6 @@ android {
         versionCode androidGitVersion.code()
         versionName androidGitVersion.name()
         multiDexEnabled true
-		playAccountConfig = playAccountConfigs.defaultAccountConfig
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -155,8 +163,4 @@ dependencies {
         transitive = true;
     }
 
-}
-
-play {
-    track = 'alpha'
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a79419bc..9d775f6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         jcenter()
+		mavenCentral()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
diff --git a/files/frost.tar.enc b/files/frost.tar.enc
index e22aca0e..55bbad76 100644
Binary files a/files/frost.tar.enc and b/files/frost.tar.enc differ
diff --git a/files/travis.sh b/files/travis.sh
new file mode 100644
index 00000000..0c8cc97b
--- /dev/null
+++ b/files/travis.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Add appropriate files for encryption
+
+rm frost.tar.enc
+cd ..
+tar cvf frost.tar files/gplay-keys.json files/play.keystore files/play.properties files/test.keystore app/fabric.properties
+travis encrypt-file frost.tar --add
+rm frost.tar
+mv frost.tar.enc files/
\ No newline at end of file
-- 
cgit v1.2.3