Merge Release to Main

Podfile

@@ -15,12 +15,12 @@ target 'TCAT' do
     # Networking + Data
     pod 'Apollo', '~> 1.9.3'
     pod 'SwiftyJSON', '~> 5.0'
-    pod 'FutureNova', :git => 'https://github.com/cuappdev/ios-networking.git'
     pod 'Wormholy', :configurations => ['Debug']
 
     # Analytics
     pod 'Firebase'
     pod 'FirebaseCrashlytics'
+    pod 'Firebase/Messaging'
 
     # File Management
     pod 'Zip', '~> 1.1'
@@ -31,7 +31,6 @@ target 'TCAT' do
     pod 'Pulley', '~> 2.7'
     pod 'Presentation', :git=> 'https://github.com/cuappdev/Presentation.git'
     pod 'SnapKit', '~> 5.0'
-    pod 'WhatsNewKit', '~> 1.1'
 
     # Other
     pod 'SwiftLint'

Podfile.lock

@@ -10,6 +10,9 @@ PODS:
     - FirebaseAnalytics (~> 10.24.0)
   - Firebase/CoreOnly (10.24.0):
     - FirebaseCore (= 10.24.0)
+  - Firebase/Messaging (10.24.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 10.24.0)
   - FirebaseAnalytics (10.24.0):
     - FirebaseAnalytics/AdIdSupport (= 10.24.0)
     - FirebaseCore (~> 10.0)
@@ -50,6 +53,15 @@ PODS:
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
+  - FirebaseMessaging (10.24.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.3)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Reachability (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
   - FirebaseRemoteConfigInterop (10.24.0)
   - FirebaseSessions (10.24.0):
     - FirebaseCore (~> 10.5)
@@ -59,7 +71,6 @@ PODS:
     - GoogleUtilities/Environment (~> 7.10)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesSwift (~> 2.1)
-  - FutureNova (0.1.6)
   - GoogleAppMeasurement (10.24.0):
     - GoogleAppMeasurement/AdIdSupport (= 10.24.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
@@ -134,24 +145,22 @@ PODS:
   - SnapKit (5.0.1)
   - SwiftLint (0.54.0)
   - SwiftyJSON (5.0.1)
-  - WhatsNewKit (1.3.7)
   - Wormholy (1.7.0)
   - Zip (1.1.0)
 
 DEPENDENCIES:
   - Apollo (~> 1.9.3)
   - DZNEmptyDataSet (from `https://github.com/cuappdev/DZNEmptyDataSet.git`)
   - Firebase
+  - Firebase/Messaging
   - FirebaseCrashlytics
-  - FutureNova (from `https://github.com/cuappdev/ios-networking.git`)
   - GoogleMaps
   - NotificationBannerSwift (~> 3.0.0)
   - Presentation (from `https://github.com/cuappdev/Presentation.git`)
   - Pulley (~> 2.7)
   - SnapKit (~> 5.0)
   - SwiftLint
   - SwiftyJSON (~> 5.0)
-  - WhatsNewKit (~> 1.1)
   - Wormholy
   - Zip (~> 1.1)
 
@@ -165,6 +174,7 @@ SPEC REPOS:
     - FirebaseCoreInternal
     - FirebaseCrashlytics
     - FirebaseInstallations
+    - FirebaseMessaging
     - FirebaseRemoteConfigInterop
     - FirebaseSessions
     - GoogleAppMeasurement
@@ -180,25 +190,19 @@ SPEC REPOS:
     - SnapKit
     - SwiftLint
     - SwiftyJSON
-    - WhatsNewKit
     - Wormholy
     - Zip
 
 EXTERNAL SOURCES:
   DZNEmptyDataSet:
     :git: https://github.com/cuappdev/DZNEmptyDataSet.git
-  FutureNova:
-    :git: https://github.com/cuappdev/ios-networking.git
   Presentation:
     :git: https://github.com/cuappdev/Presentation.git
 
 CHECKOUT OPTIONS:
   DZNEmptyDataSet:
     :commit: a4a007e7ade7d9711f067f4d6510085fa1d92629
     :git: https://github.com/cuappdev/DZNEmptyDataSet.git
-  FutureNova:
-    :commit: db0540d78bd5bfb67f39945bbaf0fd3f2fbf56b5
-    :git: https://github.com/cuappdev/ios-networking.git
   Presentation:
     :commit: b53eb453d2e1520e724cfac5e3e444e730ffe985
     :git: https://github.com/cuappdev/Presentation.git
@@ -213,9 +217,9 @@ SPEC CHECKSUMS:
   FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
   FirebaseCrashlytics: af38ea4adfa606f6e63fcc22091b61e7938fcf66
   FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
+  FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
   FirebaseRemoteConfigInterop: 6c349a466490aeace3ce9c091c86be1730711634
   FirebaseSessions: 2651b464e241c93fd44112f995d5ab663c970487
-  FutureNova: 95f9aa352b2c250253b96fdf380754afcc87c7f3
   GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
@@ -230,10 +234,9 @@ SPEC CHECKSUMS:
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
-  WhatsNewKit: c87028c4059dccd113495422801914cc53f6aab0
   Wormholy: ab1c8c2f02f58587a0941deb0088555ffbf039a1
   Zip: 8877eede3dda76bcac281225c20e71c25270774c
 
-PODFILE CHECKSUM: a3b80dd04ea30998a17c032f2730e21ee8517238
+PODFILE CHECKSUM: af336d88f53594af448d02dc18637c2b6ebe685e
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.15.0

README.md

@@ -36,31 +36,17 @@ fi
 
 ```
 
-- There should also be another run script labeled **UpliftAPI** If not, create a **New Run Script Phase** with the following script:
-
-```bash
-CLI_PATH="./Pods/Apollo/apollo-ios-cli"
-SECRETS_PATH="${SRCROOT}/TransitSecrets"
-
-if [ "${CONFIGURATION}" != "Release" ]; then
-  CONFIG_PATH="${SECRETS_PATH}/uplift-codegen-config-dev.json"
-fi
-
-if [ "${CONFIGURATION}" = "Release" ]; then
-  CONFIG_PATH="${SECRETS_PATH}/uplift-codegen-config-prod.json"
-fi
+5. Select the `TCAT Debug` schema to use our development server and `TCAT Release` to use our production server.
+6. Generate the Uplift API:
 
-"${CLI_PATH}" generate -p "${CONFIG_PATH}" -f
+- Dev: `./Pods/Apollo/apollo-ios-cli generate -p "TransitSecrets/uplift-codegen-config-dev.json" -f`
+- Prod: `./Pods/Apollo/apollo-ios-cli generate -p "TransitSecrets/uplift-codegen-config-prod.json" -f`
 
-```
-
-5. Select the `TCAT Debug` schema to use our development server and `TCAT Release` to use our production server.
-6. Generate the Uplift API with the following command: `./Pods/Apollo/apollo-ios-cli generate -p "TransitSecrets/uplift-codegen-config-dev.json" -f`
 7. Build the project and you should be good to go.
 
 ## Common Issues
 
-- If the build script for generating the API folder doesn't work, you can manually generate the API via `./Pods/Apollo/apollo-ios-cli generate -p "TransitSecrets/uplift-codegen-config-dev.json" -f`
+- If the API is not working properly, try manually generating the API with the CLI.
 
 - If UpliftAPI is not detected or if your new written queries/mutations are not generated by Apollo, make sure that the generated UpliftAPI folder is linked to the TCAT target. You can do this by simply deleting the UpliftAPI group via the project navigator on Xcode and dragging the generated UpliftAPI folder from Finder to Xcode.