Browse Source

Up Gradle Plugin and Firebase

Disabled Firebase for Debug build (also removed associated google-services.json)
pull/24/head
Ezerous 7 years ago
parent
commit
8962f9fa54
  1. 4
      .gitignore
  2. 6
      app/build.gradle
  3. 42
      app/src/debug/google-services.json
  4. 1
      app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
  5. 2
      build.gradle
  6. 4
      gradle/wrapper/gradle-wrapper.properties

4
.gitignore

@ -46,5 +46,5 @@ captures/
### Android Patch ### ### Android Patch ###
gen-external-apklibs gen-external-apklibs
# Google Services (release build) # Google Services JSON
app/src/release/google-services.json google-services.json

6
app/build.gradle

@ -20,7 +20,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
/*debug { /*debug {
def date = new Date().format('ddMMyy_HH'); def date = new Date().format('ddMMyy_HHmmss');
archivesBaseName = archivesBaseName + "-$date" archivesBaseName = archivesBaseName + "-$date"
}*/ }*/
} }
@ -33,7 +33,7 @@ dependencies {
compile 'com.android.support:support-v4:26.1.0' compile 'com.android.support:support-v4:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0' compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0' compile 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.google.firebase:firebase-crash:10.2.6' compile 'com.google.firebase:firebase-crash:11.4.2'
compile 'com.squareup.okhttp3:okhttp:3.9.0' compile 'com.squareup.okhttp3:okhttp:3.9.0'
compile 'com.squareup.picasso:picasso:2.5.2' compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
@ -50,4 +50,6 @@ dependencies {
compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.timber:timber:4.5.1'
} }
if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Debug")){
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
}

42
app/src/debug/google-services.json

@ -1,42 +0,0 @@
{
"project_info": {
"project_number": "934432863001",
"firebase_url": "https://mthmmy-debug.firebaseio.com",
"project_id": "mthmmy-debug",
"storage_bucket": "mthmmy-debug.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:934432863001:android:088be0537ff6b292",
"android_client_info": {
"package_name": "gr.thmmy.mthmmy"
}
},
"oauth_client": [
{
"client_id": "934432863001-d5oocs1vdi0pcepesi55a41p7enphfcv.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyD4-gwVcb2Rc8zeT8l1v2Lg1DU0QgfGtk8"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}

1
app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java

@ -7,7 +7,6 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Environment; import android.os.Environment;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import java.io.File; import java.io.File;

2
build.gradle

@ -6,7 +6,7 @@ buildscript {
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.google.gms:google-services:3.1.0' classpath 'com.google.gms:google-services:3.1.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties

@ -1,6 +1,6 @@
#Wed Mar 08 11:25:21 EET 2017 #Thu Oct 26 11:21:06 EEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

Loading…
Cancel
Save