Commit 33a575e0 by Daniel Dahan

added Material OSX target

parent 6a47fbca
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
965626491C8757B4004ADEF7 /* MaterialCollectionViewLayout.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96CC088F1C7FEC170034FF84 /* MaterialCollectionViewLayout.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 965626491C8757B4004ADEF7 /* MaterialCollectionViewLayout.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96CC088F1C7FEC170034FF84 /* MaterialCollectionViewLayout.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9656264A1C8757B4004ADEF7 /* MaterialDataSourceItem.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96CC08901C7FEC170034FF84 /* MaterialDataSourceItem.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 9656264A1C8757B4004ADEF7 /* MaterialDataSourceItem.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96CC08901C7FEC170034FF84 /* MaterialDataSourceItem.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9656CD0C1C6BD33700EBCEF1 /* Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656CD0B1C6BD33700EBCEF1 /* Grid.swift */; }; 9656CD0C1C6BD33700EBCEF1 /* Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656CD0B1C6BD33700EBCEF1 /* Grid.swift */; };
9660161D1CB2ED6C00AAB661 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 966016131CB2ED6C00AAB661 /* Material.framework */; };
9660162A1CB2F04E00AAB661 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C091C1328D800B91418 /* Material.h */; settings = {ATTRIBUTES = (Public, ); }; };
966F57B81C226D75009185B7 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 966F57B71C226D75009185B7 /* TextField.swift */; }; 966F57B81C226D75009185B7 /* TextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 966F57B71C226D75009185B7 /* TextField.swift */; };
967887871C9775900037F6C9 /* NavigationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887861C9775900037F6C9 /* NavigationItem.swift */; }; 967887871C9775900037F6C9 /* NavigationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887861C9775900037F6C9 /* NavigationItem.swift */; };
96815B381CA07BA20006CBE2 /* MaterialViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */; }; 96815B381CA07BA20006CBE2 /* MaterialViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */; };
...@@ -169,6 +171,13 @@ ...@@ -169,6 +171,13 @@
remoteGlobalIDString = 963832351B88DFD80015F710; remoteGlobalIDString = 963832351B88DFD80015F710;
remoteInfo = FocusKit; remoteInfo = FocusKit;
}; };
9660161E1CB2ED6C00AAB661 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9638322D1B88DFD80015F710 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 966016121CB2ED6C00AAB661;
remoteInfo = "Material OSX";
};
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -195,6 +204,8 @@ ...@@ -195,6 +204,8 @@
96442ADD1C28EF3700C3C574 /* MaterialTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTableViewCell.swift; sourceTree = "<group>"; }; 96442ADD1C28EF3700C3C574 /* MaterialTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTableViewCell.swift; sourceTree = "<group>"; };
965626411C874FAE004ADEF7 /* MaterialDevice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialDevice.swift; sourceTree = "<group>"; }; 965626411C874FAE004ADEF7 /* MaterialDevice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialDevice.swift; sourceTree = "<group>"; };
9656CD0B1C6BD33700EBCEF1 /* Grid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Grid.swift; sourceTree = "<group>"; }; 9656CD0B1C6BD33700EBCEF1 /* Grid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Grid.swift; sourceTree = "<group>"; };
966016131CB2ED6C00AAB661 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9660161C1CB2ED6C00AAB661 /* Material OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Material OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
966F57B71C226D75009185B7 /* TextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = "<group>"; }; 966F57B71C226D75009185B7 /* TextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = "<group>"; };
967887861C9775900037F6C9 /* NavigationItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationItem.swift; sourceTree = "<group>"; }; 967887861C9775900037F6C9 /* NavigationItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationItem.swift; sourceTree = "<group>"; };
967887881C9777CB0037F6C9 /* MaterialViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialViewTests.swift; sourceTree = "<group>"; }; 967887881C9777CB0037F6C9 /* MaterialViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialViewTests.swift; sourceTree = "<group>"; };
...@@ -275,6 +286,21 @@ ...@@ -275,6 +286,21 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
9660160F1CB2ED6C00AAB661 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
966016191CB2ED6C00AAB661 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9660161D1CB2ED6C00AAB661 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
...@@ -319,6 +345,8 @@ ...@@ -319,6 +345,8 @@
children = ( children = (
963832361B88DFD80015F710 /* Material.framework */, 963832361B88DFD80015F710 /* Material.framework */,
963832411B88DFD80015F710 /* Material.xctest */, 963832411B88DFD80015F710 /* Material.xctest */,
966016131CB2ED6C00AAB661 /* Material.framework */,
9660161C1CB2ED6C00AAB661 /* Material OSX Tests.xctest */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -699,12 +727,20 @@ ...@@ -699,12 +727,20 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
966016101CB2ED6C00AAB661 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
9660162A1CB2F04E00AAB661 /* Material.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */ /* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
963832351B88DFD80015F710 /* Material */ = { 963832351B88DFD80015F710 /* Material iOS */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 9638324C1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "Material" */; buildConfigurationList = 9638324C1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "Material iOS" */;
buildPhases = ( buildPhases = (
963832311B88DFD80015F710 /* Sources */, 963832311B88DFD80015F710 /* Sources */,
963832321B88DFD80015F710 /* Frameworks */, 963832321B88DFD80015F710 /* Frameworks */,
...@@ -715,14 +751,14 @@ ...@@ -715,14 +751,14 @@
); );
dependencies = ( dependencies = (
); );
name = Material; name = "Material iOS";
productName = FocusKit; productName = FocusKit;
productReference = 963832361B88DFD80015F710 /* Material.framework */; productReference = 963832361B88DFD80015F710 /* Material.framework */;
productType = "com.apple.product-type.framework"; productType = "com.apple.product-type.framework";
}; };
963832401B88DFD80015F710 /* MaterialTests */ = { 963832401B88DFD80015F710 /* Material iOS Tests */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 9638324F1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "MaterialTests" */; buildConfigurationList = 9638324F1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "Material iOS Tests" */;
buildPhases = ( buildPhases = (
9638323D1B88DFD80015F710 /* Sources */, 9638323D1B88DFD80015F710 /* Sources */,
9638323E1B88DFD80015F710 /* Frameworks */, 9638323E1B88DFD80015F710 /* Frameworks */,
...@@ -733,11 +769,47 @@ ...@@ -733,11 +769,47 @@
dependencies = ( dependencies = (
963832441B88DFD80015F710 /* PBXTargetDependency */, 963832441B88DFD80015F710 /* PBXTargetDependency */,
); );
name = MaterialTests; name = "Material iOS Tests";
productName = FocusKitTests; productName = FocusKitTests;
productReference = 963832411B88DFD80015F710 /* Material.xctest */; productReference = 963832411B88DFD80015F710 /* Material.xctest */;
productType = "com.apple.product-type.bundle.unit-test"; productType = "com.apple.product-type.bundle.unit-test";
}; };
966016121CB2ED6C00AAB661 /* Material OSX */ = {
isa = PBXNativeTarget;
buildConfigurationList = 966016241CB2ED6C00AAB661 /* Build configuration list for PBXNativeTarget "Material OSX" */;
buildPhases = (
9660160E1CB2ED6C00AAB661 /* Sources */,
9660160F1CB2ED6C00AAB661 /* Frameworks */,
966016101CB2ED6C00AAB661 /* Headers */,
966016111CB2ED6C00AAB661 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Material OSX";
productName = "Material OSX";
productReference = 966016131CB2ED6C00AAB661 /* Material.framework */;
productType = "com.apple.product-type.framework";
};
9660161B1CB2ED6C00AAB661 /* Material OSX Tests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 966016271CB2ED6C00AAB661 /* Build configuration list for PBXNativeTarget "Material OSX Tests" */;
buildPhases = (
966016181CB2ED6C00AAB661 /* Sources */,
966016191CB2ED6C00AAB661 /* Frameworks */,
9660161A1CB2ED6C00AAB661 /* Resources */,
);
buildRules = (
);
dependencies = (
9660161F1CB2ED6C00AAB661 /* PBXTargetDependency */,
);
name = "Material OSX Tests";
productName = "Material OSXTests";
productReference = 9660161C1CB2ED6C00AAB661 /* Material OSX Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
/* Begin PBXProject section */ /* Begin PBXProject section */
...@@ -745,7 +817,7 @@ ...@@ -745,7 +817,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftMigration = 0710; LastSwiftMigration = 0710;
LastSwiftUpdateCheck = 0720; LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0700; LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "CosmicMind, Inc."; ORGANIZATIONNAME = "CosmicMind, Inc.";
TargetAttributes = { TargetAttributes = {
...@@ -755,6 +827,12 @@ ...@@ -755,6 +827,12 @@
963832401B88DFD80015F710 = { 963832401B88DFD80015F710 = {
CreatedOnToolsVersion = 6.4; CreatedOnToolsVersion = 6.4;
}; };
966016121CB2ED6C00AAB661 = {
CreatedOnToolsVersion = 7.3;
};
9660161B1CB2ED6C00AAB661 = {
CreatedOnToolsVersion = 7.3;
};
}; };
}; };
buildConfigurationList = 963832301B88DFD80015F710 /* Build configuration list for PBXProject "Material" */; buildConfigurationList = 963832301B88DFD80015F710 /* Build configuration list for PBXProject "Material" */;
...@@ -769,8 +847,10 @@ ...@@ -769,8 +847,10 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
963832351B88DFD80015F710 /* Material */, 963832351B88DFD80015F710 /* Material iOS */,
963832401B88DFD80015F710 /* MaterialTests */, 966016121CB2ED6C00AAB661 /* Material OSX */,
963832401B88DFD80015F710 /* Material iOS Tests */,
9660161B1CB2ED6C00AAB661 /* Material OSX Tests */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
...@@ -796,6 +876,20 @@ ...@@ -796,6 +876,20 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
966016111CB2ED6C00AAB661 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
9660161A1CB2ED6C00AAB661 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
...@@ -886,14 +980,33 @@ ...@@ -886,14 +980,33 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
9660160E1CB2ED6C00AAB661 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
966016181CB2ED6C00AAB661 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
963832441B88DFD80015F710 /* PBXTargetDependency */ = { 963832441B88DFD80015F710 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 963832351B88DFD80015F710 /* Material */; target = 963832351B88DFD80015F710 /* Material iOS */;
targetProxy = 963832431B88DFD80015F710 /* PBXContainerItemProxy */; targetProxy = 963832431B88DFD80015F710 /* PBXContainerItemProxy */;
}; };
9660161F1CB2ED6C00AAB661 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 966016121CB2ED6C00AAB661 /* Material OSX */;
targetProxy = 9660161E1CB2ED6C00AAB661 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
...@@ -936,6 +1049,7 @@ ...@@ -936,6 +1049,7 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
...@@ -979,6 +1093,7 @@ ...@@ -979,6 +1093,7 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
SDKROOT = iphoneos; SDKROOT = iphoneos;
...@@ -1003,7 +1118,7 @@ ...@@ -1003,7 +1118,7 @@
INFOPLIST_FILE = Sources/Info.plist; INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.Material; PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-iOS";
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
...@@ -1025,7 +1140,7 @@ ...@@ -1025,7 +1140,7 @@
INFOPLIST_FILE = Sources/Info.plist; INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.Material; PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-iOS";
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
...@@ -1046,7 +1161,7 @@ ...@@ -1046,7 +1161,7 @@
); );
INFOPLIST_FILE = Tests/Info.plist; INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-iOS-Tests";
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
}; };
...@@ -1062,8 +1177,84 @@ ...@@ -1062,8 +1177,84 @@
); );
INFOPLIST_FILE = Tests/Info.plist; INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-iOS-Tests";
PRODUCT_NAME = Material;
};
name = Release;
};
966016251CB2ED6C00AAB661 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-OSX";
PRODUCT_NAME = Material;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
};
966016261CB2ED6C00AAB661 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-OSX";
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;
};
966016281CB2ED6C00AAB661 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-OSX-Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Debug;
};
966016291CB2ED6C00AAB661 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "io.cosmicmind.Material-OSX-Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
}; };
name = Release; name = Release;
}; };
...@@ -1079,7 +1270,7 @@ ...@@ -1079,7 +1270,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
9638324C1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "Material" */ = { 9638324C1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "Material iOS" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
9638324D1B88DFD80015F710 /* Debug */, 9638324D1B88DFD80015F710 /* Debug */,
...@@ -1088,7 +1279,7 @@ ...@@ -1088,7 +1279,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
9638324F1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "MaterialTests" */ = { 9638324F1B88DFD80015F710 /* Build configuration list for PBXNativeTarget "Material iOS Tests" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
963832501B88DFD80015F710 /* Debug */, 963832501B88DFD80015F710 /* Debug */,
...@@ -1097,6 +1288,22 @@ ...@@ -1097,6 +1288,22 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
966016241CB2ED6C00AAB661 /* Build configuration list for PBXNativeTarget "Material OSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
966016251CB2ED6C00AAB661 /* Debug */,
966016261CB2ED6C00AAB661 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
966016271CB2ED6C00AAB661 /* Build configuration list for PBXNativeTarget "Material OSX Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
966016281CB2ED6C00AAB661 /* Debug */,
966016291CB2ED6C00AAB661 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
rootObject = 9638322D1B88DFD80015F710 /* Project object */; rootObject = 9638322D1B88DFD80015F710 /* Project object */;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832401B88DFD80015F710" BlueprintIdentifier = "963832401B88DFD80015F710"
BuildableName = "Material.xctest" BuildableName = "Material.xctest"
BlueprintName = "MaterialTests" BlueprintName = "Material iOS Tests"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</TestableReference> </TestableReference>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "963832351B88DFD80015F710" BlueprintIdentifier = "963832351B88DFD80015F710"
BuildableName = "Material.framework" BuildableName = "Material.framework"
BlueprintName = "Material" BlueprintName = "Material iOS"
ReferencedContainer = "container:Material.xcodeproj"> ReferencedContainer = "container:Material.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> #import <Foundation/Foundation.h>
//! Project version number for Material. //! Project version number for Material.
FOUNDATION_EXPORT double MaterialVersionNumber; FOUNDATION_EXPORT double MaterialVersionNumber;
......
...@@ -592,9 +592,9 @@ public class TextField : UITextField { ...@@ -592,9 +592,9 @@ public class TextField : UITextField {
} else { } else {
v.alpha = 0 v.alpha = 0
} }
addTarget(self, action: "textFieldDidBegin", forControlEvents: .EditingDidBegin) addTarget(self, action: #selector(textFieldDidBegin), forControlEvents: .EditingDidBegin)
addTarget(self, action: "textFieldDidChange", forControlEvents: .EditingChanged) addTarget(self, action: #selector(textFieldDidChange), forControlEvents: .EditingChanged)
addTarget(self, action: "textFieldDidEnd", forControlEvents: .EditingDidEnd) addTarget(self, action: #selector(textFieldDidEnd), forControlEvents: .EditingDidEnd)
} }
} }
...@@ -609,11 +609,11 @@ public class TextField : UITextField { ...@@ -609,11 +609,11 @@ public class TextField : UITextField {
showDetailLabel() showDetailLabel()
} }
if nil == titleLabel { if nil == titleLabel {
addTarget(self, action: "textFieldDidBegin", forControlEvents: .EditingDidBegin) addTarget(self, action: #selector(textFieldDidBegin), forControlEvents: .EditingDidBegin)
addTarget(self, action: "textFieldDidChange", forControlEvents: .EditingChanged) addTarget(self, action: #selector(textFieldDidChange), forControlEvents: .EditingChanged)
addTarget(self, action: "textFieldDidEnd", forControlEvents: .EditingDidEnd) addTarget(self, action: #selector(textFieldDidEnd), forControlEvents: .EditingDidEnd)
} }
addTarget(self, action: "textFieldValueChanged", forControlEvents: .ValueChanged) addTarget(self, action: #selector(textFieldValueChanged), forControlEvents: .ValueChanged)
} }
} }
...@@ -632,7 +632,7 @@ public class TextField : UITextField { ...@@ -632,7 +632,7 @@ public class TextField : UITextField {
clearButton.tintColor = MaterialColor.grey.base clearButton.tintColor = MaterialColor.grey.base
clearButton.setImage(image, forState: .Normal) clearButton.setImage(image, forState: .Normal)
clearButton.setImage(image, forState: .Highlighted) clearButton.setImage(image, forState: .Highlighted)
clearButton.addTarget(self, action: "handleClearButton", forControlEvents: .TouchUpInside) clearButton.addTarget(self, action: #selector(handleClearButton), forControlEvents: .TouchUpInside)
clearButtonMode = .Never clearButtonMode = .Never
rightViewMode = .WhileEditing rightViewMode = .WhileEditing
rightView = clearButton rightView = clearButton
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment