Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reuse code between iOS and macOS #26

Merged
merged 7 commits into from
Jun 27, 2016
Merged

Reuse code between iOS and macOS #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
852420f
Use Image and ImageView typealias
onmyway133 Jun 27, 2016
5a577c7
Add Configuration
onmyway133 Jun 27, 2016
83a2598
Add Configuration
onmyway133 Jun 27, 2016
71126a6
Move to Extensions group
onmyway133 Jun 27, 2016
afc6bd1
Run pod install in Example
onmyway133 Jun 27, 2016
64b862f
pod update Cache
onmyway133 Jun 27, 2016
8d25b35
Add ImaginaryForMac
onmyway133 Jun 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Example/ImaginaryDemo/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Cache (1.3.0):
- Cache (1.4.0):
- CryptoSwift
- CryptoSwift (0.4.1)
- CryptoSwift (0.5.1)
- Imaginary (0.1.0):
- Cache

Expand All @@ -17,13 +17,13 @@ EXTERNAL SOURCES:

CHECKOUT OPTIONS:
Cache:
:commit: 5b2cdfc5ce9e6d9e3b36059231fd78b89bc9979f
:commit: d6f0b013cbe9ede4b5fe5a8b615220abce0327d6
:git: https://github.com/hyperoslo/Cache

SPEC CHECKSUMS:
Cache: b8abf7795a6d72f9d5b924d1367624a53fe777a9
CryptoSwift: 25b5aff3f260967391f8fff2e9abe4254d2c6fd5
Imaginary: 5317b8d2dc8ecf20455232226bf8a277abdd37d5
Cache: 059cf0e10e6c3aec2c402eea19bd6b3aacb3fe9d
CryptoSwift: df42dda18baf6c76347a94e227dbcc0a341304bd
Imaginary: 62a9ce1e6d7831ede429c8221a183f03ec2a90bc

PODFILE CHECKSUM: eeff3e5a8f20502e24b1eaa68f2a4c9eeece699d

