Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): remove native code + unused pods #9364

Merged
merged 22 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
da3f829
turn off static analysis during builds
brainbicycle Apr 21, 2023
e48b205
remove now unnecessary oauth client pod
brainbicycle Apr 21, 2023
0bbb5ad
workaround for pod signing issues
brainbicycle Apr 21, 2023
349689d
remove unused afnetworking subspecs
brainbicycle Apr 21, 2023
4ab87c0
remove the old admin menu from the dev menu
brainbicycle Apr 21, 2023
deaaf31
remove admin menu imports
brainbicycle Apr 21, 2023
351dfdc
remove all old admin code
brainbicycle Apr 21, 2023
381b5d4
remove tableview pod
brainbicycle Apr 21, 2023
a692c27
use our own hex color method rather than pod
brainbicycle Apr 21, 2023
b042200
remove color pod
brainbicycle Apr 21, 2023
1fa9d77
remove a couple unused imports
brainbicycle Apr 21, 2023
ff4935b
remove unused imports in the app delegate
brainbicycle Apr 22, 2023
d324c00
remove all unused bridging header imports
brainbicycle Apr 22, 2023
5ad8374
remove unnecessary swift imports
brainbicycle Apr 22, 2023
0a7627a
remove unused/conditional imports from first few folders
brainbicycle Apr 22, 2023
2e55ff1
remove unused imports from some more folders
brainbicycle Apr 22, 2023
01220c6
Merge remote-tracking branch 'origin/main' into brian/build-times
brainbicycle Oct 2, 2023
67592f6
remove unnecessary workaround
brainbicycle Oct 2, 2023
c8c2960
remove old dev menu test
brainbicycle Oct 2, 2023
dc46f2a
fix compilation error due to missing swift import
brainbicycle Oct 2, 2023
87b30c6
fix compilation error in tests due to missing file
brainbicycle Oct 2, 2023
63437df
remove tests related to animated tick view
brainbicycle Oct 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions ios/Artsy.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions ios/Artsy/App/ARAppDelegate+Emission.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#import "ARAugmentedRealityConfig.h"
#import "ARAugmentedFloorBasedVIRViewController.h"
#import "ARDefaults.h"
#import "ARNavigationController.h"
#import "ARAppStatus.h"
#import "ARRouter.h"
#import "AROptions.h"
Expand All @@ -30,7 +29,9 @@
#import <React/RCTUtils.h>
#import <React/RCTDevSettings.h>
#import <objc/runtime.h>
#import "Artsy-Swift.h"
#import "ARUserManager.h"
#import "User.h"
#import "ARAnalyticsConstants.h"

@import Darwin.POSIX.sys.utsname;

Expand Down
29 changes: 4 additions & 25 deletions ios/Artsy/App/ARAppDelegate.mm
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#import <FBSDKCoreKit/FBSDKCoreKit.h>
#import <FBSDKLoginKit/FBSDKLoginKit.h>
#import <AFOAuth1Client/AFOAuth1Client.h>
#import <UICKeyChainStore/UICKeyChainStore.h>
#import <Firebase.h>
#import <Appboy.h>
#import "AppboyReactUtils.h"
Expand All @@ -10,44 +8,25 @@
#import <CodePush/CodePush.h>
#import <AppCenterReactNative.h>

#import "ARAnalyticsConstants.h"
#import "ARAppDelegate.h"
#import "ARAppDelegate+Emission.h"
#import "ARAppDelegate+Echo.h"
#import "ARAppNotificationsDelegate.h"
#import "ARAppConstants.h"
#import "ARFonts.h"
#import "ARUserManager.h"
#import "AROptions.h"

#import "UIViewController+InnermostTopViewController.h"
#import "ARAdminSettingsViewController.h"
#import "ARRouter.h"
#import "ARNetworkConstants.h"
#import "ArtsyAPI+Private.h"
#import "ARFileUtils.h"
#import "ARFonts.h"
#import "ARAnalyticsConstants.h"
#import "User.h"

#import "ARWebViewCacheHost.h"
#import "ARAppStatus.h"
#import "Artsy-Swift.h"
#import "ARSystemTime.h"
#import "ARDispatchManager.h"
#import "ARLogger.h"

#import "AREmission.h"
#import "AREventsModule.h"
#import "ARTemporaryAPIModule.h"
#import "ARPHPhotoPickerModule.h"
#import "ARNotificationsManager.h"
#import "ARCocoaConstantsModule.h"

#import "UIDevice-Hardware.h"
#import "ArtsyEcho.h"

#import <react-native-config/ReactNativeConfig.h>

#import <ObjectiveSugar/ObjectiveSugar.h>
#import <React/RCTDevSettings.h>
#import <React/RCTBridge.h>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most of the header file deletions / noise is just removing and check to see if it still compiles.

