Merge pull request #33 from rckim77/develop

Version 2.28.0
rckim77 · Jan 14, 2024 · a0bff81 · a0bff81
2 parents 10df11a + fcb97c8
commit a0bff81
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 136 deletions.
diff --git a/Daydream.xcodeproj/project.pbxproj b/Daydream.xcodeproj/project.pbxproj
@@ -452,7 +452,14 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Daydream/Pods-Daydream-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework",
+				"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
+				"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
+				"${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework",
+				"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
+				"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework",
 				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
+				"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
@@ -463,7 +470,14 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
@@ -703,7 +717,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -765,7 +779,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/Daydream/Info.plist b/Daydream/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.26.1</string>
+	<string>2.28.0</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>googlechromes</string>

diff --git a/Daydream/Shared/Extensions.swift b/Daydream/Shared/Extensions.swift
@@ -127,12 +127,14 @@ extension String {
 }
 
 extension UISearchBar {
+    /// DEPRECATED
     func setPlaceholderColor(_ color: UIColor) {
         searchTextField.setPlaceholder(textColor: color)
     }
 }
 
 extension UITextField {
+    /// DEPRECATED
     private class Label: UILabel {
         private var _textColor: UIColor = .lightGray
 
@@ -154,10 +156,12 @@ extension UITextField {
         }
     }
 
+    /// DEPRECATED
     var placeholderLabel: UILabel? {
         return value(forKey: "placeholderLabel") as? UILabel
     }
 
+    /// DEPRECATED
     func setPlaceholder(textColor: UIColor) {
         guard let placeholderLabel = placeholderLabel else {
             return
@@ -203,7 +207,14 @@ extension UISearchController {
         searchBar.searchTextField.textColor = .white
         searchBar.searchTextField.placeholder = "e.g., Tokyo"
         searchBar.searchBarStyle = .minimal
-        searchBar.setPlaceholderColor(.white)
+
+        // Once we drop iOS 13, we can remove our UITextField extension hack
+        if #available(iOS 14.0, *) {
+            searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "e.g., Tokyo",
+                                                                                 attributes: [NSAttributedString.Key.foregroundColor: UIColor.white])
+        } else {
+            searchBar.setPlaceholderColor(.white)
+        }
 
         // style search icon
         searchBar.setImage(#imageLiteral(resourceName: "searchIconWhite"), for: .search, state: .normal)

diff --git a/DaydreamUITests/Info.plist b/DaydreamUITests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.26.1</string>
+	<string>2.28.0</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 </dict>
 </plist>
diff --git a/Podfile b/Podfile
@@ -8,7 +8,7 @@ target 'Daydream' do
   # Pods for Daydream
   pod 'GooglePlaces', '~> 3.9'
   pod 'GoogleMaps', '~> 3.9'
-  pod 'SwiftLint', '~> 0.39'
+  pod 'SwiftLint', '~> 0.41'
   pod 'SVProgressHUD'
   pod 'Firebase/Core'
   pod 'Firebase/Crashlytics'