Skip to content

Commit a0f4276

Browse files
raptorxczraptorxcz
authored
Merge pull request #1 from Cleverlance/spm
Add SPM support
2 parents f56f98d + a590690 commit a0f4276

File tree

4 files changed

+59
-14
lines changed

4 files changed

+59
-14
lines changed

‎Carthage/TTTAttributedLabel.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
65C249A21BDFF9A60014AB94 /* TTTAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = A52E64F01B14C1E9002709D4 /* TTTAttributedLabel.m */; };
11-
65C249A51BDFF9A60014AB94 /* TTTAttributedLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = A52E64EF1B14C1E9002709D4 /* TTTAttributedLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
12-
A52E64F11B14C1E9002709D4 /* TTTAttributedLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = A52E64EF1B14C1E9002709D4 /* TTTAttributedLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
13-
A52E64F21B14C1E9002709D4 /* TTTAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = A52E64F01B14C1E9002709D4 /* TTTAttributedLabel.m */; };
10+
31BEC0EB239FCA3C00F92484 /* TTTAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 31BEC0E9239FCA3C00F92484 /* TTTAttributedLabel.m */; };
11+
31BEC0EC239FCA3C00F92484 /* TTTAttributedLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BEC0EA239FCA3C00F92484 /* TTTAttributedLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
1412
/* End PBXBuildFile section */
1513

1614
/* Begin PBXFileReference section */
15+
31BEC0E9239FCA3C00F92484 /* TTTAttributedLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TTTAttributedLabel.m; path = ../../Sources/TTTAttributedLabel.m; sourceTree = "<group>"; };
16+
31BEC0EA239FCA3C00F92484 /* TTTAttributedLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TTTAttributedLabel.h; path = ../../Sources/TTTAttributedLabel.h; sourceTree = "<group>"; };
1717
65C249AA1BDFF9A60014AB94 /* TTTAttributedLabel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TTTAttributedLabel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1818
A52E64271B14C0BF002709D4 /* TTTAttributedLabel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TTTAttributedLabel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1919
A52E642B1B14C0BF002709D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
20-
A52E64EF1B14C1E9002709D4 /* TTTAttributedLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TTTAttributedLabel.h; path = ../../TTTAttributedLabel/TTTAttributedLabel.h; sourceTree = "<group>"; };
21-
A52E64F01B14C1E9002709D4 /* TTTAttributedLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TTTAttributedLabel.m; path = ../../TTTAttributedLabel/TTTAttributedLabel.m; sourceTree = "<group>"; };
2220
/* End PBXFileReference section */
2321

