diff --git a/.travis.yml b/.travis.yml index e17c0d6..78af738 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,5 +32,5 @@ before_script: - adb shell input keyevent 82 & script: - - ./gradlew connectedInstrumentTest + - ./gradlew connectedAndroidTest \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 50a82ae..4451d32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 19 - versionCode 5 - versionName "0.4.1" + versionCode 6 + versionName "0.4.2" } compileOptions { @@ -69,31 +69,33 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -if (secretProps.hasProperty("DEPLOYGATE_USERNAME") && secretProps.hasProperty("DEPLOYGATE_TOKEN")) { + +if (secretProps.containsKey("DEPLOYGATE_USERNAME") && secretProps.containsKey("DEPLOYGATE_TOKEN")) { apply plugin: 'deploygate' + gradle.taskGraph.whenReady { graph -> - deploygate { - userName = secretProps.getProperty("DEPLOYGATE_USERNAME") - token = secretProps.getProperty("DEPLOYGATE_TOKEN") + project.configure(deploygate, { + userName = secretProps.getProperty("DEPLOYGATE_USERNAME") + token = secretProps.getProperty("DEPLOYGATE_TOKEN") - apks { - beta { - sourceFile = file("build/apk/app-beta-unaligned.apk") + apks { + beta { + sourceFile = file("build/apk/app-beta-unaligned.apk") - def betaComment = secretProps.getProperty("DEPLOYGATE_RELEASE_NOTES") - if (betaComment != null && betaComment.length() > 0) { - releaseNote = betaComment - message = betaComment - } + def betaComment = secretProps.getProperty("DEPLOYGATE_RELEASE_NOTES") + if (betaComment != null && betaComment.length() > 0) { + releaseNote = betaComment + message = betaComment + } - if (secretProps.hasProperty("DEPLOYGATE_DISTRIBUTION_ID")) { - distributionKey = secretProps.getProperty("DEPLOYGATE_DISTRIBUTION_ID") + if (secretProps.hasProperty("DEPLOYGATE_DISTRIBUTION_ID")) { + distributionKey = secretProps.getProperty("DEPLOYGATE_DISTRIBUTION_ID") + } } } - } + }) } - } def getReleaseNotes(flavor) {