diff --git a/.travis.yml b/.travis.yml index cda20a808..52a5ec313 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,10 @@ before_install: - tar xvf frost.tar - chmod +x gradlew after_success: -- chmod +x ./generate-apk-release.sh -# Do one or the other -- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishApkRelease; else ./generate-apk-release.sh; fi +- if [[ "$TRAVIS_BRANCH" != "master" ]]; then chmod +x ./generate-apk-release.sh; ./generate-apk-release.sh; fi script: - cd $TRAVIS_BUILD_DIR/ -- "./gradlew assembleReleaseTest" +- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishApkRelease; else ./gradlew assembleReleaseTest; fi notifications: email: false slack: diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt index a96af3782..645a62187 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt @@ -43,6 +43,7 @@ object IAB { helper!!.enableDebugLogging(BuildConfig.DEBUG, "Frost:") helper!!.startSetup { result -> + L.d("IAB setup finished; ${result.isSuccess}") if (result.isSuccess) { if (onStart(helper!!)) helper!!.disposeWhenFinished() @@ -142,6 +143,7 @@ fun Activity.getInventory( helper -> helper.queryInventoryAsync { res, inv -> + L.d("Inventory query finished") if (res.isFailure || inv == null) onFailed() else onSuccess(inv, helper) }