diff --git a/.travis.yml b/.travis.yml index 22ce0055..21a69567 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,9 @@ android: # Set up Android-sdk and the emulator before_install: - # Decrypt keystore - - openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in keystore.enc -out keystore -d + # Decrypt keystore and google-services.json + - openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in secrets.tar.enc -out secrets.tar -d + - tar xvf secrets.tar - echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid warning - ls -lar $HOME/**/* @@ -49,7 +50,7 @@ before_install: - yes | sdkmanager "platforms;android-${EMULATOR_API_LEVEL}" # Android platform required by emulator - yes | sdkmanager "platforms;android-${COMPILE_API_LEVEL}" # Android platform required by compiler - yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" # Android build tools - - yes | sdkmanager "${EMULATOR}" # Install emulator system image + - yes | sdkmanager "${EMULATOR}" # Install emulator system image - sdkmanager --list || true # Print out package list for debug purposes # Run the emulator diff --git a/build.gradle b/build.gradle index 30b41283..6e29944a 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.google.gms:google-services:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:$realm_version" } diff --git a/keystore.enc b/keystore.enc deleted file mode 100644 index 89817b4d..00000000 Binary files a/keystore.enc and /dev/null differ diff --git a/presentation/build.gradle b/presentation/build.gradle index 8decc86b..b3bf8ce1 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -179,6 +179,7 @@ dependencies { implementation "com.bugsnag:bugsnag-android:4.1.1" implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" + implementation 'com.google.firebase:firebase-core:16.0.9' implementation "com.google.android:flexbox:0.3.1" implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" @@ -193,3 +194,5 @@ dependencies { withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug') withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease') } + +apply plugin: 'com.google.gms.google-services' diff --git a/secrets.tar.enc b/secrets.tar.enc new file mode 100644 index 00000000..124887a3 Binary files /dev/null and b/secrets.tar.enc differ