diff --git a/Gemfile b/Gemfile index 7a118b49be..cdd3a6b349 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source "https://rubygems.org" gem "fastlane" + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/app/build.gradle b/app/build.gradle index a3a738a121..4e81272cfe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'io.fabric' +apply plugin: 'com.google.firebase.crashlytics' +apply plugin: 'com.google.gms.google-services' static def generateVersionName() { def gitCommitsCount = "git rev-list HEAD --count".execute().text.trim() @@ -29,24 +30,17 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.debug - buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("false")' - ext.enableCrashlytics = false } debug { debuggable true minifyEnabled false applicationIdSuffix ".dev" signingConfig signingConfigs.debug - buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("false")' - ext.enableCrashlytics = false } debug_beta { initWith debug versionNameSuffix "-beta" applicationIdSuffix ".debug" - buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("true")' - manifestPlaceholders = [fabric_api_key: properties.hasProperty('fabric_api_key') - ? project.property('fabric_api_key') : '000'] } } flavorDimensions "" @@ -75,7 +69,6 @@ android { repositories { maven { url "https://jitpack.io" } - maven { url 'https://maven.fabric.io/public' } } configurations { all*.exclude group: 'com.google.guava', module: 'listenablefuture' @@ -133,8 +126,8 @@ dependencies { // implementation 'com.github.stellar:java-stellar-sdk:0.4.1' implementation 'net.i2p.crypto:eddsa:0.3.0' - implementation('com.crashlytics.sdk.android:crashlytics:2.9.9') { transitive = true } - implementation('io.fabric.sdk.android:fabric:1.4.0@aar') { transitive = true } + implementation 'com.google.firebase:firebase-analytics:17.2.3' + implementation 'com.google.firebase:firebase-crashlytics:17.0.0-beta02' implementation files('libs/ripple-core-0.0.1.jar') //4 dependencies for ripple-core TODO: move to module? diff --git a/app/src/debug_beta/AndroidManifest.xml b/app/src/debug_beta/AndroidManifest.xml index 9f07ca1097..8cf74b318f 100644 --- a/app/src/debug_beta/AndroidManifest.xml +++ b/app/src/debug_beta/AndroidManifest.xml @@ -7,10 +7,6 @@ - -