Expand Down
368 changes: 368 additions & 0 deletions Example/ImaginaryForMac/ImaginaryForMac.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,368 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
78D3FFC6CEE43584B83524A7 /* Pods_ImaginaryForMac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 703EB04E6634A3186CCD8E52 /* Pods_ImaginaryForMac.framework */; };
D28838FC1D2113A3005FBFE8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28838FB1D2113A3005FBFE8 /* AppDelegate.swift */; };
D28838FE1D2113A3005FBFE8 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28838FD1D2113A3005FBFE8 /* ViewController.swift */; };
D28839001D2113A3005FBFE8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D28838FF1D2113A3005FBFE8 /* Assets.xcassets */; };
D28839031D2113A3005FBFE8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D28839011D2113A3005FBFE8 /* Main.storyboard */; };
D288390C1D211522005FBFE8 /* Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D288390A1D211522005FBFE8 /* Cell.swift */; };
D288390D1D211522005FBFE8 /* Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D288390B1D211522005FBFE8 /* Cell.xib */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
703EB04E6634A3186CCD8E52 /* Pods_ImaginaryForMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ImaginaryForMac.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C2903F74703615995C59EBED /* Pods-ImaginaryForMac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImaginaryForMac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ImaginaryForMac/Pods-ImaginaryForMac.debug.xcconfig"; sourceTree = "<group>"; };
D28838F81D2113A3005FBFE8 /* ImaginaryForMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ImaginaryForMac.app; sourceTree = BUILT_PRODUCTS_DIR; };
D28838FB1D2113A3005FBFE8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D28838FD1D2113A3005FBFE8 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
D28838FF1D2113A3005FBFE8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D28839021D2113A3005FBFE8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
D28839041D2113A3005FBFE8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D288390A1D211522005FBFE8 /* Cell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
D288390B1D211522005FBFE8 /* Cell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Cell.xib; sourceTree = "<group>"; };
F352B24B95F67FCE8E31323A /* Pods-ImaginaryForMac.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImaginaryForMac.release.xcconfig"; path = "Pods/Target Support Files/Pods-ImaginaryForMac/Pods-ImaginaryForMac.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
D28838F51D2113A3005FBFE8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
78D3FFC6CEE43584B83524A7 /* Pods_ImaginaryForMac.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
31FDF6D46C1C400C275B82C1 /* Frameworks */ = {
isa = PBXGroup;
children = (
703EB04E6634A3186CCD8E52 /* Pods_ImaginaryForMac.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
D28838EF1D2113A3005FBFE8 = {
isa = PBXGroup;
children = (
D28838FA1D2113A3005FBFE8 /* ImaginaryForMac */,
D28838F91D2113A3005FBFE8 /* Products */,
D94B243ADFC942E9B8A92856 /* Pods */,
31FDF6D46C1C400C275B82C1 /* Frameworks */,
);
sourceTree = "<group>";
};
D28838F91D2113A3005FBFE8 /* Products */ = {
isa = PBXGroup;
children = (
D28838F81D2113A3005FBFE8 /* ImaginaryForMac.app */,
);
name = Products;
sourceTree = "<group>";
};
D28838FA1D2113A3005FBFE8 /* ImaginaryForMac */ = {
isa = PBXGroup;
children = (
D28838FB1D2113A3005FBFE8 /* AppDelegate.swift */,
D28838FD1D2113A3005FBFE8 /* ViewController.swift */,
D28838FF1D2113A3005FBFE8 /* Assets.xcassets */,
D28839011D2113A3005FBFE8 /* Main.storyboard */,
D28839041D2113A3005FBFE8 /* Info.plist */,
D288390A1D211522005FBFE8 /* Cell.swift */,
D288390B1D211522005FBFE8 /* Cell.xib */,
);
path = ImaginaryForMac;
sourceTree = "<group>";
};
D94B243ADFC942E9B8A92856 /* Pods */ = {
isa = PBXGroup;
children = (
C2903F74703615995C59EBED /* Pods-ImaginaryForMac.debug.xcconfig */,
F352B24B95F67FCE8E31323A /* Pods-ImaginaryForMac.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
D28838F71D2113A3005FBFE8 /* ImaginaryForMac */ = {
isa = PBXNativeTarget;
buildConfigurationList = D28839071D2113A3005FBFE8 /* Build configuration list for PBXNativeTarget "ImaginaryForMac" */;
buildPhases = (
55A2ACC7C6304E095220777D /* 📦 Check Pods Manifest.lock */,
D28838F41D2113A3005FBFE8 /* Sources */,
D28838F51D2113A3005FBFE8 /* Frameworks */,
D28838F61D2113A3005FBFE8 /* Resources */,
53BC74B406E8FA8CA24B5873 /* 📦 Embed Pods Frameworks */,
D66AF2BE601A8F9708469D8F /* 📦 Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
);
name = ImaginaryForMac;
productName = ImaginaryForMac;
productReference = D28838F81D2113A3005FBFE8 /* ImaginaryForMac.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
D28838F01D2113A3005FBFE8 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = Hyper;
TargetAttributes = {
D28838F71D2113A3005FBFE8 = {
CreatedOnToolsVersion = 7.3.1;
};
};
};
buildConfigurationList = D28838F31D2113A3005FBFE8 /* Build configuration list for PBXProject "ImaginaryForMac" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = D28838EF1D2113A3005FBFE8;
productRefGroup = D28838F91D2113A3005FBFE8 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
D28838F71D2113A3005FBFE8 /* ImaginaryForMac */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
D28838F61D2113A3005FBFE8 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D28839001D2113A3005FBFE8 /* Assets.xcassets in Resources */,
D288390D1D211522005FBFE8 /* Cell.xib in Resources */,
D28839031D2113A3005FBFE8 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
53BC74B406E8FA8CA24B5873 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryForMac/Pods-ImaginaryForMac-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
55A2ACC7C6304E095220777D /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
D66AF2BE601A8F9708469D8F /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryForMac/Pods-ImaginaryForMac-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
D28838F41D2113A3005FBFE8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D28838FE1D2113A3005FBFE8 /* ViewController.swift in Sources */,
D28838FC1D2113A3005FBFE8 /* AppDelegate.swift in Sources */,
D288390C1D211522005FBFE8 /* Cell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
D28839011D2113A3005FBFE8 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
D28839021D2113A3005FBFE8 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
D28839051D2113A3005FBFE8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
D28839061D2113A3005FBFE8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
name = Release;
};
D28839081D2113A3005FBFE8 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C2903F74703615995C59EBED /* Pods-ImaginaryForMac.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = ImaginaryForMac/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "no.hyperoslo.Imaginary-Mac.ImaginaryForMac";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
D28839091D2113A3005FBFE8 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F352B24B95F67FCE8E31323A /* Pods-ImaginaryForMac.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = ImaginaryForMac/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "no.hyperoslo.Imaginary-Mac.ImaginaryForMac";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
D28838F31D2113A3005FBFE8 /* Build configuration list for PBXProject "ImaginaryForMac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D28839051D2113A3005FBFE8 /* Debug */,
D28839061D2113A3005FBFE8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D28839071D2113A3005FBFE8 /* Build configuration list for PBXNativeTarget "ImaginaryForMac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D28839081D2113A3005FBFE8 /* Debug */,
D28839091D2113A3005FBFE8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = D28838F01D2113A3005FBFE8 /* Project object */;
}