Skip to content

Stabilize Build #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2018
Merged

Stabilize Build #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ android:
before_script:
- cp library/google-services.json app/google-services.json
- cp library/google-services.json proguard-tests/google-services.json
script: ./gradlew clean assembleDebug proguard-tests:build check
script:
- ./gradlew clean
- ./gradlew assembleDebug proguard-tests:build check
after_success: ./scripts/artifactory.sh
after_failure:
# tests
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ object Config {
}

object Plugins {
const val android = "com.android.tools.build:gradle:3.2.0-rc01"
const val android = "com.android.tools.build:gradle:3.2.0-rc03"
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
const val google = "com.google.gms:google-services:4.1.0"
const val google = "com.google.gms:google-services:4.0.2"

const val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
Expand Down
7 changes: 6 additions & 1 deletion proguard-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// This is always set to 'true' on Travis CI
val inCiBuild = System.getenv("CI") == "true"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would check for nullity instead so we're resilient to possible changes: https://github.com/SUPERCILEX/Robot-Scouter/blob/2da4e7eed01da413eb151ce8cb09c75e33e7d53d/buildSrc/src/main/kotlin/com/supercilex/robotscouter/build/internal/Constants.kt#L8


android {
defaultConfig {
multiDexEnabled = true
Expand All @@ -23,7 +26,9 @@ android {
}

variantFilter {
if (name == "debug") setIgnore(true)
if (inCiBuild && name == "debug") {
setIgnore(true)
}
}
}

Expand Down