Merge remote-tracking branch 'origin/master'

This commit is contained in:
Erick Clark 2018-05-28 14:10:17 -05:00
commit 868e61dfa4
3 changed files with 78 additions and 17 deletions

View file

@ -91,7 +91,7 @@ android {
applicationId "com.aretherecookies"
minSdkVersion 16
targetSdkVersion 22
versionCode 12
versionCode 18
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "x86"
@ -106,21 +106,11 @@ android {
}
}
signingConfigs {
debug {
if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
storeFile file(MYAPP_RELEASE_STORE_FILE)
storePassword MYAPP_RELEASE_STORE_PASSWORD
keyAlias MYAPP_RELEASE_KEY_ALIAS
keyPassword MYAPP_RELEASE_KEY_PASSWORD
}
}
release {
if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
storeFile file(MYAPP_RELEASE_STORE_FILE)
storePassword MYAPP_RELEASE_STORE_PASSWORD
keyAlias MYAPP_RELEASE_KEY_ALIAS
keyPassword MYAPP_RELEASE_KEY_PASSWORD
}
storeFile file(MYAPP_RELEASE_STORE_FILE)
storePassword MYAPP_RELEASE_STORE_PASSWORD
keyAlias MYAPP_RELEASE_KEY_ALIAS
keyPassword MYAPP_RELEASE_KEY_PASSWORD
}
}
buildTypes {
@ -129,6 +119,9 @@ android {
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
signingConfig signingConfigs.release
}
debug {
signingConfig signingConfigs.release
}
}
// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->

View file

@ -1 +1,67 @@
{"web":{"client_id":"648700523612-lm35m5d7m7k0sdutqmatbfhq2qsnd5if.apps.googleusercontent.com","project_id":"august-copilot-171122","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://accounts.google.com/o/oauth2/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"U44sJzIyL0yCreGpJ1v1saNZ"}}
{
"project_info": {
"project_number": "648700523612",
"firebase_url": "https://august-copilot-171122.firebaseio.com",
"project_id": "august-copilot-171122",
"storage_bucket": "august-copilot-171122.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:648700523612:android:6a01cf0d8c4bf5fc",
"android_client_info": {
"package_name": "com.aretherecookies"
}
},
"oauth_client": [
{
"client_id": "648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "648700523612-ej283bdvao87ra2c7sis40ofm00q0n86.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "648700523612-lm35m5d7m7k0sdutqmatbfhq2qsnd5if.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.aretherecookies",
"certificate_hash": "2d8bb3695a1f451c938dd3a137578bbd8cd98b3f"
}
},
{
"client_id": "648700523612-jbif6e356rc13pbcmrmc7gk212eelgcp.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBTyMv-J2YB8GT9DkSPiPOC7F1VS2KGY1o"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}

View file

@ -9,6 +9,8 @@ export type GoogleUser = {
};
export const authGoogle = async () => {
await GoogleSignin.configure();
await GoogleSignin.configure({
webClientId: '648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com',
});
return GoogleSignin.signIn();
};