diff --git a/.env b/.env index 9646cc3..05aac83 100644 --- a/.env +++ b/.env @@ -1,3 +1,2 @@ EXPO_PUBLIC_API_KEY=I_Love_Madeline EXPO_PUBLIC_BASE_URL=https://ismadelinethecutest.gibbyb.com/api -#EXPO_PUBLIC_BASE_URL=http://192.168.0.39:3000/api diff --git a/.gitignore b/.gitignore index 2066475..25cdf12 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ npm-debug.* *.mobileprovision *.orig.* web-build/ -.env +.env* # macOS .DS_Store diff --git a/android/gradlew b/android/gradlew old mode 100755 new mode 100644 diff --git a/eas.json b/eas.json index 4633383..8466b40 100644 --- a/eas.json +++ b/eas.json @@ -12,6 +12,10 @@ "distribution": "internal" }, "production": { + "env": { + "EXPO_PUBLIC_API_KEY": "I_Love_Madeline", + "EXPO_PUBLIC_BASE_URL": "https://ismadelinethecutest.gibbyb.com/api" + }, "autoIncrement": true } }, diff --git a/ios/fuse.xcodeproj/project.pbxproj b/ios/fuse.xcodeproj/project.pbxproj index 973a45b..72840fa 100644 --- a/ios/fuse.xcodeproj/project.pbxproj +++ b/ios/fuse.xcodeproj/project.pbxproj @@ -406,7 +406,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.gibbyb.fuse; - PRODUCT_NAME = fuse; + PRODUCT_NAME = "fuse"; SWIFT_OBJC_BRIDGING_HEADER = "fuse/fuse-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -439,7 +439,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.gibbyb.fuse; - PRODUCT_NAME = fuse; + PRODUCT_NAME = "fuse"; SWIFT_OBJC_BRIDGING_HEADER = "fuse/fuse-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -506,7 +506,10 @@ LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -564,7 +567,10 @@ ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/ios/fuse/Info.plist b/ios/fuse/Info.plist index c4bdcd9..427648b 100644 --- a/ios/fuse/Info.plist +++ b/ios/fuse/Info.plist @@ -54,6 +54,7 @@ $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route + $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route UILaunchStoryboardName SplashScreen