#import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h>
#import "AREmission.h"
Expand Down
1 change: 0 additions & 1 deletion ios/Artsy/App/ARApplicationShortcutItemDelegate.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#import "ARApplicationShortcutItemDelegate.h"

#import "ARAppConstants.h"
#import "ARNavigationController.h"
#import "User.h"
#import "AREmission.h"

Expand Down
6 changes: 0 additions & 6 deletions ios/Artsy/ArtsyUIButtons/ARButtonSubclasses.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@

#import "UIColor+ArtsyColors.h"

#if __has_include(<UIView+BooleanAnimations/UIView+BooleanAnimations.h>)
#import <UIView+BooleanAnimations/UIView+BooleanAnimations.h>
#endif

#if __has_include(<UIView_BooleanAnimations/UIView+BooleanAnimations.h>)
#import <UIView_BooleanAnimations/UIView+BooleanAnimations.h>
#endif

#import "UIFont+ArtsyFonts.h"

Expand Down
3 changes: 3 additions & 0 deletions ios/Artsy/ArtsyUIColors/UIColor+ArtsyColors.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,7 @@
/// <br/> (#0eda83)
+ (UIColor *)artsyGreenRegular;

// Allow creating colors with a hex code
+ (UIColor *)ar_colorWithHex:(UInt32)hex;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exposing a convenience method we already had to get rid of EDColor which we were using for same purpose


@end
3 changes: 1 addition & 2 deletions ios/Artsy/ArtsyUILabels/Artsy+UILabels.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#import "Artsy+UILabels.h"
#import "UIView+ARDrawing.h"
#import "UIColor+ArtsyColors.h"
#import "UIFont+ArtsyFonts.h"


Expand All @@ -23,6 +21,7 @@ - (id)initWithFrame:(CGRect)frame

- (void)awakeFromNib
{
[super awakeFromNib];
[self setup];
}

Expand Down
3 changes: 0 additions & 3 deletions ios/Artsy/Emission/Core/AREmission.m
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#import "AREmission.h"
#import "AREventsModule.h"
#import "ARTemporaryAPIModule.h"
#import "ARNotificationsManager.h"
#import "ARCocoaConstantsModule.h"


@implementation AREmission

Expand Down
5 changes: 0 additions & 5 deletions ios/Artsy/Emission/Core/AREventsModule.m
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#import "AREventsModule.h"

#import <React/RCTBridge.h>
#import <React/RCTUIManager.h>
#import <React/UIView+React.h>
#import <React/RCTRootView.h>

@implementation AREventsModule

@synthesize bridge = _bridge;
Expand Down
3 changes: 0 additions & 3 deletions ios/Artsy/Emission/Core/ARScrollViewHelpers.m
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#import "ARScrollViewHelpers.h"
#import <UIKit/UIKit.h>
#import "AREmission.h"
#import <React/RCTBridge.h>
#import <React/RCTUIManager.h>
#import <React/RCTScrollView.h>
#import <math.h>
#import "INTUAnimationEngine.h"

#import "RCTScrollView+Artsy.h"
Expand Down
2 changes: 0 additions & 2 deletions ios/Artsy/Emission/Core/RCTScrollView+Artsy.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

#import "RCTScrollView+Artsy.h"

#import <React/RCTScrollView.h>
#import <React/RCTComponent.h>
#import <React/UIView+React.h>
#import <objc/runtime.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#import "ARNotificationsManager.h"
#import <React/RCTBridgeModule.h>

// This class is being used as a generic bridge between obj-c and TS for state and events.
// As we refactor more of the app infrastructure to live in TS we should use this class
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#import "ARPHPhotoPickerModule.h"
#import <RNImageCropPicker/Compression.h>
#import <RNImageCropPicker/ImageCropPicker.h>
#import <RNImageCropPicker/UIImage+Extension.h>