2422
/* Begin PBXFrameworksBuildPhase section */
@@ -59,8 +57,8 @@
5957
A52E64291B14C0BF002709D4 /* TTTAttributedLabel */ = {
6058
isa = PBXGroup;
6159
children = (
62-
A52E64EF1B14C1E9002709D4 /* TTTAttributedLabel.h */,
63-
A52E64F01B14C1E9002709D4 /* TTTAttributedLabel.m */,
60+
31BEC0EA239FCA3C00F92484 /* TTTAttributedLabel.h */,
61+
31BEC0E9239FCA3C00F92484 /* TTTAttributedLabel.m */,
6462
A52E642A1B14C0BF002709D4 /* Supporting Files */,
6563
);
6664
path = TTTAttributedLabel;
@@ -81,15 +79,14 @@
8179
isa = PBXHeadersBuildPhase;
8280
buildActionMask = 2147483647;
8381
files = (
84-
65C249A51BDFF9A60014AB94 /* TTTAttributedLabel.h in Headers */,
8582
);
8683
runOnlyForDeploymentPostprocessing = 0;
8784
};
8885
A52E64241B14C0BF002709D4 /* Headers */ = {
8986
isa = PBXHeadersBuildPhase;
9087
buildActionMask = 2147483647;
9188
files = (
92-
A52E64F11B14C1E9002709D4 /* TTTAttributedLabel.h in Headers */,
89+
31BEC0EC239FCA3C00F92484 /* TTTAttributedLabel.h in Headers */,
9390
);
9491
runOnlyForDeploymentPostprocessing = 0;
9592
};
@@ -138,7 +135,7 @@
138135
A52E641E1B14C0BF002709D4 /* Project object */ = {
139136
isa = PBXProject;
140137
attributes = {
141-
LastUpgradeCheck = 0630;
138+
LastUpgradeCheck = 1110;
142139
TargetAttributes = {
143140
A52E64261B14C0BF002709D4 = {
144141
CreatedOnToolsVersion = 6.3.2;
@@ -147,10 +144,11 @@
147144
};
148145
buildConfigurationList = A52E64211B14C0BF002709D4 /* Build configuration list for PBXProject "TTTAttributedLabel" */;
149146
compatibilityVersion = "Xcode 3.2";
150-
developmentRegion = English;
147+
developmentRegion = en;
151148
hasScannedForEncodings = 0;
152149
knownRegions = (
153150
en,
151+
Base,
154152
);
155153
mainGroup = A52E641D1B14C0BF002709D4;
156154
productRefGroup = A52E64281B14C0BF002709D4 /* Products */;
@@ -185,15 +183,14 @@
185183
isa = PBXSourcesBuildPhase;
186184
buildActionMask = 2147483647;
187185
files = (
188-
65C249A21BDFF9A60014AB94 /* TTTAttributedLabel.m in Sources */,
189186
);
190187
runOnlyForDeploymentPostprocessing = 0;
191188
};
192189
A52E64221B14C0BF002709D4 /* Sources */ = {
193190
isa = PBXSourcesBuildPhase;
194191
buildActionMask = 2147483647;
195192
files = (
196-
A52E64F21B14C1E9002709D4 /* TTTAttributedLabel.m in Sources */,
193+
31BEC0EB239FCA3C00F92484 /* TTTAttributedLabel.m in Sources */,
197194
);
198195
runOnlyForDeploymentPostprocessing = 0;
199196
};
@@ -211,6 +208,7 @@
211208
INFOPLIST_FILE = TTTAttributedLabel/Info.plist;
212209
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
213210
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
211+
PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)";
214212
PRODUCT_NAME = TTTAttributedLabel;
215213
SDKROOT = appletvos;
216214
SKIP_INSTALL = YES;
@@ -229,6 +227,7 @@
229227
INFOPLIST_FILE = TTTAttributedLabel/Info.plist;
230228
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
231229
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
230+
PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)";
232231
PRODUCT_NAME = TTTAttributedLabel;
233232
SDKROOT = appletvos;
234233
SKIP_INSTALL = YES;
@@ -241,24 +240,36 @@
241240
buildSettings = {
242241
ALWAYS_SEARCH_USER_PATHS = NO;
243242
BITCODE_GENERATION_MODE = bitcode;
243+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
244244
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
245245
CLANG_CXX_LIBRARY = "libc++";
246246
CLANG_ENABLE_MODULES = YES;
247247
CLANG_ENABLE_OBJC_ARC = YES;
248+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
248249
CLANG_WARN_BOOL_CONVERSION = YES;
250+
CLANG_WARN_COMMA = YES;
249251
CLANG_WARN_CONSTANT_CONVERSION = YES;
252+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
250253
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
251254
CLANG_WARN_EMPTY_BODY = YES;
252255
CLANG_WARN_ENUM_CONVERSION = YES;
256+
CLANG_WARN_INFINITE_RECURSION = YES;
253257
CLANG_WARN_INT_CONVERSION = YES;
258+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
259+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
260+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
254261
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
262+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
263+
CLANG_WARN_STRICT_PROTOTYPES = YES;
264+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
255265
CLANG_WARN_UNREACHABLE_CODE = YES;
256266
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
257267
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
258268
COPY_PHASE_STRIP = NO;
259269
CURRENT_PROJECT_VERSION = 1;
260270
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
261271
ENABLE_STRICT_OBJC_MSGSEND = YES;
272+
ENABLE_TESTABILITY = YES;
262273
GCC_C_LANGUAGE_STANDARD = gnu99;
263274
GCC_DYNAMIC_NO_PIC = NO;
264275
GCC_NO_COMMON_BLOCKS = YES;
@@ -290,17 +301,28 @@
290301
buildSettings = {
291302
ALWAYS_SEARCH_USER_PATHS = NO;
292303
BITCODE_GENERATION_MODE = bitcode;
304+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
293305
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
294306
CLANG_CXX_LIBRARY = "libc++";
295307
CLANG_ENABLE_MODULES = YES;
296308
CLANG_ENABLE_OBJC_ARC = YES;
309+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
297310
CLANG_WARN_BOOL_CONVERSION = YES;
311+
CLANG_WARN_COMMA = YES;
298312
CLANG_WARN_CONSTANT_CONVERSION = YES;
313+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
299314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
300315
CLANG_WARN_EMPTY_BODY = YES;
301316
CLANG_WARN_ENUM_CONVERSION = YES;
317+
CLANG_WARN_INFINITE_RECURSION = YES;
302318
CLANG_WARN_INT_CONVERSION = YES;
319+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
320+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
321+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
303322
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
323+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
324+
CLANG_WARN_STRICT_PROTOTYPES = YES;
325+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
304326
CLANG_WARN_UNREACHABLE_CODE = YES;
305327
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
306328
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -339,6 +361,7 @@
339361
INFOPLIST_FILE = TTTAttributedLabel/Info.plist;
340362
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
341363
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
364+
PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)";
342365
PRODUCT_NAME = "$(TARGET_NAME)";
343366
SKIP_INSTALL = YES;
344367
};
@@ -355,6 +378,7 @@
355378
INFOPLIST_FILE = TTTAttributedLabel/Info.plist;
356379
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
357380
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
381+
PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)";
358382
PRODUCT_NAME = "$(TARGET_NAME)";
359383
SKIP_INSTALL = YES;
360384
};

‎Package.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// swift-tools-version:5.1
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "TTTAttributedLabel",
7+
products: [
8+
.library(
9+
name: "TTTAttributedLabel",
10+
targets: ["TTTAttributedLabel"]
11+
)
12+
],
13+
targets: [
14+
.target(
15+
name: "TTTAttributedLabel",
16+
path: ".",
17+
sources: ["Sources"],
18+
publicHeadersPath: "Sources"
19+
),
20+
]
21+
)

‎TTTAttributedLabel/TTTAttributedLabel.h‎ renamed to ‎Sources/TTTAttributedLabel.h‎

File renamed without changes.

‎TTTAttributedLabel/TTTAttributedLabel.m‎ renamed to ‎Sources/TTTAttributedLabel.m‎

File renamed without changes.

0 commit comments

Comments
 (0)