Skip to content

Commit

Permalink
Merge pull request #13 from isair/swift2
Browse files Browse the repository at this point in the history
Language update and tvOS support
  • Loading branch information
isair committed Nov 22, 2015
2 parents 867752e + 9608020 commit a228e06
Show file tree
Hide file tree
Showing 4 changed files with 232 additions and 3 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
language: objective-c
osx_image: beta-xcode6.3
script:
- xctool -project ManualLayout.xcodeproj -scheme ManualLayout build
osx_image: xcode7.1
121 changes: 121 additions & 0 deletions ManualLayout.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@
5F9134A11AC9E3A00001DBF8 /* ManualLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FB4CBE91A9BBE7500C2FB4F /* ManualLayout.framework */; };
5FB4CBEF1A9BBE7500C2FB4F /* ManualLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
5FB4CBF51A9BBE7500C2FB4F /* ManualLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FB4CBE91A9BBE7500C2FB4F /* ManualLayout.framework */; };
5FE3334F1C028A8F00EF50C4 /* Info-tvOS.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5FE3334E1C028A8F00EF50C4 /* Info-tvOS.plist */; };
FE4500621BF12E5F0005E270 /* CGRect+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F9134771AC9E0830001DBF8 /* CGRect+ManualLayout.swift */; };
FE4500631BF12E5F0005E270 /* CALayer+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C681A9BE99F003CACDD /* CALayer+ManualLayout.swift */; };
FE4500641BF12E5F0005E270 /* UIViewController+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC3E1A9E970300347483 /* UIViewController+ManualLayout.swift */; };
FE4500651BF12E5F0005E270 /* HelperFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4F1A9FDDD900347483 /* HelperFunctions.swift */; };
FE4500661BF12E5F0005E270 /* UIView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F875C6C1A9BFC7E003CACDD /* UIView+ManualLayout.swift */; };
FE4500671BF12E5F0005E270 /* SmartAssign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F67BC4B1A9FAB4B00347483 /* SmartAssign.swift */; };
FE4500681BF12E5F0005E270 /* UIScrollView+ManualLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F3026911AAA3C6B00F65A20 /* UIScrollView+ManualLayout.swift */; };
FE45006B1BF12E5F0005E270 /* ManualLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -78,6 +87,8 @@
5FB4CBEE1A9BBE7500C2FB4F /* ManualLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ManualLayout.h; sourceTree = "<group>"; };
5FB4CBF41A9BBE7500C2FB4F /* ManualLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ManualLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5FB4CBFA1A9BBE7500C2FB4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5FE3334E1C028A8F00EF50C4 /* Info-tvOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
FE4500701BF12E5F0005E270 /* ManualLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ManualLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -111,6 +122,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE4500691BF12E5F0005E270 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -169,6 +187,7 @@
5FB4CBF41A9BBE7500C2FB4F /* ManualLayoutTests.xctest */,
5F91347D1AC9E1630001DBF8 /* SimpleExample.app */,
5F9134911AC9E1640001DBF8 /* SimpleExampleTests.xctest */,
FE4500701BF12E5F0005E270 /* ManualLayout.framework */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -193,6 +212,7 @@
isa = PBXGroup;
children = (
5FB4CBED1A9BBE7500C2FB4F /* Info.plist */,
5FE3334E1C028A8F00EF50C4 /* Info-tvOS.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
Expand Down Expand Up @@ -228,6 +248,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE45006A1BF12E5F0005E270 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
FE45006B1BF12E5F0005E270 /* ManualLayout.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -303,6 +331,24 @@
productReference = 5FB4CBF41A9BBE7500C2FB4F /* ManualLayoutTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
FE4500601BF12E5F0005E270 /* ManualLayout tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = FE45006D1BF12E5F0005E270 /* Build configuration list for PBXNativeTarget "ManualLayout tvOS" */;
buildPhases = (
FE4500611BF12E5F0005E270 /* Sources */,
FE4500691BF12E5F0005E270 /* Frameworks */,
FE45006A1BF12E5F0005E270 /* Headers */,
FE45006C1BF12E5F0005E270 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "ManualLayout tvOS";
productName = ManualLayout;
productReference = FE4500701BF12E5F0005E270 /* ManualLayout.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand Down Expand Up @@ -345,6 +391,7 @@
5FB4CBF31A9BBE7500C2FB4F /* ManualLayoutTests */,
5F91347C1AC9E1630001DBF8 /* SimpleExample */,
5F9134901AC9E1640001DBF8 /* SimpleExampleTests */,
FE4500601BF12E5F0005E270 /* ManualLayout tvOS */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -380,6 +427,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE45006C1BF12E5F0005E270 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5FE3334F1C028A8F00EF50C4 /* Info-tvOS.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -425,6 +480,20 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE4500611BF12E5F0005E270 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FE4500621BF12E5F0005E270 /* CGRect+ManualLayout.swift in Sources */,
FE4500631BF12E5F0005E270 /* CALayer+ManualLayout.swift in Sources */,
FE4500641BF12E5F0005E270 /* UIViewController+ManualLayout.swift in Sources */,
FE4500651BF12E5F0005E270 /* HelperFunctions.swift in Sources */,
FE4500661BF12E5F0005E270 /* UIView+ManualLayout.swift in Sources */,
FE4500671BF12E5F0005E270 /* SmartAssign.swift in Sources */,
FE4500681BF12E5F0005E270 /* UIScrollView+ManualLayout.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand Down Expand Up @@ -680,6 +749,49 @@
};
name = Release;
};
FE45006E1BF12E5F0005E270 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "ManualLayout/Info-tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.ManualLayout;
PRODUCT_NAME = ManualLayout;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = 3;
};
name = Debug;
};
FE45006F1BF12E5F0005E270 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "ManualLayout/Info-tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.ManualLayout;
PRODUCT_NAME = ManualLayout;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -728,6 +840,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
FE45006D1BF12E5F0005E270 /* Build configuration list for PBXNativeTarget "ManualLayout tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FE45006E1BF12E5F0005E270 /* Debug */,
FE45006F1BF12E5F0005E270 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 5FB4CBE01A9BBE7500C2FB4F /* Project object */;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE4500601BF12E5F0005E270"
BuildableName = "ManualLayout.framework"
BlueprintName = "ManualLayout tvOS"
ReferencedContainer = "container:ManualLayout.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE4500601BF12E5F0005E270"
BuildableName = "ManualLayout.framework"
BlueprintName = "ManualLayout tvOS"
ReferencedContainer = "container:ManualLayout.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE4500601BF12E5F0005E270"
BuildableName = "ManualLayout.framework"
BlueprintName = "ManualLayout tvOS"
ReferencedContainer = "container:ManualLayout.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
30 changes: 30 additions & 0 deletions ManualLayout/Info-tvOS.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
</dict>
</plist>

0 comments on commit a228e06

Please sign in to comment.