Skip to content

Commit ae65f9a

Browse files
author
David LaMacchia
committed
Update for 2.0.5 objc release
- Fixes project files to address analyzer warnings, problems with groups (and missing files) - IFUnicodeURL.h is the umbrella header for the IFUnicodeURL.xcodeproj and as such, should not be included as a file in the TwitterText.xcodeproj - Fixes project files to address problems using the framework on macOS.
1 parent 0c65b91 commit ae65f9a

File tree

4 files changed

+38
-18
lines changed

4 files changed

+38
-18
lines changed

‎objc/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55

6+
## [2.0.5] - 2018-02-07
7+
### Changed
8+
- Fixes project files to address analyzer warnings, problems with
9+
groups (and missing files)
10+
- IFUnicodeURL.h is the umbrella header for the IFUnicodeURL.xcodeproj
11+
and as such, should not be included as a file in the
12+
TwitterText.xcodeproj
13+
- Fixes project files to address problems using the framework on
14+
macOS.
15+
616
## [2.0.4] - 2018-01-26
717
### Changed
818
- Domains with country code TLDs that are not prefixed by a protocol

‎objc/ThirdParty/IFUnicodeURL/Tests/NSURL+IFUnicodeURLTest.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// Copyright (c) 2014 Twitter, Inc. All rights reserved.
77
//
88

9-
#import "NSURL+IFUnicodeURL.h"
10-
9+
@import TwitterText.NSURL_IFUnicodeURL;
1110
@import XCTest;
1211

12+
1313
@interface NSURL_IFUnicodeURLTest : XCTestCase
1414
@end
1515

‎objc/TwitterText.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
3DD6F6BC1E6A397600437514 /* TwitterTextEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD6F6B81E6A397600437514 /* TwitterTextEntity.h */; settings = {ATTRIBUTES = (Public, ); }; };
1515
3DD6F6BD1E6A397600437514 /* TwitterTextEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD6F6B91E6A397600437514 /* TwitterTextEntity.m */; };
1616
D0DDF1991FFED34C0019BEA7 /* NSURL+IFUnicodeURL.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF1961FFED34C0019BEA7 /* NSURL+IFUnicodeURL.h */; settings = {ATTRIBUTES = (Public, ); }; };
17-
D0DDF19A1FFED34C0019BEA7 /* IFUnicodeURL.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF1971FFED34C0019BEA7 /* IFUnicodeURL.h */; };
1817
D0DDF19B1FFED34C0019BEA7 /* NSURL+IFUnicodeURL.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DDF1981FFED34C0019BEA7 /* NSURL+IFUnicodeURL.m */; };
1918
D0DDF1B61FFED35D0019BEA7 /* puny.c in Sources */ = {isa = PBXBuildFile; fileRef = D0DDF19C1FFED35D0019BEA7 /* puny.c */; };
2019
D0DDF1B71FFED35D0019BEA7 /* race.c in Sources */ = {isa = PBXBuildFile; fileRef = D0DDF19D1FFED35D0019BEA7 /* race.c */; };
@@ -77,7 +76,6 @@
7776
D0FE6FDF20069DE90032DA00 /* util.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF1A11FFED35D0019BEA7 /* util.h */; };
7877
D0FE6FE020069DEC0032DA00 /* xcode_config.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF1A21FFED35D0019BEA7 /* xcode_config.h */; };
7978
D0FE6FE120069DEE0032DA00 /* xcode.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF19E1FFED35D0019BEA7 /* xcode.h */; };
80-
D0FE6FE220069DF00032DA00 /* IFUnicodeURL.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF1971FFED34C0019BEA7 /* IFUnicodeURL.h */; };
8179
D0FE6FE320069DF50032DA00 /* NSURL+IFUnicodeURL.h in Headers */ = {isa = PBXBuildFile; fileRef = D0DDF1961FFED34C0019BEA7 /* NSURL+IFUnicodeURL.h */; settings = {ATTRIBUTES = (Public, ); }; };
8280
D0FE6FE420069DFF0032DA00 /* NSURL+IFUnicodeURL.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DDF1981FFED34C0019BEA7 /* NSURL+IFUnicodeURL.m */; };
8381
D0FE6FE720069EA60032DA00 /* TwitterText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0FE6FAC200699CA0032DA00 /* TwitterText.framework */; };
@@ -102,18 +100,17 @@
102100

