build with the final iOS 15 SDK

irccloud · Sep 15, 2021 · b86d062 · b86d062
1 parent 5a9dfb0
commit b86d062
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 17 deletions.
diff --git a/IRCCloud.xcodeproj/project.pbxproj b/IRCCloud.xcodeproj/project.pbxproj
@@ -3486,7 +3486,6 @@
 				"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebasePerformance/FirebasePerformance.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework",
-				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/youtube-ios-player-helper/youtube_ios_player_helper.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -3504,7 +3503,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebasePerformance.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/youtube_ios_player_helper.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3554,7 +3552,6 @@
 				"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebasePerformance/FirebasePerformance.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework",
-				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/youtube-ios-player-helper/youtube_ios_player_helper.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -3572,7 +3569,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebasePerformance.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/youtube_ios_player_helper.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3622,7 +3618,6 @@
 				"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebasePerformance/FirebasePerformance.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework",
-				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/youtube-ios-player-helper/youtube_ios_player_helper.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -3640,7 +3635,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebasePerformance.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/youtube_ios_player_helper.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/IRCCloud/Classes/MainViewController.m b/IRCCloud/Classes/MainViewController.m
@@ -274,11 +274,9 @@ - (void)applyTheme {
         self.navigationController.navigationBar.standardAppearance = a;
         self.navigationController.navigationBar.compactAppearance = a;
         self.navigationController.navigationBar.scrollEdgeAppearance = a;
-#ifdef __IPHONE_15_0
         if (@available(iOS 15.0, *)) {
             self.navigationController.navigationBar.compactScrollEdgeAppearance = a;
         }
-#endif
     }
     [self->_uploadsBtn setTintColor:[UIColor textareaBackgroundColor]];
     UIColor *c = ([NetworkConnection sharedInstance].state == kIRCCloudStateConnected)?([UIColor isDarkTheme]?[UIColor whiteColor]:[UIColor unreadBlueColor]):[UIColor textareaBackgroundColor];

diff --git a/IRCCloud/Classes/SettingsViewController.m b/IRCCloud/Classes/SettingsViewController.m
@@ -456,11 +456,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         self.navigationController.navigationBar.standardAppearance = a;
         self.navigationController.navigationBar.compactAppearance = a;
         self.navigationController.navigationBar.scrollEdgeAppearance = a;
-#ifdef __IPHONE_15_0
         if (@available(iOS 15.0, *)) {
             self.navigationController.navigationBar.compactScrollEdgeAppearance = a;
         }
-#endif
     }
 
     [self.navigationController setNeedsStatusBarAppearanceUpdate];
@@ -667,11 +665,9 @@ -(void)cancelButtonPressed:(id)sender {
         self.navigationController.navigationBar.standardAppearance = a;
         self.navigationController.navigationBar.compactAppearance = a;
         self.navigationController.navigationBar.scrollEdgeAppearance = a;
-#ifdef __IPHONE_15_0
         if (@available(iOS 15.0, *)) {
             self.navigationController.navigationBar.compactScrollEdgeAppearance = a;
         }
-#endif
     }
     [self dismissViewControllerAnimated:YES completion:nil];
 //#endif

diff --git a/IRCCloud/Classes/UIColor+IRCCloud.m b/IRCCloud/Classes/UIColor+IRCCloud.m
@@ -491,12 +491,10 @@ +(void)setTheme:(NSString *)theme {
             a.backgroundImage = [self navBarBackgroundImage];
             a.titleTextAttributes = @{NSForegroundColorAttributeName: [self navBarHeadingColor]};
             [[UINavigationBar appearance] setStandardAppearance:a];
-#ifdef __IPHONE_15_0
             if (@available(iOS 15.0, *)) {
                 [[UINavigationBar appearance] setCompactAppearance:a];
                 [[UINavigationBar appearance] setCompactScrollEdgeAppearance:a];
             }
-#endif
             [[UINavigationBar appearance] setScrollEdgeAppearance:a];
         }
 
@@ -781,12 +779,10 @@ +(void)setTheme:(NSString *)theme {
             a.backgroundImage = [self navBarBackgroundImage];
             a.titleTextAttributes = @{NSForegroundColorAttributeName: [self navBarHeadingColor]};
             [[UINavigationBar appearance] setStandardAppearance:a];
-#ifdef __IPHONE_15_0
             if (@available(iOS 15.0, *)) {
                 [[UINavigationBar appearance] setCompactAppearance:a];
                 [[UINavigationBar appearance] setCompactScrollEdgeAppearance:a];
             }
-#endif
             [[UINavigationBar appearance] setScrollEdgeAppearance:a];
         }
     }

diff --git a/build-scripts/BUILD b/build-scripts/BUILD
@@ -1 +1 @@
-178
+179