From a8a0528fa0ec783065998655f7cbd9a79b5322d3 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Fri, 22 Jan 2016 11:06:02 +0800 Subject: [PATCH] fix JPush compile --- Podfile | 2 +- Podfile.lock | 6 +- Yep.xcodeproj/project.pbxproj | 148 ++++++++++++++++++++++++++++++---- 3 files changed, 136 insertions(+), 20 deletions(-) diff --git a/Podfile b/Podfile index 3c3dc3e4..73c542f2 100644 --- a/Podfile +++ b/Podfile @@ -20,7 +20,7 @@ def pods pod 'MZFayeClient', :path => '../CatchLib-iOS/MZFayeClient/' pod 'RealmSwift' pod 'MonkeyKing', '0.0.2' - pod 'JPush-iOS-SDK' + pod 'JPush' pod 'Fabric' pod 'Crashlytics' end diff --git a/Podfile.lock b/Podfile.lock index 090562e7..f001b52d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -10,7 +10,7 @@ PODS: - DeviceGuru (1.3.3) - Fabric (1.6.4) - FXBlurView (1.6.4) - - JPush-iOS-SDK (2.1.0) + - JPush (2.1.0) - Kanna (1.0.3) - KeyboardMan (0.5.2) - Kingfisher (1.9.2) @@ -38,7 +38,7 @@ DEPENDENCIES: - DeviceGuru - Fabric - FXBlurView - - JPush-iOS-SDK + - JPush - Kanna - KeyboardMan - Kingfisher @@ -64,7 +64,7 @@ SPEC CHECKSUMS: DeviceGuru: 49c6178d77693f8459ace21cecaf4d1d26297d08 Fabric: ed41fd62173c6bdea24ab02c9d7707161eabb750 FXBlurView: db786c2561cb49a09ae98407f52460096ab8a44f - JPush-iOS-SDK: c052ff5b6210f71e958698ae8ffdbd907c05525c + JPush: 92cb879829f0d81ab17b2c9ad009fdb88c6cf6e5 Kanna: 10c7f20762846e808ec5716e4191427bd71bf1c2 KeyboardMan: b081c254c5c0adc794a49b4e97a86cb4ac917a66 Kingfisher: 7b6df0fa9d211807152c32c46494f9bc08f0e07b diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index be212e47..0e035e02 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -38,7 +38,6 @@ 0AD7EA681AC3ED3600617758 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD7EA671AC3ED3600617758 /* Foundation.framework */; }; 0AD7EA6A1AC3ED3D00617758 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD7EA691AC3ED3D00617758 /* UIKit.framework */; }; 0AD7EA6C1AC3ED4300617758 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD7EA6B1AC3ED4300617758 /* Security.framework */; }; - 0AD7EA771AC3EEB000617758 /* PushConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0AD7EA761AC3EEB000617758 /* PushConfig.plist */; }; 0AEB1CC61B0E742400178C9C /* Double+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AEB1CC51B0E742400178C9C /* Double+Yep.swift */; }; 5008A1931B8DB8B500E94274 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5008A1951B8DB8B500E94274 /* Localizable.strings */; }; 500A0B1C1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */; }; @@ -135,6 +134,7 @@ 505082331C21130100643CEB /* FeedGithubRepoContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505082321C21130100643CEB /* FeedGithubRepoContainerView.swift */; }; 505082351C212E9200643CEB /* FeedLocationContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505082341C212E9200643CEB /* FeedLocationContainerView.swift */; }; 505082371C21377E00643CEB /* FeedVoiceContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505082361C21377E00643CEB /* FeedVoiceContainerView.swift */; }; + 5052620B1C51CDE600292C6A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AC40E321C47A8FE0024FC63 /* libz.tbd */; }; 50535D1A1BCD19AE002FE1A4 /* TouchClosuresView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50535D191BCD19AE002FE1A4 /* TouchClosuresView.swift */; }; 50535D1D1BCE42BE002FE1A4 /* PickPhotosViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50535D1C1BCE42BE002FE1A4 /* PickPhotosViewController.swift */; }; 50535D201BCE43ED002FE1A4 /* ImageCacheController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50535D1F1BCE43ED002FE1A4 /* ImageCacheController.swift */; }; @@ -343,7 +343,6 @@ 6AB0DF5A1BE169000052BED1 /* ShareProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AB0DF591BE169000052BED1 /* ShareProfileView.swift */; }; 6AC40E2F1C47A8E10024FC63 /* libGoogleAnalyticsServices.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AC40E2D1C47A8E10024FC63 /* libGoogleAnalyticsServices.a */; }; 6AC40E311C47A8EE0024FC63 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AC40E301C47A8EE0024FC63 /* CoreData.framework */; }; - 6AC40E331C47A8FE0024FC63 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AC40E321C47A8FE0024FC63 /* libz.tbd */; }; 6AC40E351C47A9060024FC63 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AC40E341C47A9060024FC63 /* libsqlite3.tbd */; }; 6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6ADDB44F1B848C600012877A /* 1Password.xcassets */; }; 8409137D1B7DB173001C89D6 /* FriendRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8409137C1B7DB173001C89D6 /* FriendRequestView.swift */; }; @@ -408,7 +407,6 @@ 0AD7EA671AC3ED3600617758 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 0AD7EA691AC3ED3D00617758 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 0AD7EA6B1AC3ED4300617758 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 0AD7EA761AC3EEB000617758 /* PushConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PushConfig.plist; path = JPush/PushConfig.plist; sourceTree = ""; }; 0AEB1CC51B0E742400178C9C /* Double+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Double+Yep.swift"; path = "Extensions/Double+Yep.swift"; sourceTree = ""; }; 4EEAF88E6C6D61E595249DF5 /* Pods-Yep.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Yep.release.xcconfig"; path = "Pods/Target Support Files/Pods-Yep/Pods-Yep.release.xcconfig"; sourceTree = ""; }; 5008A1941B8DB8B500E94274 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -751,8 +749,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5052620B1C51CDE600292C6A /* libz.tbd in Frameworks */, 6AC40E351C47A9060024FC63 /* libsqlite3.tbd in Frameworks */, - 6AC40E331C47A8FE0024FC63 /* libz.tbd in Frameworks */, 0AD7EA641AC3ED2A00617758 /* SystemConfiguration.framework in Frameworks */, 6AC40E311C47A8EE0024FC63 /* CoreData.framework in Frameworks */, 0AD7EA681AC3ED3600617758 /* Foundation.framework in Frameworks */, @@ -877,7 +875,6 @@ 0A8F54AE1AB67D11004AD60E /* Supporting Files */ = { isa = PBXGroup; children = ( - 0AD7EA751AC3EE9B00617758 /* JPush */, 0A8F54AF1AB67D11004AD60E /* Info.plist */, ); name = "Supporting Files"; @@ -947,14 +944,6 @@ name = ScrollView; sourceTree = ""; }; - 0AD7EA751AC3EE9B00617758 /* JPush */ = { - isa = PBXGroup; - children = ( - 0AD7EA761AC3EEB000617758 /* PushConfig.plist */, - ); - name = JPush; - sourceTree = ""; - }; 500A0B1D1B450C2F00D49358 /* EditNicknameAndBadge */ = { isa = PBXGroup; children = ( @@ -2583,7 +2572,6 @@ 50894D031AEA6433000981AF /* EditProfileLessInfoCell.xib in Resources */, 501138321BCB62A20055A014 /* FeedConversationCell.xib in Resources */, 848806B41B7B4E2E000C5424 /* Show.storyboard in Resources */, - 0AD7EA771AC3EEB000617758 /* PushConfig.plist in Resources */, 502B605B1BD1102B00D9C17E /* TitleCell.xib in Resources */, 5064F65A1B0B14420089FAD4 /* AddFriendMoreCell.xib in Resources */, ); @@ -3076,7 +3064,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Yep", - "$(PROJECT_DIR)/build/Debug-iphoneos/Pods", "$(PROJECT_DIR)", ); GCC_OPTIMIZATION_LEVEL = 0; @@ -3089,6 +3076,71 @@ "$(PROJECT_DIR)/Yep/JPush", "$(PROJECT_DIR)/Yep", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"c++\"", + "-l\"jpush-ios-2.1.0\"", + "-l\"z\"", + "-framework", + "\"APAddressBook\"", + "-framework", + "\"Alamofire\"", + "-framework", + "\"Base64\"", + "-framework", + "\"CFNetwork\"", + "-framework", + "\"CoreFoundation\"", + "-framework", + "\"CoreGraphics\"", + "-framework", + "\"CoreTelephony\"", + "-framework", + "\"Crashlytics\"", + "-framework", + "\"DeviceGuru\"", + "-framework", + "\"FXBlurView\"", + "-framework", + "\"Fabric\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"Kanna\"", + "-framework", + "\"KeyboardMan\"", + "-framework", + "\"Kingfisher\"", + "-framework", + "\"MZFayeClient\"", + "-framework", + "\"MonkeyKing\"", + "-framework", + "\"Navi\"", + "-framework", + "\"OnePasswordExtension\"", + "-framework", + "\"Proposer\"", + "-framework", + "\"Realm\"", + "-framework", + "\"RealmSwift\"", + "-framework", + "\"Ruler\"", + "-framework", + "\"Security\"", + "-framework", + "\"SocketRocket\"", + "-framework", + "\"SystemConfiguration\"", + "-framework", + "\"TPKeyboardAvoiding\"", + "-framework", + "\"UIKit\"", + "-framework", + "\"pop\"", + ); PRODUCT_BUNDLE_IDENTIFIER = "Catch-Inc.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -3110,7 +3162,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Yep", - "$(PROJECT_DIR)/build/Debug-iphoneos/Pods", "$(PROJECT_DIR)", ); GCC_OPTIMIZATION_LEVEL = s; @@ -3123,6 +3174,71 @@ "$(PROJECT_DIR)/Yep/JPush", "$(PROJECT_DIR)/Yep", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"c++\"", + "-l\"jpush-ios-2.1.0\"", + "-l\"z\"", + "-framework", + "\"APAddressBook\"", + "-framework", + "\"Alamofire\"", + "-framework", + "\"Base64\"", + "-framework", + "\"CFNetwork\"", + "-framework", + "\"CoreFoundation\"", + "-framework", + "\"CoreGraphics\"", + "-framework", + "\"CoreTelephony\"", + "-framework", + "\"Crashlytics\"", + "-framework", + "\"DeviceGuru\"", + "-framework", + "\"FXBlurView\"", + "-framework", + "\"Fabric\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"Kanna\"", + "-framework", + "\"KeyboardMan\"", + "-framework", + "\"Kingfisher\"", + "-framework", + "\"MZFayeClient\"", + "-framework", + "\"MonkeyKing\"", + "-framework", + "\"Navi\"", + "-framework", + "\"OnePasswordExtension\"", + "-framework", + "\"Proposer\"", + "-framework", + "\"Realm\"", + "-framework", + "\"RealmSwift\"", + "-framework", + "\"Ruler\"", + "-framework", + "\"Security\"", + "-framework", + "\"SocketRocket\"", + "-framework", + "\"SystemConfiguration\"", + "-framework", + "\"TPKeyboardAvoiding\"", + "-framework", + "\"UIKit\"", + "-framework", + "\"pop\"", + ); PRODUCT_BUNDLE_IDENTIFIER = "Catch-Inc.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "";