Skip to content

Commit

Permalink
macOS support
Browse files Browse the repository at this point in the history 
Summary:
Added support for macOS. The macOS target includes only the core diffing functionality so `IGListDiff` can be used on macOS apps.

I have not added the tests because I don't know how you're setting them up, maybe the same tests can be used by adding some `#if os(...)`s to the test files.

I have tested integration on iOS, tvOS and macOS using both Carthage and Cocoapods.
Closes Instagram#235

Differential Revision: D4325423

Pulled By: jessesquires

fbshipit-source-id: 871bf08410061306004872f5feb7a09d362b6bc1
  • Loading branch information
@insidegui
insidegui authored and Facebook Github Bot committed Dec 14, 2016
1 parent f7e8bf1 commit 3da0a6b
Show file tree
Hide file tree
Showing 5 changed files with 390 additions and 10 deletions.
37 changes: 34 additions & 3 deletions IGListKit.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,46 @@ Pod::Spec.new do |s|
:branch => 'stable'
}

s.source_files = 'Source/**/*.{h,m,mm}'
s.private_header_files = 'Source/Internal/*.h'
s.ios.source_files = 'Source/**/*.{h,m,mm}'
s.ios.private_header_files = 'Source/Internal/*.h'

s.tvos.source_files = 'Source/**/*.{h,m,mm}'
s.tvos.private_header_files = 'Source/Internal/*.h'

s.osx.source_files = [
'Source/IGListIndexSetResult.{h,m}',
'Source/IGListDiff.{h,mm}',
'Source/NSNumber+IGListDiffable.{h,m}',
'Source/NSString+IGListDiffable.{h,m}',
'Source/IGListMoveIndexPath.{h,m}',
'Source/IGListMoveIndex.{h,m}',
'Source/IGListIndexPathResult.{h,m}',
'Source/IGListDiffable.h',
'Source/IGListMacros.h',
'Source/IGListExperiments.h',
'Source/IGListKit.h',
'Source/Internal/IGListMoveIndexInternal.h',
'Source/Internal/IGListIndexPathResultInternal.h',
'Source/Internal/IGListIndexSetResultInternal.h',
'Source/Internal/IGListMoveIndexPathInternal.h'
]
s.osx.private_header_files = [
'Source/Internal/IGListMoveIndexInternal.h',
'Source/Internal/IGListIndexPathResultInternal.h',
'Source/Internal/IGListIndexSetResultInternal.h',
'Source/Internal/IGListMoveIndexPathInternal.h'
]

s.requires_arc = true

s.ios.deployment_target = '8.0'
s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.11'

s.frameworks = 'UIKit'
s.ios.frameworks = 'UIKit'
s.tvos.frameworks = 'UIKit'
s.osx.frameworks = 'Cocoa'

