Merge branch 'Android_Dev' into Android_release

Forest/Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset

@@ -14,11 +14,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   selectedAppIndex: 0
   clientTokens:
-  - 0322ff953bd57fb04a65e6c9712299de
+  - 
   appIds:
-  - 358605903639996
+  - 
   appLabels:
-  - Forest Nuts and Bolts
+  - 
   cookie: 1
   logging: 1
   status: 1

Forest/Assets/Plugins/Android/AndroidManifest.xml

@@ -17,10 +17,10 @@
     <activity android:name="com.facebook.unity.FBUnityAppLinkActivity" android:exported="true" />
     <activity android:name="com.facebook.unity.FBUnityDeepLinkingActivity" android:exported="true" />
     <activity android:name="com.facebook.unity.FBUnityGameRequestActivity" />
-    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb358605903639996" />
-    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="0322ff953bd57fb04a65e6c9712299de" />
+    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="" />
+    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="" />
     <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="true" />
     <meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="true" />
-    <provider android:name="com.facebook.FacebookContentProvider" android:authorities="com.facebook.app.FacebookContentProvider358605903639996" android:exported="true" />
+    <!--<provider android:name="com.facebook.FacebookContentProvider" android:authorities="com.facebook.app.FacebookContentProvider358605903639996" android:exported="true" />-->
   </application>
 </manifest>

Forest/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@string/gcm_defaultSenderId,@string/google_storage_bucket,@string/project_id,@string/google_api_key,@string/google_crash_reporting_api_key,@string/google_app_id">
-  <string name="gcm_defaultSenderId" translatable="false">419683978289</string>
-  <string name="google_storage_bucket" translatable="false">forest-ecab9.appspot.com</string>
-  <string name="project_id" translatable="false">forest-ecab9</string>
-  <string name="google_api_key" translatable="false">AIzaSyD04yMvefyMunQ3fiVJHLzjCWFKqEuA1LM</string>
-  <string name="google_crash_reporting_api_key" translatable="false">AIzaSyD04yMvefyMunQ3fiVJHLzjCWFKqEuA1LM</string>
-  <string name="google_app_id" translatable="false">1:419683978289:android:43d76a971b667d590a5910</string>
+  <string name="gcm_defaultSenderId" translatable="false">538591464962</string>
+  <string name="google_storage_bucket" translatable="false">forest-7df8e.appspot.com</string>
+  <string name="project_id" translatable="false">forest-7df8e</string>
+  <string name="google_api_key" translatable="false">AIzaSyBMVG_JJZkMmEaApdiyCnWbBRQDy1kMAsw</string>
+  <string name="google_crash_reporting_api_key" translatable="false">AIzaSyBMVG_JJZkMmEaApdiyCnWbBRQDy1kMAsw</string>
+  <string name="google_app_id" translatable="false">1:538591464962:android:9dc6147831e4c0ce6ca11b</string>
 </resources>

Forest/Assets/StreamingAssets/google-services-desktop.json

@@ -7,22 +7,20 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:538591464962:ios:fe4e485e90fcf1256ca11b",
+        "mobilesdk_app_id": "1:538591464962:android:9dc6147831e4c0ce6ca11b",
         "android_client_info": {
-          "package_name": "com.woodfire.nutsbolts"
+          "package_name": "com.woodfire.androidnutsbolts"
         }
       },
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyDflprLn8mo0G5VOUSjhgvM7bhK7IoMQpo"
+          "current_key": "AIzaSyBMVG_JJZkMmEaApdiyCnWbBRQDy1kMAsw"
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 0
-        },
         "appinvite_service": {
-          "status": 1
+          "other_platform_oauth_client": []
         }
       }
     }

Forest/Assets/StreamingAssets/google-services-desktop.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6b5fb671f61b34183b2995f55bbf4f82
+guid: 8a48bce82d435444d932529df3936562
 TextScriptImporter:
   externalObjects: {}
   userData: 

Forest/Assets/google-services.json

@@ -7,9 +7,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:538591464962:android:f41f33f7dafdf0c06ca11b",
+        "mobilesdk_app_id": "1:538591464962:android:9dc6147831e4c0ce6ca11b",
         "android_client_info": {
-          "package_name": "com.woodfire.nutsbolts"
+          "package_name": "com.woodfire.androidnutsbolts"
         }
       },
       "oauth_client": [],

Forest/ProjectSettings/ProjectSettings.asset

@@ -158,7 +158,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.woodfire.nutsbolts
+    Android: com.woodfire.androidnutsbolts
     Standalone: com.woodfire.nutsbolts
     iPhone: com.woodfire.nutsbolts
   buildNumber: