From a7cb4ab3f629b423099afad204c7ae1bf8df9677 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 16 Oct 2018 21:26:27 +0300 Subject: Try without frameworks again --- Juick.xcodeproj/project.pbxproj | 46 +++++++++------------- .../vt.xcuserdatad/xcschemes/Juick.xcscheme | 2 +- Juick/APIClient.h | 1 - Juick/Model/User.h | 1 - Juick/Model/User.m | 2 - Juick/Supporting Files/Juick-Prefix.pch | 11 ++++++ Juick/ViewControllers/ChatViewController.h | 2 - Juick/Views/BubbleMessageCell.h | 2 - Juick/Views/BubbleMessageCell.m | 1 - Juick/Views/ConversationCell.m | 1 - Juick/Views/MessageCell.h | 2 - Juick/Views/MessageCell.m | 5 --- Podfile | 1 - Podfile.lock | 2 +- 14 files changed, 31 insertions(+), 48 deletions(-) diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj index 72dafb0..0ae0559 100644 --- a/Juick.xcodeproj/project.pbxproj +++ b/Juick.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 274CA3F5A1521329BEA647FB /* Pods_Juick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE63D145DADD14AE17A58456 /* Pods_Juick.framework */; }; + 706F9651FDACFE30A8DDC1DF /* libPods-Juick.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22EE2B61A53B73723D255877 /* libPods-Juick.a */; }; 77317BAC181BBE8500D60005 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77317BAB181BBE8500D60005 /* Foundation.framework */; }; 77317BAE181BBE8500D60005 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77317BAD181BBE8500D60005 /* CoreGraphics.framework */; }; 77317BB0181BBE8500D60005 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77317BAF181BBE8500D60005 /* UIKit.framework */; }; @@ -58,6 +58,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 22EE2B61A53B73723D255877 /* libPods-Juick.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Juick.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 770A428F1E8881CB000B206A /* DeviceRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceRegistration.h; sourceTree = ""; }; 77317BA8181BBE8500D60005 /* Juick.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Juick.app; sourceTree = BUILT_PRODUCTS_DIR; }; 77317BAB181BBE8500D60005 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -142,7 +143,6 @@ 77FCADE01D6A50EC00CBA649 /* APIClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APIClient.h; sourceTree = ""; }; 9FF4AA695CB46B0E7AED628D /* Pods_JuickTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JuickTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B3271B16DFB6247972806713 /* Pods-Juick.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.debug.xcconfig"; sourceTree = ""; }; - EE63D145DADD14AE17A58456 /* Pods_Juick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Juick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FE68EEE5B0A1ABE0D063F54A /* Pods-Juick.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.release.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -159,7 +159,7 @@ 77317BAE181BBE8500D60005 /* CoreGraphics.framework in Frameworks */, 77317BB0181BBE8500D60005 /* UIKit.framework in Frameworks */, 77317BAC181BBE8500D60005 /* Foundation.framework in Frameworks */, - 274CA3F5A1521329BEA647FB /* Pods_Juick.framework in Frameworks */, + 706F9651FDACFE30A8DDC1DF /* libPods-Juick.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -200,7 +200,7 @@ 77317BAF181BBE8500D60005 /* UIKit.framework */, 77317BCD181BBE8500D60005 /* XCTest.framework */, 9FF4AA695CB46B0E7AED628D /* Pods_JuickTests.framework */, - EE63D145DADD14AE17A58456 /* Pods_Juick.framework */, + 22EE2B61A53B73723D255877 /* libPods-Juick.a */, ); name = Frameworks; sourceTree = ""; @@ -357,7 +357,7 @@ 77317BA4181BBE8500D60005 /* Sources */, 77317BA5181BBE8500D60005 /* Frameworks */, 77317BA6181BBE8500D60005 /* Resources */, - FA8A2318D105CEEA023CE69A /* [CP] Embed Pods Frameworks */, + 6F2FFD38EF490A735BDA88E5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -451,38 +451,28 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - FA8A2318D105CEEA023CE69A /* [CP] Embed Pods Frameworks */ = { + 6F2FFD38EF490A735BDA88E5 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", - "${BUILT_PRODUCTS_DIR}/DateTools/DateTools.framework", - "${BUILT_PRODUCTS_DIR}/MWFeedParser/MWFeedParser.framework", - "${BUILT_PRODUCTS_DIR}/PDKeychainBindingsController/PDKeychainBindingsController.framework", - "${BUILT_PRODUCTS_DIR}/PHFComposeBarView/PHFComposeBarView.framework", - "${BUILT_PRODUCTS_DIR}/PHFDelegateChain/PHFDelegateChain.framework", - "${BUILT_PRODUCTS_DIR}/TTTAttributedLabel/TTTAttributedLabel.framework", - "${BUILT_PRODUCTS_DIR}/TagListView-ObjC/TagListView_ObjC.framework", - "${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework", - ); - name = "[CP] Embed Pods Frameworks"; + "${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-resources.sh", + "${PODS_ROOT}/DateTools/DateTools/DateTools/DateTools.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/TagListView-ObjC/TagListView-ObjC.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + ); outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DateTools.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MWFeedParser.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PDKeychainBindingsController.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PHFComposeBarView.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PHFDelegateChain.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TTTAttributedLabel.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TagListView_ObjC.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DateTools.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TagListView-ObjC.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/Juick.xcodeproj/xcuserdata/vt.xcuserdatad/xcschemes/Juick.xcscheme b/Juick.xcodeproj/xcuserdata/vt.xcuserdatad/xcschemes/Juick.xcscheme index 8b9b816..6c979ac 100644 --- a/Juick.xcodeproj/xcuserdata/vt.xcuserdatad/xcschemes/Juick.xcscheme +++ b/Juick.xcodeproj/xcuserdata/vt.xcuserdatad/xcschemes/Juick.xcscheme @@ -1,6 +1,6 @@ #import "Message.h" -@import AFNetworking; @interface APIClient : NSObject diff --git a/Juick/Model/User.h b/Juick/Model/User.h index 1d4897e..2710e4a 100644 --- a/Juick/Model/User.h +++ b/Juick/Model/User.h @@ -7,7 +7,6 @@ // @import Foundation; -@import YYModel; @interface User : NSObject @property (nonatomic, strong) NSString *uname; diff --git a/Juick/Model/User.m b/Juick/Model/User.m index 8c20aa3..1576a91 100644 --- a/Juick/Model/User.m +++ b/Juick/Model/User.m @@ -7,8 +7,6 @@ // #import "User.h" - -@import PDKeychainBindingsController; #import "APIClient.h" @implementation User diff --git a/Juick/Supporting Files/Juick-Prefix.pch b/Juick/Supporting Files/Juick-Prefix.pch index 1af6911..0f3a8e7 100644 --- a/Juick/Supporting Files/Juick-Prefix.pch +++ b/Juick/Supporting Files/Juick-Prefix.pch @@ -16,4 +16,15 @@ #import #import #import + + #import + #import + #import "UIImage+Utils.h" + #import + #import + #import + #import + #import + #import + #import #endif diff --git a/Juick/ViewControllers/ChatViewController.h b/Juick/ViewControllers/ChatViewController.h index 3479942..a5c5d5a 100644 --- a/Juick/ViewControllers/ChatViewController.h +++ b/Juick/ViewControllers/ChatViewController.h @@ -9,8 +9,6 @@ #import #import "User.h" -@import PHFComposeBarView; - @interface ChatViewController : UITableViewController @property(nonatomic, strong) NSMutableArray *messages; @property(nonatomic, strong) NSString *uname; diff --git a/Juick/Views/BubbleMessageCell.h b/Juick/Views/BubbleMessageCell.h index 1f5d2e9..875efd3 100644 --- a/Juick/Views/BubbleMessageCell.h +++ b/Juick/Views/BubbleMessageCell.h @@ -10,8 +10,6 @@ #import "Message.h" #import "FixedLabel.h" -@import TTTAttributedLabel; - @interface BubbleMessageCell : UITableViewCell @property (strong, nonatomic) IBOutlet UIImageView *avatarView; @property (strong, nonatomic) IBOutlet UILabel *unreadMarker; diff --git a/Juick/Views/BubbleMessageCell.m b/Juick/Views/BubbleMessageCell.m index 33a4206..51fbaa2 100644 --- a/Juick/Views/BubbleMessageCell.m +++ b/Juick/Views/BubbleMessageCell.m @@ -8,7 +8,6 @@ #import "BubbleMessageCell.h" #import "ColorScheme.h" -@import AFNetworking; @implementation BubbleMessageCell diff --git a/Juick/Views/ConversationCell.m b/Juick/Views/ConversationCell.m index 780e74a..873f21e 100644 --- a/Juick/Views/ConversationCell.m +++ b/Juick/Views/ConversationCell.m @@ -7,7 +7,6 @@ // #import "ConversationCell.h" -@import AFNetworking; @implementation ConversationCell diff --git a/Juick/Views/MessageCell.h b/Juick/Views/MessageCell.h index 475eea3..d9a5533 100644 --- a/Juick/Views/MessageCell.h +++ b/Juick/Views/MessageCell.h @@ -7,8 +7,6 @@ // #import -@import TTTAttributedLabel; -@import TagListView_ObjC; #import "Message.h" @protocol MessageCellDelegate diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m index 4b08190..efdfbc6 100644 --- a/Juick/Views/MessageCell.m +++ b/Juick/Views/MessageCell.m @@ -8,13 +8,8 @@ #import "MessageCell.h" #import "ColorScheme.h" -#import "UIImage+Utils.h" #import "APIClient.h" -@import DateTools; -@import MWFeedParser; -@import AFNetworking; - @implementation MessageCell - (void)awakeFromNib { diff --git a/Podfile b/Podfile index 4c662ba..d223931 100644 --- a/Podfile +++ b/Podfile @@ -1,6 +1,5 @@ # Uncomment this line to define a global platform for your project platform :ios, "11.1" -use_frameworks! target "Juick" do pod 'AFNetworking' diff --git a/Podfile.lock b/Podfile.lock index 6f42ddd..b4a9307 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -65,6 +65,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 -PODFILE CHECKSUM: ddfb05518472010448e3f652b18088e3a340f05a +PODFILE CHECKSUM: a4dae3ca80591a5eedeac58df020463fdd94bb0e COCOAPODS: 1.5.3 -- cgit v1.2.3