s.library = 'c++'
s.pod_target_xcconfig = {
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
Expand Down
247 changes: 247 additions & 0 deletions IGListKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,26 @@
885FE2481DC51B90009CE2B4 /* IGTestStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 821BC4C21DB8CAE900172ED0 /* IGTestStoryboard.storyboard */; };
887D0B401D870D7F009E01F7 /* IGListKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 887D0B361D870D7E009E01F7 /* IGListKit.framework */; };
887D0B531D870DFE009E01F7 /* IGListKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 887D0B511D870DFE009E01F7 /* IGListKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD31526D1DE227FA00AC9D2C /* IGListIndexSetResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144F331D870F3E007C7F66 /* IGListIndexSetResult.m */; };
DD31526E1DE227FA00AC9D2C /* IGListDiff.mm in Sources */ = {isa = PBXBuildFile; fileRef = 88144F2C1D870F3E007C7F66 /* IGListDiff.mm */; };
DD3152701DE227FA00AC9D2C /* NSObject+IGListDiffable.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144F5B1D870F3E007C7F66 /* NSObject+IGListDiffable.m */; };
DD3152711DE227FA00AC9D2C /* IGListMoveIndexPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144F3B1D870F3E007C7F66 /* IGListMoveIndexPath.m */; };
DD3152741DE227FA00AC9D2C /* IGListMoveIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144F391D870F3E007C7F66 /* IGListMoveIndex.m */; };
DD3152781DE227FA00AC9D2C /* IGListIndexPathResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 88144F311D870F3E007C7F66 /* IGListIndexPathResult.m */; };
DD3152AE1DE228B600AC9D2C /* IGListMoveIndexPathInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F521D870F3E007C7F66 /* IGListMoveIndexPathInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD3152AF1DE228BF00AC9D2C /* IGListIndexSetResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F4D1D870F3E007C7F66 /* IGListIndexSetResultInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD3152B01DE228CF00AC9D2C /* IGListIndexPathResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F4C1D870F3E007C7F66 /* IGListIndexPathResultInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD3152B11DE228D700AC9D2C /* IGListMoveIndexInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F511D870F3E007C7F66 /* IGListMoveIndexInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD3152B21DE228E500AC9D2C /* IGListMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F371D870F3E007C7F66 /* IGListMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B31DE228EB00AC9D2C /* IGListIndexSetResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F321D870F3E007C7F66 /* IGListIndexSetResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B41DE228F300AC9D2C /* IGListDiff.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F2B1D870F3E007C7F66 /* IGListDiff.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B51DE228FB00AC9D2C /* IGListExperiments.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F2F1D870F3E007C7F66 /* IGListExperiments.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B61DE2290400AC9D2C /* IGListDiffable.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F2D1D870F3E007C7F66 /* IGListDiffable.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B71DE2290400AC9D2C /* NSObject+IGListDiffable.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F5A1D870F3E007C7F66 /* NSObject+IGListDiffable.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B81DE2290C00AC9D2C /* IGListMoveIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F381D870F3E007C7F66 /* IGListMoveIndex.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152B91DE2291300AC9D2C /* IGListIndexPathResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F301D870F3E007C7F66 /* IGListIndexPathResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152BA1DE2292300AC9D2C /* IGListMoveIndexPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 88144F3A1D870F3E007C7F66 /* IGListMoveIndexPath.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD3152BB1DE22A0800AC9D2C /* IGListKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 887D0B511D870DFE009E01F7 /* IGListKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -390,6 +410,7 @@
887D0B521D870DFE009E01F7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
887D0B571D870E1E009E01F7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C4A16046BECFD57B7EB75259 /* Pods-IGListKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IGListKitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IGListKitTests/Pods-IGListKitTests.debug.xcconfig"; sourceTree = "<group>"; };
DD3152AC1DE227FA00AC9D2C /* IGListKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IGListKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FD40284889DE182FFC7F471E /* Pods_IGListKitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IGListKitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -426,6 +447,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DD31527B1DE227FA00AC9D2C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -544,6 +572,7 @@
887D0B3F1D870D7F009E01F7 /* IGListKitTests.xctest */,
885FE1D41DC51A0D009CE2B4 /* IGListKit.framework */,
885FE1DC1DC51A0D009CE2B4 /* IGListKit-tvOSTests.xctest */,
DD3152AC1DE227FA00AC9D2C /* IGListKit.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -748,6 +777,27 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DD31527C1DE227FA00AC9D2C /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
DD3152BB1DE22A0800AC9D2C /* IGListKit.h in Headers */,
DD3152BA1DE2292300AC9D2C /* IGListMoveIndexPath.h in Headers */,
DD3152B91DE2291300AC9D2C /* IGListIndexPathResult.h in Headers */,
DD3152B81DE2290C00AC9D2C /* IGListMoveIndex.h in Headers */,
DD3152B61DE2290400AC9D2C /* IGListDiffable.h in Headers */,
DD3152B71DE2290400AC9D2C /* NSObject+IGListDiffable.h in Headers */,
DD3152B51DE228FB00AC9D2C /* IGListExperiments.h in Headers */,
DD3152B41DE228F300AC9D2C /* IGListDiff.h in Headers */,
DD3152B31DE228EB00AC9D2C /* IGListIndexSetResult.h in Headers */,
DD3152B21DE228E500AC9D2C /* IGListMacros.h in Headers */,
DD3152B11DE228D700AC9D2C /* IGListMoveIndexInternal.h in Headers */,
DD3152B01DE228CF00AC9D2C /* IGListIndexPathResultInternal.h in Headers */,
DD3152AF1DE228BF00AC9D2C /* IGListIndexSetResultInternal.h in Headers */,
DD3152AE1DE228B600AC9D2C /* IGListMoveIndexPathInternal.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -829,6 +879,24 @@
productReference = 887D0B3F1D870D7F009E01F7 /* IGListKitTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
DD3152661DE227FA00AC9D2C /* IGListKit-macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = DD3152A91DE227FA00AC9D2C /* Build configuration list for PBXNativeTarget "IGListKit-macOS" */;
buildPhases = (
DD3152671DE227FA00AC9D2C /* Sources */,
DD31527B1DE227FA00AC9D2C /* Frameworks */,
DD31527C1DE227FA00AC9D2C /* Headers */,
DD3152A81DE227FA00AC9D2C /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "IGListKit-macOS";
productName = IGListKit;
productReference = DD3152AC1DE227FA00AC9D2C /* IGListKit.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand Down Expand Up @@ -876,6 +944,7 @@
887D0B3E1D870D7F009E01F7 /* IGListKitTests */,
885FE1D31DC51A0D009CE2B4 /* IGListKit-tvOS */,
885FE1DB1DC51A0D009CE2B4 /* IGListKit-tvOSTests */,
DD3152661DE227FA00AC9D2C /* IGListKit-macOS */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -915,6 +984,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DD3152A81DE227FA00AC9D2C /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -1161,6 +1237,19 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DD3152671DE227FA00AC9D2C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DD31526D1DE227FA00AC9D2C /* IGListIndexSetResult.m in Sources */,
DD31526E1DE227FA00AC9D2C /* IGListDiff.mm in Sources */,
DD3152701DE227FA00AC9D2C /* NSObject+IGListDiffable.m in Sources */,
DD3152711DE227FA00AC9D2C /* IGListMoveIndexPath.m in Sources */,
DD3152741DE227FA00AC9D2C /* IGListMoveIndex.m in Sources */,
DD3152781DE227FA00AC9D2C /* IGListIndexPathResult.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand Down Expand Up @@ -1414,6 +1503,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.instagram.IGListKit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
Expand Down Expand Up @@ -1486,6 +1576,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.instagram.IGListKit;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
Expand Down Expand Up @@ -1520,6 +1611,153 @@
};
name = Release;
};
DD3152AA1DE227FA00AC9D2C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_UNUSED_PARAMETER = NO;
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
OTHER_CFLAGS = (
"-Wambiguous-macro",
"-Wbool-conversion",
"-Wcomment",
"-Wconditional-uninitialized",
"-Wconstant-logical-operand",
"-Wcovered-switch-default",
"-Wdangling-else",
"-Wdeprecated-increment-bool",
"-Wdivision-by-zero",
"-Wduplicate-enum",
"-Wempty-body",
"-Wenum-compare",
"-Wenum-conversion",
"-Wformat",
"-Wformat-extra-args",
"-Wformat-security",
"-Wformat-zero-length",
"-Wignored-attributes",
"-Wignored-attributes",
"-Wimplicit-atomic-properties",
"-Wimplicit-fallthrough",
"-Wimplicit-retain-self",
"-Wincomplete-implementation",
"-Wloop-analysis",
"-Wmismatched-return-types",
"-Wnewline-eof",
"-Wnonnull",
"-Wnull-character",
"-Wobjc-method-access",
"-Wobjc-missing-super-calls",
"-Wreturn-type",
"-Wself-assign",
"-Wswitch",
"-Wswitch-bool",
"-Wswitch-enum",
"-Wunicode",
"-Wunknown-pragmas",
"-Wunused-const-variable",
"-Wunused-function",
"-Wunused-label",
"-Wunused-property-ivar",
"-Wunused-result",
"-Wunused-value",
"-Wnullable-to-nonnull-conversion",
);
PRODUCT_BUNDLE_IDENTIFIER = com.instagram.IGListKit;
PRODUCT_NAME = IGListKit;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
DD3152AB1DE227FA00AC9D2C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_UNUSED_PARAMETER = NO;
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
OTHER_CFLAGS = (
"-Wambiguous-macro",
"-Wbool-conversion",
"-Wcomment",
"-Wconditional-uninitialized",
"-Wconstant-logical-operand",
"-Wcovered-switch-default",
"-Wdangling-else",
"-Wdeprecated-increment-bool",
"-Wdivision-by-zero",
"-Wduplicate-enum",
"-Wempty-body",
"-Wenum-compare",
"-Wenum-conversion",
"-Wformat",
"-Wformat-extra-args",
"-Wformat-security",
"-Wformat-zero-length",
"-Wignored-attributes",
"-Wignored-attributes",
"-Wimplicit-atomic-properties",
"-Wimplicit-fallthrough",
"-Wimplicit-retain-self",
"-Wincomplete-implementation",
"-Wloop-analysis",
"-Wmismatched-return-types",
"-Wnewline-eof",
"-Wnonnull",
"-Wnull-character",
"-Wobjc-method-access",
"-Wobjc-missing-super-calls",
"-Wreturn-type",
"-Wself-assign",
"-Wswitch",
"-Wswitch-bool",
"-Wswitch-enum",
"-Wunicode",
"-Wunknown-pragmas",
"-Wunused-const-variable",
"-Wunused-function",
"-Wunused-label",
"-Wunused-property-ivar",
"-Wunused-result",
"-Wunused-value",
"-Wnullable-to-nonnull-conversion",
);
PRODUCT_BUNDLE_IDENTIFIER = com.instagram.IGListKit;
PRODUCT_NAME = IGListKit;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -1568,6 +1806,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DD3152A91DE227FA00AC9D2C /* Build configuration list for PBXNativeTarget "IGListKit-macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DD3152AA1DE227FA00AC9D2C /* Debug */,
DD3152AB1DE227FA00AC9D2C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 887D0B2D1D870D7E009E01F7 /* Project object */;
Expand Down
Loading

0 comments on commit 3da0a6b

Please sign in to comment.