Commit bf04fe3f authored by Aral Balkan's avatar Aral Balkan

The demo apps now add the framework not via Carthage (leading to haning...

The demo apps now add the framework not via Carthage (leading to haning installs/infinite recursion?).
parent 929cd21e
git "git@source.ind.ie:project/handle.git" ~> 3.0
git "git@source.ind.ie:project/delay.git" ~> 2.0
\ No newline at end of file
git "git@source.ind.ie:project/handle.git" "v3.0.0"
git "git@source.ind.ie:project/delay.git" "v2.0.0"
......@@ -13,8 +13,8 @@
A7C0EB701C2441C800110179 /* OSXViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7C0EB6F1C2441C800110179 /* OSXViewController.swift */; };
A7C0EB721C2441C800110179 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7C0EB711C2441C800110179 /* Assets.xcassets */; };
A7C0EB751C2441C800110179 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A7C0EB731C2441C800110179 /* Main.storyboard */; };
A7D97E331CA406E0007C185B /* Delay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D97E321CA406E0007C185B /* Delay.framework */; };
A7D97E341CA406E0007C185B /* Delay.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A7D97E321CA406E0007C185B /* Delay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A7E2C2621CA43B2800CD92AE /* Delay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7394BDC1CA435C70096FF28 /* Delay.framework */; };
A7E2C2631CA43B2800CD92AE /* Delay.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A7394BDC1CA435C70096FF28 /* Delay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -24,7 +24,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
A7D97E341CA406E0007C185B /* Delay.framework in Embed Frameworks */,
A7E2C2631CA43B2800CD92AE /* Delay.framework in Embed Frameworks */,
A787D4691C24811E00CDBF66 /* Handle.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
......@@ -33,6 +33,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
A7394BDC1CA435C70096FF28 /* Delay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Delay.framework; path = "$(CONFIGURATION_BUILD_DIR)/Delay.framework"; sourceTree = "<group>"; };
A787D4671C24811E00CDBF66 /* Handle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Handle.framework; path = ../Carthage/Build/Mac/Handle.framework; sourceTree = "<group>"; };
A7C0EB6A1C2441C800110179 /* DelayDemo-OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DelayDemo-OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A7C0EB6D1C2441C800110179 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
......@@ -40,7 +41,6 @@
A7C0EB711C2441C800110179 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A7C0EB741C2441C800110179 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
A7C0EB761C2441C800110179 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A7D97E321CA406E0007C185B /* Delay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Delay.framework; path = ../Carthage/Build/Mac/Delay.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -48,7 +48,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A7D97E331CA406E0007C185B /* Delay.framework in Frameworks */,
A7E2C2621CA43B2800CD92AE /* Delay.framework in Frameworks */,
A787D4681C24811E00CDBF66 /* Handle.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -59,7 +59,6 @@
A7C0EB611C2441C800110179 = {
isa = PBXGroup;
children = (
A7D97E321CA406E0007C185B /* Delay.framework */,
A787D4671C24811E00CDBF66 /* Handle.framework */,
A7C0EB6C1C2441C800110179 /* DelayDemo-OSX */,
A7C0EB6B1C2441C800110179 /* Products */,
......
......@@ -7,14 +7,16 @@
objects = {
/* Begin PBXBuildFile section */
A7394BDD1CA435C70096FF28 /* Delay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7394BDC1CA435C70096FF28 /* Delay.framework */; };
A787D4771C24867500CDBF66 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A787D4761C24867500CDBF66 /* AppDelegate.swift */; };
A787D4791C24867500CDBF66 /* IOSViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A787D4781C24867500CDBF66 /* IOSViewController.swift */; };
A787D47C1C24867500CDBF66 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A787D47A1C24867500CDBF66 /* Main.storyboard */; };
A787D47E1C24867500CDBF66 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A787D47D1C24867500CDBF66 /* Assets.xcassets */; };
A787D4811C24867500CDBF66 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A787D47F1C24867500CDBF66 /* LaunchScreen.storyboard */; };
A787D48D1C24871A00CDBF66 /* Handle.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787D48C1C24871A00CDBF66 /* Handle.framework.dSYM */; };
A7D97E311CA40645007C185B /* Delay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D97E301CA40645007C185B /* Delay.framework */; };
A7D97E361CA4073D007C185B /* Handle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D97E351CA4073D007C185B /* Handle.framework */; };
A7E2C25F1CA43ACB00CD92AE /* Delay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7394BDC1CA435C70096FF28 /* Delay.framework */; };
A7E2C2601CA43ACB00CD92AE /* Delay.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A7394BDC1CA435C70096FF28 /* Delay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -28,9 +30,21 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
A7E2C2611CA43ACB00CD92AE /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
A7E2C2601CA43ACB00CD92AE /* Delay.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
A7394BDC1CA435C70096FF28 /* Delay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Delay.framework; path = "$(CONFIGURATION_BUILD_DIR)/Delay.framework"; sourceTree = "<group>"; };
A787D4731C24867500CDBF66 /* DelayDemo-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DelayDemo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A787D4761C24867500CDBF66 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
A787D4781C24867500CDBF66 /* IOSViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IOSViewController.swift; sourceTree = "<group>"; };
......@@ -39,7 +53,6 @@
A787D4801C24867500CDBF66 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A787D4821C24867500CDBF66 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A787D48C1C24871A00CDBF66 /* Handle.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Handle.framework.dSYM; path = ../Carthage/Build/iOS/Handle.framework.dSYM; sourceTree = "<group>"; };
A7D97E301CA40645007C185B /* Delay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Delay.framework; path = ../Carthage/Build/iOS/Delay.framework; sourceTree = "<group>"; };
A7D97E351CA4073D007C185B /* Handle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Handle.framework; path = ../Carthage/Build/iOS/Handle.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -48,8 +61,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A7D97E311CA40645007C185B /* Delay.framework in Frameworks */,
A7D97E361CA4073D007C185B /* Handle.framework in Frameworks */,
A7E2C25F1CA43ACB00CD92AE /* Delay.framework in Frameworks */,
A7394BDD1CA435C70096FF28 /* Delay.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -59,8 +73,8 @@
A787D46A1C24867500CDBF66 = {
isa = PBXGroup;
children = (
A7394BDC1CA435C70096FF28 /* Delay.framework */,
A7D97E351CA4073D007C185B /* Handle.framework */,
A7D97E301CA40645007C185B /* Delay.framework */,
A787D48C1C24871A00CDBF66 /* Handle.framework.dSYM */,
A787D4751C24867500CDBF66 /* DelayDemo-iOS */,
A787D4741C24867500CDBF66 /* Products */,
......@@ -100,6 +114,7 @@
A787D4711C24867500CDBF66 /* Resources */,
A787D48A1C2486BA00CDBF66 /* ShellScript */,
A787D48B1C2486FA00CDBF66 /* CopyFiles */,
A7E2C2611CA43ACB00CD92AE /* Embed Frameworks */,
);
buildRules = (
);
......@@ -164,7 +179,6 @@
);
inputPaths = (
"$(SRCROOT)/../Carthage/Build/iOS/Handle.framework",
"$(SRCROOT)/../Carthage/Build/iOS/Delay.framework",
);
outputPaths = (
);
......@@ -293,7 +307,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../Carthage/Build/iOS",
"$(PROJECT_DIR)/$(CONFIGURATION_BUILD_DIR)",
);
INFOPLIST_FILE = "DelayDemo-iOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ind.ie.DelayDemo-iOS";
......@@ -305,7 +322,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../Carthage/Build/iOS",
"$(PROJECT_DIR)/$(CONFIGURATION_BUILD_DIR)",
);
INFOPLIST_FILE = "DelayDemo-iOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ind.ie.DelayDemo-iOS";
......
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