From 7a6e3a63cb4ba0436cd16ea6e413d355ba81cd35 Mon Sep 17 00:00:00 2001
From: x-falcon <tbig858@gmail.com>
Date: Sun, 12 Jul 2020 21:51:28 +0800
Subject: [PATCH] use google firebase

---
 app/build.gradle                         | 22 +++++++++++-----------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c4799c5..147759c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.1"
     defaultConfig {
         applicationId "com.github.xfalcon.vhosts"
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 37
-        versionName "2.1.0"
+        targetSdkVersion 30
+        versionCode 38
+        versionName "2.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -17,11 +17,11 @@ android {
     }
     flavorDimensions "CHANNEL"
     productFlavors {
-        GooglePlay {
+        googleplay {
             dimension "CHANNEL"
             buildConfigField("boolean", "IS_GooglePlay", "true")
         }
-        Github {
+        github {
             dimension "CHANNEL"
             buildConfigField("boolean", "IS_GooglePlay", "false")
         }
@@ -44,12 +44,12 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation 'com.google.firebase:firebase-core:17.1.0'
+    implementation 'com.google.firebase:firebase-core:17.4.4'
 //    implementation files('libs/Baidu_Mtj_3.9.0.6.jar')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:appcompat-v7:30.0.3'
+    implementation 'com.android.support:cardview-v7:30.0.3'
+    implementation 'com.android.support:preference-v7:30.0.3'
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation 'com.android.support:preference-v7:28.0.0'
     implementation 'com.github.zcweng:switch-button:0.0.3@aar'
     implementation 'com.github.clans:fab:1.6.4'
     testImplementation 'junit:junit:4.12'
diff --git a/build.gradle b/build.gradle
index a71bcc1..887c4d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
         classpath 'com.google.gms:google-services:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be37285..bb1209b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 24 15:12:36 CST 2018
+#Sun May 24 22:22:26 CST 2020
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+zipStoreBase=GRADLE_USER_HOME