Browse Source

- 서버 환경에 따른 패키지 분리

yeongyun 6 years ago
parent
commit
1580f71f5a

+ 6 - 3
app/build.gradle

@@ -49,11 +49,12 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            manifestPlaceholders = [appLabel: "@string/app_name"]
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            versionNameSuffix "-debug"
+//            versionNameSuffix "-debug"
             manifestPlaceholders = [appLabel: "@string/app_name_debug"]
             signingConfig signingConfigs.release
 //            signingConfig signingConfigs.debug
@@ -89,8 +90,10 @@ android {
 //            buildConfigField "String", "PRODUCT_USER_2", "\"" + developProperties['PRODUCT_USER_2'] + "\""
 //        }
         dev {
+//            manifestPlaceholders = [appLabel: "@string/app_name_debug"]
+            applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            manifestPlaceholders = [appLabel: "@string/app_name"]
+//            manifestPlaceholders = [appLabel: "@string/app_name_dev"]
 
             // defining the test properties
             buildConfigField "String", "DEV_USER_1", "\"" + developProperties['DEV_USER_1'] + "\""
@@ -100,7 +103,7 @@ android {
         }
         product {
             versionNameSuffix ""
-            manifestPlaceholders = [appLabel: "@string/app_name"]
+//            manifestPlaceholders = [appLabel: "@string/app_name"]
 
             // defining the test properties
             buildConfigField "String", "DEV_USER_1", "\"\""

+ 79 - 10
app/google-services.json

@@ -15,11 +15,11 @@
       },
       "oauth_client": [
         {
-          "client_id": "275091515322-0lckh93v5fm8u2a559937tmnhbkr4smd.apps.googleusercontent.com",
+          "client_id": "275091515322-7t0m29jqkqkbkjb037ted83fe6pugpl8.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "kr.co.zumo.app",
-            "certificate_hash": "74e73019caa49c847e2cdde659c672ee1bdfaf82"
+            "certificate_hash": "9183a014b4254f1b659ad4de9c2628908aeb3e3a"
           }
         },
         {
@@ -30,6 +30,14 @@
             "certificate_hash": "b77ac7713d85b107cc2c0a9114f166252c70c95f"
           }
         },
+        {
+          "client_id": "275091515322-0lckh93v5fm8u2a559937tmnhbkr4smd.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "kr.co.zumo.app",
+            "certificate_hash": "74e73019caa49c847e2cdde659c672ee1bdfaf82"
+          }
+        },
         {
           "client_id": "275091515322-5s42151gg2nqvpi4uc7njs8jkrh3c9m3.apps.googleusercontent.com",
           "client_type": 1,
@@ -39,7 +47,7 @@
           }
         },
         {
-          "client_id": "275091515322-aud8fhp224fcc1e73fdfaskvd28h5vk3.apps.googleusercontent.com",
+          "client_id": "275091515322-fcd2jjc7ruks12eu4git4tg9q18i8q6g.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
@@ -49,11 +57,7 @@
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 2,
           "other_platform_oauth_client": [
             {
               "client_id": "275091515322-fcd2jjc7ruks12eu4git4tg9q18i8q6g.apps.googleusercontent.com",
@@ -67,12 +71,77 @@
               }
             }
           ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:275091515322:android:484165d89e688a9f",
+        "android_client_info": {
+          "package_name": "kr.co.zumo.app.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "275091515322-t6jfu90umvfh3lp8nsogp44jfk5tjtt9.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "kr.co.zumo.app.dev",
+            "certificate_hash": "9183a014b4254f1b659ad4de9c2628908aeb3e3a"
+          }
+        },
+        {
+          "client_id": "275091515322-hea0akkc441qpf3n2bor6vv5999knjmk.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "kr.co.zumo.app.dev",
+            "certificate_hash": "51b4ccec2e8ad241d449a6ebe7c5b4b1de6dc6dc"
+          }
         },
-        "ads_service": {
-          "status": 2
+        {
+          "client_id": "275091515322-ocb0ksrg8qdkm6rqfummjqb8j6pskuts.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "kr.co.zumo.app.dev",
+            "certificate_hash": "b77ac7713d85b107cc2c0a9114f166252c70c95f"
+          }
+        },
+        {
+          "client_id": "275091515322-4k1nhaiiftevlk4hl1n304oeh6cd3l5p.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "kr.co.zumo.app.dev",
+            "certificate_hash": "74e73019caa49c847e2cdde659c672ee1bdfaf82"
+          }
+        },
+        {
+          "client_id": "275091515322-fcd2jjc7ruks12eu4git4tg9q18i8q6g.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBCAincXw5F-r9oGLDGmmo4F9pspTSttqM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "275091515322-fcd2jjc7ruks12eu4git4tg9q18i8q6g.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "275091515322-t4a5ursrh04bqokm85495pclu3snsssb.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "kr.ZUMO.appdev"
+              }
+            }
+          ]
         }
       }
     }
   ],
   "configuration_version": "1"
-}
+}

+ 3 - 2
app/src/dev/res/values/app.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" translatable="false">ZUMO - dev(release)</string>
-  <string name="app_name_debug" translatable="false">ZUMO - dev(debug)</string>
+  <string name="app_name" translatable="false">ZUMO - dev</string>
+  <string name="app_name_debug" translatable="false">ZUMO - dev (debug)</string>
+  <string name="fb_authorities">com.facebook.app.FacebookContentProvider252658048750866</string>
 </resources>

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -208,7 +208,7 @@
 
         <provider
             android:name="com.facebook.FacebookContentProvider"
-            android:authorities="com.facebook.app.FacebookContentProvider252658048750865"
+            android:authorities="@string/fb_authorities"
             android:exported="true" />
 
         <meta-data

+ 1 - 0
app/src/product/res/values/app.xml

@@ -2,4 +2,5 @@
 <resources>
   <string name="app_name" translatable="false">ZUMO</string>
   <string name="app_name_debug" translatable="false">ZUMO (debug)</string>
+  <string name="fb_authorities">com.facebook.app.FacebookContentProvider252658048750865</string>
 </resources>