From 00981cf4e8f1080e7f7d84fdfbf103132baaf9cf Mon Sep 17 00:00:00 2001 From: inorichi Date: Wed, 25 Apr 2018 13:46:57 +0200 Subject: [PATCH] Include firebase analytics --- .travis/build.sh | 2 + .travis/google-services.json | 73 ++++++++++++++++++++++++++++++++++++ app/build.gradle | 8 +++- build.gradle | 3 +- 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 .travis/google-services.json diff --git a/.travis/build.sh b/.travis/build.sh index 049fd015be..cb7afd13cb 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -2,6 +2,8 @@ git fetch --unshallow #required for commit count +cp .travis/google-services.json app/ + if [ -z "$TRAVIS_TAG" ]; then ./gradlew clean assembleStandardDebug diff --git a/.travis/google-services.json b/.travis/google-services.json new file mode 100644 index 0000000000..72d54700e4 --- /dev/null +++ b/.travis/google-services.json @@ -0,0 +1,73 @@ +{ + "project_info": { + "project_number": "777921915939", + "firebase_url": "https://tachiyomi-47364.firebaseio.com", + "project_id": "tachiyomi-47364", + "storage_bucket": "tachiyomi-47364.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:777921915939:android:36544cd2d96c50c7", + "android_client_info": { + "package_name": "eu.kanade.tachiyomi" + } + }, + "oauth_client": [ + { + "client_id": "777921915939-9q25jvgbdtpk91daqlk7sa1cbdcg77o6.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAHr8RxyeiSPC_MxJTnivz-hmdo5oX0QQQ" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:777921915939:android:564fdc1d62efd1de", + "android_client_info": { + "package_name": "eu.kanade.tachiyomi.debug" + } + }, + "oauth_client": [ + { + "client_id": "777921915939-9q25jvgbdtpk91daqlk7sa1cbdcg77o6.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAHr8RxyeiSPC_MxJTnivz-hmdo5oX0QQQ" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 128071c98e..a084f78cbe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -120,6 +120,8 @@ dependencies { implementation 'com.android.support:multidex:1.0.2' + standardImplementation 'com.google.firebase:firebase-core:12.0.1' + // ReactiveX implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxjava:1.3.6' @@ -153,7 +155,7 @@ dependencies { // Job scheduling implementation 'com.evernote:android-job:1.2.4' - implementation 'com.google.android.gms:play-services-gcm:11.8.0' + implementation 'com.google.android.gms:play-services-gcm:12.0.1' // Changelog implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0' @@ -254,3 +256,7 @@ kotlin { androidExtensions { experimental = true } + +if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) { + apply plugin: 'com.google.gms.google-services' +} diff --git a/build.gradle b/build.gradle index 733287c0af..3cf40cda9a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,10 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.2' + classpath 'com.google.gms:google-services:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files }