Skip to content

Commit 95e69d4

Browse files
6ag6ag
committedFeb 1, 2017
升级到swift3.0
1 parent feedd7c commit 95e69d4

File tree

139 files changed

+4336
-3624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4336
-3624
lines changed
 

‎EnglishCommunity-swift.xcodeproj/project.pbxproj

+50-7
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,14 @@
131131
B25278FB1D824A8D0069052A /* JFVideoDownloadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25278FA1D824A8D0069052A /* JFVideoDownloadViewController.swift */; };
132132
B25279631D8269CC0069052A /* mongoose.c in Sources */ = {isa = PBXBuildFile; fileRef = B252795F1D8269CC0069052A /* mongoose.c */; };
133133
B25279641D8269CC0069052A /* MongooseDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = B25279621D8269CC0069052A /* MongooseDaemon.m */; };
134-
B27B98D81D9253E1007B1626 /* jpush-ios-2.1.9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B27B98D71D9253E1007B1626 /* jpush-ios-2.1.9.a */; };
134+
B253551D1E41B40300147217 /* jcore-ios-1.0.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B253551A1E41B40300147217 /* jcore-ios-1.0.0.a */; };
135+
B253551E1E41B40300147217 /* jpush-ios-3.0.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B253551B1E41B40300147217 /* jpush-ios-3.0.0.a */; };
136+
B25355201E41B41600147217 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B253551F1E41B41600147217 /* libresolv.tbd */; };
137+
B25355221E41B50300147217 /* JFShareItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25355211E41B50300147217 /* JFShareItemModel.swift */; };
138+
B25355251E41B50D00147217 /* JFShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25355231E41B50D00147217 /* JFShareView.swift */; };
139+
B25355261E41B50D00147217 /* JFShareItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25355241E41B50D00147217 /* JFShareItemCell.swift */; };
140+
B25355281E41B6A500147217 /* UIImageViewWebImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25355271E41B6A500147217 /* UIImageViewWebImage.swift */; };
141+
B253552A1E41D0BE00147217 /* UIButtonExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25355291E41D0BE00147217 /* UIButtonExtension.swift */; };
135142
B283D1AB1D6A01A900702A75 /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B283D1AA1D6A01A900702A75 /* libicucore.tbd */; };
136143
B283D1AD1D6A01BD00702A75 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B283D1AC1D6A01BD00702A75 /* JavaScriptCore.framework */; };
137144
B283D1AF1D6A01C800702A75 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B283D1AE1D6A01C800702A75 /* ImageIO.framework */; };
@@ -337,8 +344,16 @@
337344
B25279601D8269CC0069052A /* mongoose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mongoose.h; sourceTree = "<group>"; };
338345
B25279611D8269CC0069052A /* MongooseDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MongooseDaemon.h; sourceTree = "<group>"; };
339346
B25279621D8269CC0069052A /* MongooseDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MongooseDaemon.m; sourceTree = "<group>"; };
340-
B27B98D61D9253E1007B1626 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
341-
B27B98D71D9253E1007B1626 /* jpush-ios-2.1.9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-2.1.9.a"; sourceTree = "<group>"; };
347+
B253551A1E41B40300147217 /* jcore-ios-1.0.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jcore-ios-1.0.0.a"; sourceTree = "<group>"; };
348+
B253551B1E41B40300147217 /* jpush-ios-3.0.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-3.0.0.a"; sourceTree = "<group>"; };
349+
B253551C1E41B40300147217 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
350+
B253551F1E41B41600147217 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
351+
B25355211E41B50300147217 /* JFShareItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JFShareItemModel.swift; sourceTree = "<group>"; };
352+
B25355231E41B50D00147217 /* JFShareView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JFShareView.swift; sourceTree = "<group>"; };
353+
B25355241E41B50D00147217 /* JFShareItemCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JFShareItemCell.swift; sourceTree = "<group>"; };
354+
B25355271E41B6A500147217 /* UIImageViewWebImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageViewWebImage.swift; sourceTree = "<group>"; };
355+
B25355291E41D0BE00147217 /* UIButtonExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonExtension.swift; sourceTree = "<group>"; };
356+
B253552B1E41DFCE00147217 /* EnglishCommunity-swift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "EnglishCommunity-swift.entitlements"; sourceTree = "<group>"; };
342357
B283D1A91D69FED500702A75 /* EnglishCommunity-swift-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EnglishCommunity-swift-Bridging-Header.h"; sourceTree = "<group>"; };
343358
B283D1AA1D6A01A900702A75 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
344359
B283D1AC1D6A01BD00702A75 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -412,12 +427,14 @@
412427
isa = PBXFrameworksBuildPhase;
413428
buildActionMask = 2147483647;
414429
files = (
430+
B25355201E41B41600147217 /* libresolv.tbd in Frameworks */,
415431
B283D1B91D6A021A00702A75 /* CFNetwork.framework in Frameworks */,
416432
B283D1B71D6A020100702A75 /* Security.framework in Frameworks */,
417433
B22F2C101D9235AB008C66B6 /* IJKMediaFramework.framework in Frameworks */,
418434
B283D1B51D6A01F100702A75 /* libsqlite3.tbd in Frameworks */,
419435
B283D1B31D6A01E200702A75 /* libiconv.tbd in Frameworks */,
420436
B283D1B11D6A01D400702A75 /* libstdc++.tbd in Frameworks */,
437+
B253551E1E41B40300147217 /* jpush-ios-3.0.0.a in Frameworks */,
421438
B283D1AF1D6A01C800702A75 /* ImageIO.framework in Frameworks */,
422439
B283D1AD1D6A01BD00702A75 /* JavaScriptCore.framework in Frameworks */,
423440
B283D1AB1D6A01A900702A75 /* libicucore.tbd in Frameworks */,
@@ -426,10 +443,10 @@
426443
B20007CD1D4F925E006DA9B0 /* AudioToolbox.framework in Frameworks */,
427444
B20007CB1D4F9256006DA9B0 /* AVFoundation.framework in Frameworks */,
428445
B20007C91D4F9250006DA9B0 /* QuartzCore.framework in Frameworks */,
446+
B253551D1E41B40300147217 /* jcore-ios-1.0.0.a in Frameworks */,
429447
B20007C71D4F9249006DA9B0 /* CoreGraphics.framework in Frameworks */,
430448
B20007C51D4F9240006DA9B0 /* CoreMedia.framework in Frameworks */,
431449
B20007C31D4F9239006DA9B0 /* CoreVideo.framework in Frameworks */,
432-
B27B98D81D9253E1007B1626 /* jpush-ios-2.1.9.a in Frameworks */,
433450
B20007C11D4F9233006DA9B0 /* MediaPlayer.framework in Frameworks */,
434451
B20007BF1D4F9226006DA9B0 /* MobileCoreServices.framework in Frameworks */,
435452
B20007BD1D4F921D006DA9B0 /* OpenGLES.framework in Frameworks */,
@@ -453,6 +470,7 @@
453470
89D49F2DF53D8D609BE64AC4 /* Frameworks */ = {
454471
isa = PBXGroup;
455472
children = (
473+
B253551F1E41B41600147217 /* libresolv.tbd */,
456474
B283D1B81D6A021A00702A75 /* CFNetwork.framework */,
457475
B283D1B61D6A020100702A75 /* Security.framework */,
458476
B283D1B41D6A01F100702A75 /* libsqlite3.tbd */,
@@ -481,6 +499,8 @@
481499
B213E3DF1D54D40A00589058 /* Detail */ = {
482500
isa = PBXGroup;
483501
children = (
502+
B25355231E41B50D00147217 /* JFShareView.swift */,
503+
B25355241E41B50D00147217 /* JFShareItemCell.swift */,
484504
B218AE351D816D8F00FFD470 /* JFProgressView.swift */,
485505
B21436381D551BE300F201AF /* JFTopBarView.swift */,
486506
B214363A1D551BEB00F201AF /* JFTopBarView.xib */,
@@ -521,6 +541,7 @@
521541
B21501BF1D5364C9005E4670 /* Model */ = {
522542
isa = PBXGroup;
523543
children = (
544+
B25355211E41B50300147217 /* JFShareItemModel.swift */,
524545
B2512A6A1D54394000476D0E /* JFVideoCategory.swift */,
525546
B2512A6C1D54396700476D0E /* JFVideoInfo.swift */,
526547
B2512A721D54426B00476D0E /* JFVideo.swift */,
@@ -712,6 +733,7 @@
712733
B2190AFF1D4F85C4007FC0E9 /* EnglishCommunity-swift */ = {
713734
isa = PBXGroup;
714735
children = (
736+
B253552B1E41DFCE00147217 /* EnglishCommunity-swift.entitlements */,
715737
B2190B071D4F85C4007FC0E9 /* Assets.xcassets */,
716738
B2190B091D4F85C4007FC0E9 /* LaunchScreen.storyboard */,
717739
B2190B0C1D4F85C4007FC0E9 /* Info.plist */,
@@ -911,13 +933,15 @@
911933
B28D93D51D534AA700128D20 /* Categories */ = {
912934
isa = PBXGroup;
913935
children = (
936+
B25355271E41B6A500147217 /* UIImageViewWebImage.swift */,
914937
B2C9A6911D62B17B000B08C4 /* FFLabel.swift */,
915938
B2FC66E01D5C67510032703D /* NSDateExtension.swift */,
916939
B2FC66D41D5C16EA0032703D /* StringExtension.swift */,
917940
B2FC66D51D5C16EA0032703D /* UIImageExtension.swift */,
918941
B21501CF1D536697005E4670 /* UIBarButtionItem.swift */,
919942
B21501D01D536697005E4670 /* UIViewExtension.swift */,
920943
B2F50AB41D646694006A91E6 /* UIColorExtension.swift */,
944+
B25355291E41D0BE00147217 /* UIButtonExtension.swift */,
921945
);
922946
path = Categories;
923947
sourceTree = "<group>";
@@ -1100,8 +1124,9 @@
11001124
B2F1BA2D1D6A8F3A003DF045 /* JPush */ = {
11011125
isa = PBXGroup;
11021126
children = (
1103-
B27B98D61D9253E1007B1626 /* JPUSHService.h */,
1104-
B27B98D71D9253E1007B1626 /* jpush-ios-2.1.9.a */,
1127+
B253551A1E41B40300147217 /* jcore-ios-1.0.0.a */,
1128+
B253551B1E41B40300147217 /* jpush-ios-3.0.0.a */,
1129+
B253551C1E41B40300147217 /* JPUSHService.h */,
11051130
);
11061131
path = JPush;
11071132
sourceTree = "<group>";
@@ -1188,11 +1213,13 @@
11881213
attributes = {
11891214
CLASSPREFIX = JF;
11901215
LastSwiftUpdateCheck = 0730;
1191-
LastUpgradeCheck = 0730;
1216+
LastUpgradeCheck = 0820;
11921217
ORGANIZATIONNAME = zhoujianfeng;
11931218
TargetAttributes = {
11941219
B2190AFC1D4F85C4007FC0E9 = {
11951220
CreatedOnToolsVersion = 7.3;
1221+
DevelopmentTeam = 35PE24U644;
1222+
LastSwiftMigration = 0810;
11961223
SystemCapabilities = {
11971224
com.apple.BackgroundModes = {
11981225
enabled = 1;
@@ -1344,6 +1371,8 @@
13441371
B25279641D8269CC0069052A /* MongooseDaemon.m in Sources */,
13451372
B20FD0EF1D6C16C4008DEF0C /* JFMessageRecordCell.swift in Sources */,
13461373
B2156C891D66AF840033DBB6 /* JFSelectFriendViewController.swift in Sources */,
1374+
B25355281E41B6A500147217 /* UIImageViewWebImage.swift in Sources */,
1375+
B25355221E41B50300147217 /* JFShareItemModel.swift in Sources */,
13471376
B2156C651D66AE3A0033DBB6 /* JFForgotViewController.swift in Sources */,
13481377
B2887D751D6D6235009CB44B /* JFVideoDownloadCell.swift in Sources */,
13491378
B2156C8C1D66AF840033DBB6 /* JFSelectFriendCell.swift in Sources */,
@@ -1358,10 +1387,12 @@
13581387
B2156C671D66AE3A0033DBB6 /* JFLoginViewController.swift in Sources */,
13591388
B2B770FC1D61689E0042AA5E /* JFPhotoBrowserCell.swift in Sources */,
13601389
B249AE341D607D41005C0A41 /* JFTweet.swift in Sources */,
1390+
B25355251E41B50D00147217 /* JFShareView.swift in Sources */,
13611391
B238B4161D5DBD4A00E4307A /* JFGrammarDetailViewController.swift in Sources */,
13621392
B21436391D551BE300F201AF /* JFTopBarView.swift in Sources */,
13631393
B2887D7E1D6D778D009CB44B /* JFDownloadManager.swift in Sources */,
13641394
B2C9A6921D62B17B000B08C4 /* FFLabel.swift in Sources */,
1395+
B253552A1E41D0BE00147217 /* UIButtonExtension.swift in Sources */,
13651396
B2DA01191D654E0C0095AB7D /* JFCategoryListCell.swift in Sources */,
13661397
B24C11991D6DF44000AE0646 /* JFWebPlayerViewController.swift in Sources */,
13671398
B2512A6B1D54394000476D0E /* JFVideoCategory.swift in Sources */,
@@ -1393,6 +1424,7 @@
13931424
B25279631D8269CC0069052A /* mongoose.c in Sources */,
13941425
B2FC66D61D5C16EA0032703D /* StringExtension.swift in Sources */,
13951426
B285F5081D5AFB69004F23A6 /* JFFPSLabel.swift in Sources */,
1427+
B25355261E41B50D00147217 /* JFShareItemCell.swift in Sources */,
13961428
B2B771101D61A0790042AA5E /* JFEmoticon.swift in Sources */,
13971429
B2887D711D6D6235009CB44B /* JFTopStoreInfoView.swift in Sources */,
13981430
B2BEBF031D6CBA1F00D4B13B /* JFSearchViewController.swift in Sources */,
@@ -1482,8 +1514,10 @@
14821514
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
14831515
CLANG_WARN_EMPTY_BODY = YES;
14841516
CLANG_WARN_ENUM_CONVERSION = YES;
1517+
CLANG_WARN_INFINITE_RECURSION = YES;
14851518
CLANG_WARN_INT_CONVERSION = YES;
14861519
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1520+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
14871521
CLANG_WARN_UNREACHABLE_CODE = YES;
14881522
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
14891523
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1528,8 +1562,10 @@
15281562
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
15291563
CLANG_WARN_EMPTY_BODY = YES;
15301564
CLANG_WARN_ENUM_CONVERSION = YES;
1565+
CLANG_WARN_INFINITE_RECURSION = YES;
15311566
CLANG_WARN_INT_CONVERSION = YES;
15321567
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1568+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
15331569
CLANG_WARN_UNREACHABLE_CODE = YES;
15341570
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
15351571
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1548,6 +1584,7 @@
15481584
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
15491585
MTL_ENABLE_DEBUG_INFO = NO;
15501586
SDKROOT = iphoneos;
1587+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
15511588
TARGETED_DEVICE_FAMILY = "1,2";
15521589
VALIDATE_PRODUCT = YES;
15531590
};
@@ -1557,7 +1594,9 @@
15571594
isa = XCBuildConfiguration;
15581595
baseConfigurationReference = 99A939157BA8A50076C427E7 /* Pods-EnglishCommunity-swift.debug.xcconfig */;
15591596
buildSettings = {
1597+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
15601598
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1599+
CODE_SIGN_ENTITLEMENTS = "EnglishCommunity-swift/EnglishCommunity-swift.entitlements";
15611600
CODE_SIGN_IDENTITY = "iPhone Developer";
15621601
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15631602
DEVELOPMENT_TEAM = 35PE24U644;
@@ -1579,6 +1618,7 @@
15791618
PRODUCT_NAME = "$(TARGET_NAME)";
15801619
PROVISIONING_PROFILE = "";
15811620
SWIFT_OBJC_BRIDGING_HEADER = "EnglishCommunity-swift/Classes/Application/EnglishCommunity-swift-Bridging-Header.h";
1621+
SWIFT_VERSION = 3.0;
15821622
TARGETED_DEVICE_FAMILY = "1,2";
15831623
};
15841624
name = Debug;
@@ -1587,7 +1627,9 @@
15871627
isa = XCBuildConfiguration;
15881628
baseConfigurationReference = 516DACE58489A1F72B519807 /* Pods-EnglishCommunity-swift.release.xcconfig */;
15891629
buildSettings = {
1630+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
15901631
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1632+
CODE_SIGN_ENTITLEMENTS = "EnglishCommunity-swift/EnglishCommunity-swift.entitlements";
15911633
CODE_SIGN_IDENTITY = "iPhone Developer";
15921634
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15931635
DEVELOPMENT_TEAM = 35PE24U644;
@@ -1609,6 +1651,7 @@
16091651
PRODUCT_NAME = "$(TARGET_NAME)";
16101652
PROVISIONING_PROFILE = "";
16111653
SWIFT_OBJC_BRIDGING_HEADER = "EnglishCommunity-swift/Classes/Application/EnglishCommunity-swift-Bridging-Header.h";
1654+
SWIFT_VERSION = 3.0;
16121655
TARGETED_DEVICE_FAMILY = "1,2";
16131656
};
16141657
name = Release;

‎EnglishCommunity-swift.xcodeproj/xcuserdata/feng.xcuserdatad/xcschemes/EnglishCommunity-swift.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)
Please sign in to comment.