diff --git a/android/app/build.gradle b/android/app/build.gradle index 4868957..265c88e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -138,6 +138,7 @@ android { } dependencies { + compile project(':react-native-google-signin') compile project(':react-native-image-resizer') compile project(':react-native-facebook-login') compile project(':react-native-maps') diff --git a/android/app/src/main/java/com/aretherecookies/MainApplication.java b/android/app/src/main/java/com/aretherecookies/MainApplication.java index 694d0e7..5edbe25 100644 --- a/android/app/src/main/java/com/aretherecookies/MainApplication.java +++ b/android/app/src/main/java/com/aretherecookies/MainApplication.java @@ -3,6 +3,7 @@ package com.aretherecookies; import android.app.Application; import com.facebook.react.ReactApplication; +import co.apptailor.googlesignin.RNGoogleSigninPackage; import fr.bamlab.rnimageresizer.ImageResizerPackage; import com.airbnb.android.react.maps.MapsPackage; import com.oblador.vectoricons.VectorIconsPackage; @@ -29,6 +30,7 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { return Arrays.asList( new MainReactPackage(), + new RNGoogleSigninPackage(), new ImageResizerPackage(), new MapsPackage(), new VectorIconsPackage(), diff --git a/android/settings.gradle b/android/settings.gradle index 7ade660..0c06268 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,6 @@ rootProject.name = 'AreThereCookies' +include ':react-native-google-signin' +project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android') include ':react-native-image-resizer' project(':react-native-image-resizer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-resizer/android') include ':react-native-facebook-login' diff --git a/ios/AreThereCookies.xcodeproj/project.pbxproj b/ios/AreThereCookies.xcodeproj/project.pbxproj index 3c58720..10ac2cb 100644 --- a/ios/AreThereCookies.xcodeproj/project.pbxproj +++ b/ios/AreThereCookies.xcodeproj/project.pbxproj @@ -50,6 +50,11 @@ B861BE92B155457990C8500E /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D53B3F694EB44AC8B196FE53 /* Zocial.ttf */; }; 58AA5BD96D1F473CAF1D0297 /* libAirMaps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 484774914A724BB18F8CBAC7 /* libAirMaps.a */; }; 1242B1F0F0FB4315B5CADEC5 /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E3D55C0169946DB80AA27E5 /* libRCTImageResizer.a */; }; + 1BD2BAB0FAA749D0B304C4C8 /* libRNGoogleSignin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9FE98739524051A7B75613 /* libRNGoogleSignin.a */; }; + 5AAA204F998B478B8817CB33 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E8312BB21594022857FE94F /* libz.tbd */; }; + EA087CEA76394C3DB637FCA4 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A166D2AEF7429D9D52FF2D /* SafariServices.framework */; }; + A1CF0A85A34940CDA949E850 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840A8631BCFC4F9E8370035F /* SystemConfiguration.framework */; }; + 029B651D0B0E4AE3837F4281 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8F9368F722A4808842C3802 /* AddressBook.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -289,6 +294,12 @@ 484774914A724BB18F8CBAC7 /* libAirMaps.a */ = {isa = PBXFileReference; name = "libAirMaps.a"; path = "libAirMaps.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */ = {isa = PBXFileReference; name = "RCTImageResizer.xcodeproj"; path = "../node_modules/react-native-image-resizer/ios/RCTImageResizer.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; 1E3D55C0169946DB80AA27E5 /* libRCTImageResizer.a */ = {isa = PBXFileReference; name = "libRCTImageResizer.a"; path = "libRCTImageResizer.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + 1E238A9449A24833B6FEAEFE /* RNGoogleSignin.xcodeproj */ = {isa = PBXFileReference; name = "RNGoogleSignin.xcodeproj"; path = "../node_modules/react-native-google-signin/ios/RNGoogleSignin.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 7B9FE98739524051A7B75613 /* libRNGoogleSignin.a */ = {isa = PBXFileReference; name = "libRNGoogleSignin.a"; path = "libRNGoogleSignin.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + 1E8312BB21594022857FE94F /* libz.tbd */ = {isa = PBXFileReference; name = "libz.tbd"; path = "usr/lib/libz.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; + 84A166D2AEF7429D9D52FF2D /* SafariServices.framework */ = {isa = PBXFileReference; name = "SafariServices.framework"; path = "System/Library/Frameworks/SafariServices.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; + 840A8631BCFC4F9E8370035F /* SystemConfiguration.framework */ = {isa = PBXFileReference; name = "SystemConfiguration.framework"; path = "System/Library/Frameworks/SystemConfiguration.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; + F8F9368F722A4808842C3802 /* AddressBook.framework */ = {isa = PBXFileReference; name = "AddressBook.framework"; path = "System/Library/Frameworks/AddressBook.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -320,6 +331,11 @@ 0BB615C49CCD433DA593C478 /* libRNVectorIcons.a in Frameworks */, 58AA5BD96D1F473CAF1D0297 /* libAirMaps.a in Frameworks */, 1242B1F0F0FB4315B5CADEC5 /* libRCTImageResizer.a in Frameworks */, + 1BD2BAB0FAA749D0B304C4C8 /* libRNGoogleSignin.a in Frameworks */, + 5AAA204F998B478B8817CB33 /* libz.tbd in Frameworks */, + EA087CEA76394C3DB637FCA4 /* SafariServices.framework in Frameworks */, + A1CF0A85A34940CDA949E850 /* SystemConfiguration.framework in Frameworks */, + 029B651D0B0E4AE3837F4281 /* AddressBook.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -491,6 +507,7 @@ ABBDD4481F9A4A879DC2DA9B /* RNVectorIcons.xcodeproj */, CA8120963AF94E0FB384289D /* AirMaps.xcodeproj */, AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */, + 1E238A9449A24833B6FEAEFE /* RNGoogleSignin.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -512,6 +529,7 @@ 00E356EF1AD99517003FC87E /* AreThereCookiesTests */, 83CBBA001A601CBA00E9B192 /* Products */, F290692D4B774D01965F45E6 /* Resources */, + F6DB65FE660B40C988028B84 /* Frameworks */, ); indentWidth = 2; sourceTree = ""; @@ -546,6 +564,18 @@ path = ""; sourceTree = ""; }; + F6DB65FE660B40C988028B84 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1E8312BB21594022857FE94F /* libz.tbd */, + 84A166D2AEF7429D9D52FF2D /* SafariServices.framework */, + 840A8631BCFC4F9E8370035F /* SystemConfiguration.framework */, + F8F9368F722A4808842C3802 /* AddressBook.framework */, + ); + name = Frameworks; + path = ""; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1052,6 +1082,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1060,6 +1091,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", + "$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**", ); }; name = Debug; @@ -1085,6 +1117,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1093,6 +1126,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", + "$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**", ); }; name = Release; @@ -1119,6 +1153,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", + "$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**", ); }; name = Debug; @@ -1144,6 +1179,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", + "$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**", ); }; name = Release; @@ -1178,6 +1214,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1186,6 +1223,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", + "$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**", ); }; name = Debug; @@ -1220,6 +1258,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1228,6 +1267,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", + "$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**", ); }; name = Release; @@ -1257,6 +1297,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); }; name = Debug; @@ -1286,6 +1327,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); }; name = Release; diff --git a/package.json b/package.json index 695efff..4bda6d7 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "react-native-drawer": "^2.3.0", "react-native-facebook-login": "^1.6.0", "react-native-google-places": "^2.1.0", + "react-native-google-signin": "0.10", "react-native-image-picker": "^0.26.3", "react-native-image-resizer": "^1.0.0", "react-native-loading-spinner-overlay": "^0.5.2", diff --git a/yarn.lock b/yarn.lock index 27fe164..06b855e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3745,6 +3745,10 @@ react-native-google-places@^2.1.0: version "2.4.2" resolved "https://registry.yarnpkg.com/react-native-google-places/-/react-native-google-places-2.4.2.tgz#ac4cf3391481ecd89803282554e209f0bfefc31e" +react-native-google-signin@0.10: + version "0.10.0" + resolved "https://registry.yarnpkg.com/react-native-google-signin/-/react-native-google-signin-0.10.0.tgz#cc47d3726165735ee61e3a4a589c2ced888f1a98" + react-native-image-picker@^0.26.3: version "0.26.7" resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-0.26.7.tgz#ad2ee957f7f6cc01396893ea03d84cb2adb2e376"