diff --git a/app/build.gradle b/app/build.gradle index 88290578ee..dffc46f416 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ plugins { id "com.diffplug.gradle.spotless" version "3.23.1" + id "com.github.b3er.local.properties" version "1.1" } def rootConfiguration = {} @@ -15,6 +16,8 @@ def YOUTUBE_API_KEY = System.getenv('YOUTUBE_API_KEY') ?: "YOUR_API_KEY" //noinspection SpellCheckingInspection def MAPBOX_API_KEY = '"'+System.getenv('MAPBOX_API_KEY')+'"' ?: '"DEFAULT"' +def LOCAL_KEY_PRESENT = project.hasProperty('SIGNING_KEY_FILE') && rootProject.file(SIGNING_KEY_FILE).exists() + android { compileSdkVersion rootConfiguration.compileSdkVersion @@ -35,12 +38,34 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + signingConfigs { + if (CIRCLE_BUILD) { + release { + storeFile KEYSTORE_FILE + storePassword System.getenv("STORE_PASS") + keyAlias System.getenv("ALIAS") + keyPassword System.getenv("KEY_PASS") + } + } else if (LOCAL_KEY_PRESENT) { + release { + storeFile rootProject.file(SIGNING_KEY_FILE) + storePassword STORE_PASS + keyAlias ALIAS + keyPassword KEY_PASS + } + } + } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' buildConfigField "String", "SPEAKER_BASE_URL", '"http://10.0.0.1:5000"' buildConfigField "String", "MAPBOX_API_KEY", MAPBOX_API_KEY + + if (LOCAL_KEY_PRESENT || CIRCLE_BUILD) + signingConfig signingConfigs.release } debug { diff --git a/build.gradle b/build.gradle index c32a83a2bb..463fb1f2f0 100644 --- a/build.gradle +++ b/build.gradle @@ -21,5 +21,9 @@ allprojects { repositories { google() } -} + ext { + KEYSTORE_FILE = rootProject.file('scripts/key.jks') + CIRCLE_BUILD = System.getenv("CIRCLECI") == "true" && KEYSTORE_FILE.exists() + } +} diff --git a/circle.yml b/circle.yml index b881e8687e..33651095c4 100644 --- a/circle.yml +++ b/circle.yml @@ -26,12 +26,12 @@ jobs: - run: name: spotless check command: ./gradlew spotlessCheck - - run: - name: Run Tests - command: ./gradlew build - run: command: bash exec/prep-key.sh + - run: + name: Run Tests + command: ./gradlew build - run: command: bash exec/apk-gen.sh