typedef NS_ENUM(NSUInteger, ARPHPhotoPickerError) {
ARPHPhotoPickerErrorOSVersionUnsupported = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

#import "AROpaqueImageView.h"

#import <React/RCTConvert.h>


@interface AROpaqueImageViewComponent : AROpaqueImageView
@property (nonatomic, strong, readwrite) RCTDirectEventBlock onLoad;
@end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#import "ARMapComponentViewController.h"
#import "ARCityComponentViewController.h"
#import "ARCityPickerComponentViewController.h"
#import "ARComponentViewController.h"
#import "ARCity.h"
#import "ARCity+GeospatialAdditions.h"

Expand Down
6 changes: 1 addition & 5 deletions ios/Artsy/Extraction/ARSpinner.m
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
#import "ARSpinner.h"
#import "UIView+ARSpinner.h"

#if __has_include(<UIView+BooleanAnimations/UIView+BooleanAnimations.h>)
#import <UIView+BooleanAnimations/UIView+BooleanAnimations.h>
#else
@import UIView_BooleanAnimations;
#endif


@interface ARSpinner ()
@property (nonatomic, strong) UIView *spinnerView;
Expand Down
2 changes: 2 additions & 0 deletions ios/Artsy/NativeModules/ARTNativeScreenPresenterModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#import "AROptions.h"
#import "ARAppDelegate+Echo.h"
#import "ARAuctionWebViewController.h"
#import "ARRouter.h"
#import <SDWebImage/SDWebImageManager.h>
#import "Artsy-Swift.h"

#import <MessageUI/MFMailComposeViewController.h>
Expand Down
9 changes: 0 additions & 9 deletions ios/Artsy/NativeModules/ARTOldAdminViewManager.h

This file was deleted.

14 changes: 0 additions & 14 deletions ios/Artsy/NativeModules/ARTOldAdminViewManager.m

This file was deleted.

42 changes: 0 additions & 42 deletions ios/Artsy/NativeModules/OldAdminView.swift

This file was deleted.

38 changes: 1 addition & 37 deletions ios/Artsy/Resources/Artsy-Bridging-Header.h
Original file line number Diff line number Diff line change
@@ -1,35 +1,23 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import "UIViewController+FullScreenLoading.h"

#import "ARUserActivity.h"

#import "ARScrollNavigationChief.h"
#import "ARWhitespaceGobbler.h"
#import "ARCountdownView.h"
#import "UIView+HitTestExpansion.h"
#import "ARSeparatorViews.h"

#import "ArtsyAPI+CurrentUserFunctions.h"
#import "ArtsyAPI+Sales.h"
#import "ArtsyAPI+Pages.h"

#import "ARDefaults.h"
#import "AROptions.h"
#import "ARAppConstants.h"
#import "ARRouter.h" // Required for +baseCausalitySocketURLString in the LiveAuctionSalesPerson.

// Perhaps in the future we could use https://github.com/orta/ar_dispatch/ for now though eigen does more than this lib
#import "ARDispatchManager.h"
#import "UIImageView+AsyncImageLoading.h"
#import "UIImage+ImageFromColor.h"
#import "UIViewController+Popovers.h"

// Models.
#import "Sale.h"
#import "SaleArtwork.h"
#import "Artwork.h"
#import "Artist.h"
#import "Profile.h"
Expand All @@ -41,17 +29,10 @@
#import "LiveEvent.h"
#import "LiveBidder.h"

#import "Artwork.h"
#import "Gene.h"

#import "ARInternalMobileWebViewController.h"
#import "ARExternalWebBrowserViewController.h"

#import "UIViewController+SimpleChildren.h"
#import "ARMenuAwareViewController.h"
#import "ARSharingController.h"

#import "ORStackView+ArtsyViews.h"

// For building out Auction Information VC

Expand All @@ -61,14 +42,11 @@
#import "ARSerifNavigationViewController.h"

#import "ARTextView.h"
#import "ARFonts.h"
#import "ARCustomEigenLabels.h"

#import "MTLModel+JSON.h"
#import "ARCustomEigenLabels.h"

#import "ARAppStatus.h"
#import "ARAppConstants.h"
#import "ARAnalyticsConstants.h"

#import "UIView+ARSpinner.h"
Expand All @@ -79,41 +57,27 @@
#import "ARSystemTime.h"

#import "ORStackView+ArtsyViews.h"
#import <CommonCrypto/CommonHMAC.h>

#import "ARExternalWebBrowserViewController.h"

// All these were previously Pod dynamic frameworks and now static libraries
#import "ARFonts.h"
#import "Artsy+UILabels.h"
#import "UIView+ARDrawing.h"
#import "ARButtonSubclasses.h"
#import "UIColor+ArtsyColors.h"
#import <EDColor/EDColor.h>
#import "UIImage+ImageFromColor.h"
#import "ARSpinner.h"
#import <FLKAutoLayout/FLKAutoLayout.h>
#import <FXBlurView/FXBlurView.h>
#import <MARKRangeSlider/MARKRangeSlider.h>
#import <ORStackView/ORStackView.h>
#import <ORStackView/ORStackScrollView.h>
#import <ORStackView/ORTagBasedAutoStackView.h>
#import <SDWebImage/SDWebImagePrefetcher.h>
#import <SDWebImage/UIImageView+WebCache.h>
#import <UICKeyChainStore/UICKeyChainStore.h>
#import <UIView+BooleanAnimations/UIView+BooleanAnimations.h>
#import "UIDevice-Hardware.h"
#import "AREmission.h"
#import "ARComponentViewController.h"
#import "ARNotificationView.h"

#import "ARTNativeScreenPresenterModule.h"

// CityGuide
#import "ARMapContainerViewController.h"

// Admin
#import "ARAdminSettingsViewController.h"

// Sentry Swift Access
#import "ARSentryReporter.h"

Expand Down
Loading