Merge branch 'master' into branched

# Conflicts:
#	app/build.gradle

app/build.gradle

@@ -23,7 +23,7 @@ android {
     defaultConfig {
         applicationId "h_mal.appttude.com"
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 6
         versionName "1.6"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -34,13 +34,14 @@ android {
             storePassword relStorePassword
             keyPassword relKeyPassword
             keyAlias relKeyAlias
-            storeFile file(relStoreFile)
+//            storeFile file(relStoreFile)
         }
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

app/google-services.json

@@ -1,42 +0,0 @@
-{
-  "project_info": {
-    "project_number": "311398117829",
-    "firebase_url": "https://driver-8f4a1.firebaseio.com",
-    "project_id": "driver-8f4a1",
-    "storage_bucket": "driver-8f4a1.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:311398117829:android:cd8a17ae21224023",
-        "android_client_info": {
-          "package_name": "h_mal.appttude.com.driver"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "311398117829-ma5nflm7hviakaq16o2r0pubce6ar4rn.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDGShfTzdvwsoYOqtb5pwcnxPxec9u9f8Y"
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/src/testDebug/java/driver/ExampleUnitTest.java

@@ -1,9 +1,9 @@
-package h_mal.appttude.com.driver;
-
-import org.junit.Test;
+package driver;
 
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 /**
  * Example local unit test, which will execute on the development machine (host).
  *