Skip to content
This repository has been archived by the owner on Jul 8, 2019. It is now read-only.

Commit

Permalink
Merge 9809970 into 19eb5dd
Browse files Browse the repository at this point in the history
  • Loading branch information
otaran committed Jul 28, 2016
2 parents 19eb5dd + 9809970 commit 01d1c6a
Show file tree
Hide file tree
Showing 30 changed files with 1,526 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ env:
- TTT_COMMAND="rake integration:cocoapods_ios_static"
- TTT_COMMAND="rake integration:cocoapods_osx"
- TTT_COMMAND="rake integration:cocoapods_watchos"
- TTT_COMMAND="rake integration:cocoapods_tvos"
- TTT_COMMAND="rake integration:carthage_ios"
- TTT_COMMAND="rake integration:carthage_osx"
- TTT_COMMAND="rake integration:carthage_watchos"
- TTT_COMMAND="rake integration:carthage_tvos"
- TTT_COMMAND="pod lib lint"
- TTT_COMMAND="pod lib lint --use-libraries"

Expand Down
1 change: 1 addition & 0 deletions FormatterKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'

s.requires_arc = true

Expand Down
146 changes: 144 additions & 2 deletions FormatterKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,26 @@
5B08B6B71CA6A26A009541EC /* FormatterKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B66C1CA69F99009541EC /* FormatterKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
5B31FE411CA6B47800309D75 /* FormatterKit.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5B31FE231CA6B47800309D75 /* FormatterKit.strings */; };
5B31FE421CA6B47800309D75 /* FormatterKit.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5B31FE231CA6B47800309D75 /* FormatterKit.strings */; };
FE4100C41D4996140059B762 /* FormatterKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B66C1CA69F99009541EC /* FormatterKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100C51D4996140059B762 /* TTTAddressFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6811CA6A0C3009541EC /* TTTAddressFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100C61D4996140059B762 /* TTTArrayFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6831CA6A0C3009541EC /* TTTArrayFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100C71D4996140059B762 /* TTTColorFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6851CA6A0C3009541EC /* TTTColorFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100C81D4996140059B762 /* TTTLocationFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6871CA6A0C3009541EC /* TTTLocationFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100C91D4996140059B762 /* TTTNameFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6891CA6A0C3009541EC /* TTTNameFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100CA1D4996140059B762 /* TTTOrdinalNumberFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B68B1CA6A0C3009541EC /* TTTOrdinalNumberFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100CB1D4996140059B762 /* TTTTimeIntervalFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B68D1CA6A0C3009541EC /* TTTTimeIntervalFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100CC1D4996140059B762 /* TTTUnitOfInformationFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B68F1CA6A0C3009541EC /* TTTUnitOfInformationFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100CD1D4996140059B762 /* TTTURLRequestFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6911CA6A0C3009541EC /* TTTURLRequestFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE4100CE1D4996310059B762 /* TTTAddressFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6821CA6A0C3009541EC /* TTTAddressFormatter.m */; };
FE4100CF1D4996310059B762 /* TTTArrayFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6841CA6A0C3009541EC /* TTTArrayFormatter.m */; };
FE4100D01D4996310059B762 /* TTTColorFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6861CA6A0C3009541EC /* TTTColorFormatter.m */; };
FE4100D11D4996310059B762 /* TTTLocationFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6881CA6A0C3009541EC /* TTTLocationFormatter.m */; };
FE4100D21D4996310059B762 /* TTTNameFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B68A1CA6A0C3009541EC /* TTTNameFormatter.m */; };
FE4100D31D4996310059B762 /* TTTOrdinalNumberFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B68C1CA6A0C3009541EC /* TTTOrdinalNumberFormatter.m */; };
FE4100D41D4996310059B762 /* TTTTimeIntervalFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B68E1CA6A0C3009541EC /* TTTTimeIntervalFormatter.m */; };
FE4100D51D4996310059B762 /* TTTUnitOfInformationFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6901CA6A0C3009541EC /* TTTUnitOfInformationFormatter.m */; };
FE4100D61D4996310059B762 /* TTTURLRequestFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6921CA6A0C3009541EC /* TTTURLRequestFormatter.m */; };
FE41013A1D49A2140059B762 /* FormatterKit.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5B31FE231CA6B47800309D75 /* FormatterKit.strings */; };
FE65C4751D1EF6FE00A8AC9D /* FormatterKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B66C1CA69F99009541EC /* FormatterKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE65C4781D1EF70E00A8AC9D /* TTTArrayFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B08B6831CA6A0C3009541EC /* TTTArrayFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE65C4791D1EF71400A8AC9D /* TTTArrayFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B08B6841CA6A0C3009541EC /* TTTArrayFormatter.m */; };
Expand Down Expand Up @@ -123,6 +143,7 @@
5B31FE3E1CA6B47800309D75 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/FormatterKit.strings; sourceTree = "<group>"; };
5B31FE3F1CA6B47800309D75 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/FormatterKit.strings"; sourceTree = "<group>"; };
5B31FE401CA6B47800309D75 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/FormatterKit.strings"; sourceTree = "<group>"; };
FE4100BC1D4995EE0059B762 /* FormatterKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FormatterKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FE65C46D1D1EF59200A8AC9D /* FormatterKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FormatterKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -141,6 +162,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE4100B81D4995EE0059B762 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
FE65C4691D1EF59200A8AC9D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -166,6 +194,7 @@
5B08B6691CA69F99009541EC /* FormatterKit.framework */,
5B08B6791CA6A078009541EC /* FormatterKit.framework */,
FE65C46D1D1EF59200A8AC9D /* FormatterKit.framework */,
FE4100BC1D4995EE0059B762 /* FormatterKit.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -242,6 +271,23 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE4100B91D4995EE0059B762 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
FE4100C71D4996140059B762 /* TTTColorFormatter.h in Headers */,
FE4100C91D4996140059B762 /* TTTNameFormatter.h in Headers */,
FE4100CA1D4996140059B762 /* TTTOrdinalNumberFormatter.h in Headers */,
FE4100C41D4996140059B762 /* FormatterKit.h in Headers */,
FE4100CD1D4996140059B762 /* TTTURLRequestFormatter.h in Headers */,
FE4100CB1D4996140059B762 /* TTTTimeIntervalFormatter.h in Headers */,
FE4100C81D4996140059B762 /* TTTLocationFormatter.h in Headers */,
FE4100C51D4996140059B762 /* TTTAddressFormatter.h in Headers */,
FE4100CC1D4996140059B762 /* TTTUnitOfInformationFormatter.h in Headers */,
FE4100C61D4996140059B762 /* TTTArrayFormatter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FE65C46A1D1EF59200A8AC9D /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -298,6 +344,24 @@
productReference = 5B08B6791CA6A078009541EC /* FormatterKit.framework */;
productType = "com.apple.product-type.framework";
};
FE4100BB1D4995EE0059B762 /* FormatterKit-tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = FE4100C31D4995EE0059B762 /* Build configuration list for PBXNativeTarget "FormatterKit-tvOS" */;
buildPhases = (
FE4100B71D4995EE0059B762 /* Sources */,
FE4100B81D4995EE0059B762 /* Frameworks */,
FE4100B91D4995EE0059B762 /* Headers */,
FE4100BA1D4995EE0059B762 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "FormatterKit-tvOS";
productName = "FormatterKit-tvOS";
productReference = FE4100BC1D4995EE0059B762 /* FormatterKit.framework */;
productType = "com.apple.product-type.framework";
};
FE65C46C1D1EF59200A8AC9D /* FormatterKit-watchOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = FE65C4741D1EF59200A8AC9D /* Build configuration list for PBXNativeTarget "FormatterKit-watchOS" */;
Expand Down Expand Up @@ -331,6 +395,9 @@
5B08B6781CA6A078009541EC = {
CreatedOnToolsVersion = 7.3;
};
FE4100BB1D4995EE0059B762 = {
CreatedOnToolsVersion = 7.3.1;
};
FE65C46C1D1EF59200A8AC9D = {
CreatedOnToolsVersion = 7.3.1;
};
Expand Down Expand Up @@ -381,6 +448,7 @@
5B08B6681CA69F99009541EC /* FormatterKit-iOS */,
5B08B6781CA6A078009541EC /* FormatterKit-OSX */,
FE65C46C1D1EF59200A8AC9D /* FormatterKit-watchOS */,
FE4100BB1D4995EE0059B762 /* FormatterKit-tvOS */,
);
};
/* End PBXProject section */
Expand All @@ -402,6 +470,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE4100BA1D4995EE0059B762 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FE41013A1D49A2140059B762 /* FormatterKit.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FE65C46B1D1EF59200A8AC9D /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -445,6 +521,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FE4100B71D4995EE0059B762 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FE4100D31D4996310059B762 /* TTTOrdinalNumberFormatter.m in Sources */,
FE4100CE1D4996310059B762 /* TTTAddressFormatter.m in Sources */,
FE4100D21D4996310059B762 /* TTTNameFormatter.m in Sources */,
FE4100CF1D4996310059B762 /* TTTArrayFormatter.m in Sources */,
FE4100D41D4996310059B762 /* TTTTimeIntervalFormatter.m in Sources */,
FE4100D61D4996310059B762 /* TTTURLRequestFormatter.m in Sources */,
FE4100D51D4996310059B762 /* TTTUnitOfInformationFormatter.m in Sources */,
FE4100D11D4996310059B762 /* TTTLocationFormatter.m in Sources */,
FE4100D01D4996310059B762 /* TTTColorFormatter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FE65C4681D1EF59200A8AC9D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -546,8 +638,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
Expand Down Expand Up @@ -588,8 +680,8 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -610,6 +702,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.FormatterKit.FormatterKit-iOS";
PRODUCT_NAME = FormatterKit;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
Expand All @@ -627,6 +720,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.FormatterKit.FormatterKit-iOS";
PRODUCT_NAME = FormatterKit;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Release;
Expand Down Expand Up @@ -673,6 +767,44 @@
};
name = Release;
};
FE4100C11D4995EE0059B762 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = FormatterKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.FormatterKit-tvOS";
PRODUCT_NAME = FormatterKit;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
};
name = Debug;
};
FE4100C21D4995EE0059B762 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = FormatterKit/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.matt.FormatterKit-tvOS";
PRODUCT_NAME = FormatterKit;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
};
name = Release;
};
FE65C4721D1EF59200A8AC9D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -743,13 +875,23 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
FE4100C31D4995EE0059B762 /* Build configuration list for PBXNativeTarget "FormatterKit-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FE4100C11D4995EE0059B762 /* Debug */,
FE4100C21D4995EE0059B762 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
FE65C4741D1EF59200A8AC9D /* Build configuration list for PBXNativeTarget "FormatterKit-watchOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FE65C4721D1EF59200A8AC9D /* Debug */,
FE65C4731D1EF59200A8AC9D /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
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 = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE4100BB1D4995EE0059B762"
BuildableName = "FormatterKit.framework"
BlueprintName = "FormatterKit-tvOS"
ReferencedContainer = "container:FormatterKit.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 = "FE4100BB1D4995EE0059B762"
BuildableName = "FormatterKit.framework"
BlueprintName = "FormatterKit-tvOS"
ReferencedContainer = "container:FormatterKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE4100BB1D4995EE0059B762"
BuildableName = "FormatterKit.framework"
BlueprintName = "FormatterKit-tvOS"
ReferencedContainer = "container:FormatterKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion FormatterKit/TTTAddressFormatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <Foundation/Foundation.h>

#if !TARGET_OS_WATCH
#if !TARGET_OS_WATCH && !TARGET_OS_TV

/**
Instances of `TTTAddressFormatter` create address strings formatted according to a given locale.
Expand Down
2 changes: 1 addition & 1 deletion FormatterKit/TTTAddressFormatter.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import "TTTAddressFormatter.h"

#if !TARGET_OS_WATCH
#if !TARGET_OS_WATCH && !TARGET_OS_TV

#import <Availability.h>

Expand Down
Loading

0 comments on commit 01d1c6a

Please sign in to comment.