Skip to content

Commit e8666e6

Browse files
committed
Merge pull request #138 from toshi0383/ts-tvos-fix
Revise tvOS Carthage support
2 parents 2f7270f + 1bf19c9 commit e8666e6

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

MarqueeLabelTV/MarqueeLabelTV.xcodeproj/project.pbxproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
EA59ABFC1CAA274A0052AD98 /* MarqueeLabel.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MarqueeLabel.storyboard; sourceTree = SOURCE_ROOT; };
1919
EA59ABFE1CAA278D0052AD98 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = SOURCE_ROOT; };
2020
EA59AC001CAA28410052AD98 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = SOURCE_ROOT; };
21-
EA59AC071CAA28D80052AD98 /* MarqueeLabelTV.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MarqueeLabelTV.framework; sourceTree = BUILT_PRODUCTS_DIR; };
21+
EA59AC071CAA28D80052AD98 /* MarqueeLabel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MarqueeLabel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2222
EA59AC0B1CAA28D80052AD98 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2323
EAAEFA011CAA2C1A00F8D857 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2424
EADADDF31CD2C6000034838E /* MarqueeLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MarqueeLabel.swift; path = ../../Sources/Swift/MarqueeLabel.swift; sourceTree = "<group>"; };
@@ -66,7 +66,7 @@
6666
isa = PBXGroup;
6767
children = (
6868
EAE4ACB61CAA23FD006C1ECC /* MarqueeLabelTVDemo.app */,
69-
EA59AC071CAA28D80052AD98 /* MarqueeLabelTV.framework */,
69+
EA59AC071CAA28D80052AD98 /* MarqueeLabel.framework */,
7070
);
7171
name = Products;
7272
sourceTree = "<group>";
@@ -130,9 +130,9 @@
130130
/* End PBXHeadersBuildPhase section */
131131

132132
/* Begin PBXNativeTarget section */
133-
EA59AC061CAA28D80052AD98 /* MarqueeLabelTV */ = {
133+
EA59AC061CAA28D80052AD98 /* MarqueeLabel */ = {
134134
isa = PBXNativeTarget;
135-
buildConfigurationList = EA59AC0C1CAA28D80052AD98 /* Build configuration list for PBXNativeTarget "MarqueeLabelTV" */;
135+
buildConfigurationList = EA59AC0C1CAA28D80052AD98 /* Build configuration list for PBXNativeTarget "MarqueeLabel" */;
136136
buildPhases = (
137137
EA59AC021CAA28D80052AD98 /* Sources */,
138138
EA59AC031CAA28D80052AD98 /* Frameworks */,
@@ -143,9 +143,9 @@
143143
);
144144
dependencies = (
145145
);
146-
name = MarqueeLabelTV;
146+
name = MarqueeLabel;
147147
productName = MarqueeLabelTV;
148-
productReference = EA59AC071CAA28D80052AD98 /* MarqueeLabelTV.framework */;
148+
productReference = EA59AC071CAA28D80052AD98 /* MarqueeLabel.framework */;
149149
productType = "com.apple.product-type.framework";
150150
};
151151
EAE4ACB51CAA23FD006C1ECC /* MarqueeLabelTVDemo */ = {
@@ -197,7 +197,7 @@
197197
projectRoot = "";
198198
targets = (
199199
EAE4ACB51CAA23FD006C1ECC /* MarqueeLabelTVDemo */,
200-
EA59AC061CAA28D80052AD98 /* MarqueeLabelTV */,
200+
EA59AC061CAA28D80052AD98 /* MarqueeLabel */,
201201
);
202202
};
203203
/* End PBXProject section */
@@ -260,6 +260,7 @@
260260
SKIP_INSTALL = YES;
261261
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
262262
TARGETED_DEVICE_FAMILY = 3;
263+
TVOS_DEPLOYMENT_TARGET = 9.0;
263264
VERSIONING_SYSTEM = "apple-generic";
264265
VERSION_INFO_PREFIX = "";
265266
};
@@ -283,6 +284,7 @@
283284
SKIP_INSTALL = YES;
284285
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
285286
TARGETED_DEVICE_FAMILY = 3;
287+
TVOS_DEPLOYMENT_TARGET = 9.0;
286288
VERSIONING_SYSTEM = "apple-generic";
287289
VERSION_INFO_PREFIX = "";
288290
};
@@ -398,7 +400,7 @@
398400
/* End XCBuildConfiguration section */
399401

400402
/* Begin XCConfigurationList section */
401-
EA59AC0C1CAA28D80052AD98 /* Build configuration list for PBXNativeTarget "MarqueeLabelTV" */ = {
403+
EA59AC0C1CAA28D80052AD98 /* Build configuration list for PBXNativeTarget "MarqueeLabel" */ = {
402404
isa = XCConfigurationList;
403405
buildConfigurations = (
404406
EA59AC0D1CAA28D80052AD98 /* Debug */,

MarqueeLabelTV/MarqueeLabelTV.xcodeproj/xcshareddata/xcschemes/MarqueeLabelTV.xcscheme

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "EA59AC061CAA28D80052AD98"
18-
BuildableName = "MarqueeLabelTV.framework"
19-
BlueprintName = "MarqueeLabelTV"
18+
BuildableName = "MarqueeLabel.framework"
19+
BlueprintName = "MarqueeLabel"
2020
ReferencedContainer = "container:MarqueeLabelTV.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -46,8 +46,8 @@
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
4848
BlueprintIdentifier = "EA59AC061CAA28D80052AD98"
49-
BuildableName = "MarqueeLabelTV.framework"
50-
BlueprintName = "MarqueeLabelTV"
49+
BuildableName = "MarqueeLabel.framework"
50+
BlueprintName = "MarqueeLabel"
5151
ReferencedContainer = "container:MarqueeLabelTV.xcodeproj">
5252
</BuildableReference>
5353
</MacroExpansion>
@@ -64,8 +64,8 @@
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
6666
BlueprintIdentifier = "EA59AC061CAA28D80052AD98"
67-
BuildableName = "MarqueeLabelTV.framework"
68-
BlueprintName = "MarqueeLabelTV"
67+
BuildableName = "MarqueeLabel.framework"
68+
BlueprintName = "MarqueeLabel"
6969
ReferencedContainer = "container:MarqueeLabelTV.xcodeproj">
7070
</BuildableReference>
7171
</MacroExpansion>

0 commit comments

Comments
 (0)