103101
/* Begin PBXFileReference section */
104102
3D4B56B01E6A37DF00E8E570 /* TwitterText.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TwitterText.framework; sourceTree = BUILT_PRODUCTS_DIR; };
105-
3D4B56B41E6A37DF00E8E570 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = resources/Info.plist; sourceTree = "<group>"; };
103+
3D4B56B41E6A37DF00E8E570 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = resources/Info.plist; sourceTree = "<group>"; };
106104
3D4B56B91E6A37DF00E8E570 /* TwitterTextTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TwitterTextTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
107105
3D4B56BE1E6A37DF00E8E570 /* TwitterTextTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TwitterTextTests.m; sourceTree = "<group>"; };
108106
3D4B56C01E6A37DF00E8E570 /* TwitterTextTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "TwitterTextTests-Info.plist"; path = "resources/TwitterTextTests-Info.plist"; sourceTree = "<group>"; };
109-
3DD6F6B61E6A397600437514 /* TwitterText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TwitterText.h; path = lib/TwitterText.h; sourceTree = SOURCE_ROOT; };
110-
3DD6F6B71E6A397600437514 /* TwitterText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TwitterText.m; path = lib/TwitterText.m; sourceTree = SOURCE_ROOT; };
111-
3DD6F6B81E6A397600437514 /* TwitterTextEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TwitterTextEntity.h; path = lib/TwitterTextEntity.h; sourceTree = SOURCE_ROOT; };
112-
3DD6F6B91E6A397600437514 /* TwitterTextEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TwitterTextEntity.m; path = lib/TwitterTextEntity.m; sourceTree = SOURCE_ROOT; };
113-
3DD6F6C01E6A4B7600437514 /* TwitterText.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = TwitterText.modulemap; path = resources/TwitterText.modulemap; sourceTree = SOURCE_ROOT; };
107+
3DD6F6B61E6A397600437514 /* TwitterText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TwitterText.h; path = lib/TwitterText.h; sourceTree = "<group>"; };
108+
3DD6F6B71E6A397600437514 /* TwitterText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TwitterText.m; path = lib/TwitterText.m; sourceTree = "<group>"; };
109+
3DD6F6B81E6A397600437514 /* TwitterTextEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TwitterTextEntity.h; path = lib/TwitterTextEntity.h; sourceTree = "<group>"; };
110+
3DD6F6B91E6A397600437514 /* TwitterTextEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TwitterTextEntity.m; path = lib/TwitterTextEntity.m; sourceTree = "<group>"; };
111+
3DD6F6C01E6A4B7600437514 /* TwitterText.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = TwitterText.modulemap; path = resources/TwitterText.modulemap; sourceTree = "<group>"; };
114112
74E1D6611E6E7A9500200344 /* TwitterTextTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwitterTextTests.h; sourceTree = "<group>"; };
115113
D0DDF1961FFED34C0019BEA7 /* NSURL+IFUnicodeURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSURL+IFUnicodeURL.h"; path = "IFUnicodeURL/IFUnicodeURL/NSURL+IFUnicodeURL.h"; sourceTree = "<group>"; };
116-
D0DDF1971FFED34C0019BEA7 /* IFUnicodeURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IFUnicodeURL.h; path = IFUnicodeURL/IFUnicodeURL/IFUnicodeURL.h; sourceTree = "<group>"; };
117114
D0DDF1981FFED34C0019BEA7 /* NSURL+IFUnicodeURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSURL+IFUnicodeURL.m"; path = "IFUnicodeURL/IFUnicodeURL/NSURL+IFUnicodeURL.m"; sourceTree = "<group>"; };
118115
D0DDF19C1FFED35D0019BEA7 /* puny.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = puny.c; path = IFUnicodeURL/IFUnicodeURL/IDNSDK/puny.c; sourceTree = "<group>"; };
119116
D0DDF19D1FFED35D0019BEA7 /* race.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = race.c; path = IFUnicodeURL/IFUnicodeURL/IDNSDK/race.c; sourceTree = "<group>"; };
@@ -141,8 +138,8 @@
141138
D0DDF1B41FFED35D0019BEA7 /* nameprep_prohibit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nameprep_prohibit.h; sourceTree = "<group>"; };
142139
D0DDF1B51FFED35D0019BEA7 /* nameprep_prohibit_allowunassigned.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nameprep_prohibit_allowunassigned.h; sourceTree = "<group>"; };
143140
D0DDF1D01FFED3800019BEA7 /* NSURL+IFUnicodeURLTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSURL+IFUnicodeURLTest.m"; path = "IFUnicodeURL/Tests/NSURL+IFUnicodeURLTest.m"; sourceTree = "<group>"; };
144-
D0F715B8200985C100D66E5C /* v1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = v1.json; path = ../../config/v1.json; sourceTree = "<group>"; };
145-
D0F715B9200985C100D66E5C /* v2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = v2.json; path = ../../config/v2.json; sourceTree = "<group>"; };
141+
D0F715B8200985C100D66E5C /* v1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = v1.json; sourceTree = "<group>"; };
142+
D0F715B9200985C100D66E5C /* v2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = v2.json; sourceTree = "<group>"; };
146143
D0FE6FAC200699CA0032DA00 /* TwitterText.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TwitterText.framework; sourceTree = BUILT_PRODUCTS_DIR; };
147144
D0FE6FB4200699CB0032DA00 /* TwitterTextTests Mac.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TwitterTextTests Mac.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
148145
/* End PBXFileReference section */
@@ -214,7 +211,7 @@
214211
3DD6F6C01E6A4B7600437514 /* TwitterText.modulemap */,
215212
3D4B56B41E6A37DF00E8E570 /* Info.plist */,
216213
);
217-
path = TwitterText;
214+
name = TwitterText;
218215
sourceTree = "<group>";
219216
};
220217
3D4B56BD1E6A37DF00E8E570 /* TwitterTextTests */ = {
@@ -269,7 +266,6 @@
269266
D0DDF1A11FFED35D0019BEA7 /* util.h */,
270267
D0DDF1A21FFED35D0019BEA7 /* xcode_config.h */,
271268
D0DDF19E1FFED35D0019BEA7 /* xcode.h */,
272-
D0DDF1971FFED34C0019BEA7 /* IFUnicodeURL.h */,
273269
D0DDF1961FFED34C0019BEA7 /* NSURL+IFUnicodeURL.h */,
274270
D0DDF1981FFED34C0019BEA7 /* NSURL+IFUnicodeURL.m */,
275271
);
@@ -311,6 +307,7 @@
311307
D0F715B9200985C100D66E5C /* v2.json */,
312308
);
313309
name = Resources;
310+
path = ../config;
314311
sourceTree = "<group>";
315312
};
316313
/* End PBXGroup section */
@@ -335,7 +332,6 @@
335332
D0DDF1CA1FFED35D0019BEA7 /* nameprep_datastructures.h in Headers */,
336333
D0DDF1C71FFED35D0019BEA7 /* nameprep_compose.h in Headers */,
337334
D0DDF1BE1FFED35D0019BEA7 /* nameprep.h in Headers */,
338-
D0DDF19A1FFED34C0019BEA7 /* IFUnicodeURL.h in Headers */,
339335
D0DDF1C81FFED35D0019BEA7 /* nameprep_cononical.h in Headers */,
340336
D0DDF1C31FFED35D0019BEA7 /* nameprep_bidi_lcat.h in Headers */,
341337
3DD6F6BC1E6A397600437514 /* TwitterTextEntity.h in Headers */,
@@ -372,7 +368,6 @@
372368
D0FE6FD020069DD50032DA00 /* nameprep_bidi_lcat.h in Headers */,
373369
D0FE6FCD20069DC90032DA00 /* puny.h in Headers */,
374370
D0FE6FD720069DD60032DA00 /* nameprep_datastructures.h in Headers */,
375-
D0FE6FE220069DF00032DA00 /* IFUnicodeURL.h in Headers */,
376371
D0FE6FE020069DEC0032DA00 /* xcode_config.h in Headers */,
377372
D0FE6FC320069D800032DA00 /* TwitterText.h in Headers */,
378373
);
@@ -459,7 +454,7 @@
459454
3D4B56A71E6A37DF00E8E570 /* Project object */ = {
460455
isa = PBXProject;
461456
attributes = {
462-
LastUpgradeCheck = 0820;
457+
LastUpgradeCheck = 0920;
463458
ORGANIZATIONNAME = Twitter;
464459
TargetAttributes = {
465460
3D4B56AF1E6A37DF00E8E570 = {
@@ -610,7 +605,9 @@
610605
CLANG_CXX_LIBRARY = "libc++";
611606
CLANG_ENABLE_MODULES = YES;
612607
CLANG_ENABLE_OBJC_ARC = YES;
608+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
613609
CLANG_WARN_BOOL_CONVERSION = YES;
610+
CLANG_WARN_COMMA = YES;
614611
CLANG_WARN_CONSTANT_CONVERSION = YES;
615612
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
616613
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -621,6 +618,8 @@
621618
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
622619
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
623620
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
621+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
622+
CLANG_WARN_STRICT_PROTOTYPES = YES;
624623
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
625624
CLANG_WARN_SUSPICIOUS_MOVE = YES;
626625
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -663,7 +662,9 @@
663662
CLANG_CXX_LIBRARY = "libc++";
664663
CLANG_ENABLE_MODULES = YES;
665664
CLANG_ENABLE_OBJC_ARC = YES;
665+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
666666
CLANG_WARN_BOOL_CONVERSION = YES;
667+
CLANG_WARN_COMMA = YES;
667668
CLANG_WARN_CONSTANT_CONVERSION = YES;
668669
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
669670
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -674,6 +675,8 @@
674675
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
675676
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
676677
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
678+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
679+
CLANG_WARN_STRICT_PROTOTYPES = YES;
677680
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
678681
CLANG_WARN_SUSPICIOUS_MOVE = YES;
679682
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -786,6 +789,7 @@
786789
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
787790
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
788791
MACOSX_DEPLOYMENT_TARGET = 10.12;
792+
MODULEMAP_FILE = resources/TwitterText.modulemap;
789793
PRODUCT_BUNDLE_IDENTIFIER = com.twitter.TwitterText;
790794
PRODUCT_NAME = TwitterText;
791795
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -821,6 +825,7 @@
821825
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
822826
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
823827
MACOSX_DEPLOYMENT_TARGET = 10.12;
828+
MODULEMAP_FILE = resources/TwitterText.modulemap;
824829
PRODUCT_BUNDLE_IDENTIFIER = com.twitter.TwitterText;
825830
PRODUCT_NAME = TwitterText;
826831
PROVISIONING_PROFILE_SPECIFIER = "";

‎objc/resources/TwitterText.modulemap‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ framework module TwitterText {
88
header "TwitterTextEntity.h"
99
export *
1010
}
11+
12+
module NSURL_IFUnicodeURL {
13+
header "NSURL+IFUnicodeURL.h"
14+
export *
15+
}
1116
}

0 commit comments

Comments
 (0)