Commit 39dd980e authored by Aral Balkan's avatar Aral Balkan

Demo project now loads in framework from derived data via relative path.

parent 3108ba89
git "git@source.ind.ie:project/timer.git" ~> 2.0
\ No newline at end of file
git "git@source.ind.ie:project/timer.git" "1.0.5"
......@@ -12,7 +12,7 @@
A727AA2B1C9EFD8100F44ED3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A727AA291C9EFD8100F44ED3 /* Main.storyboard */; };
A727AA2D1C9EFD8100F44ED3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A727AA2C1C9EFD8100F44ED3 /* Assets.xcassets */; };
A727AA301C9EFD8100F44ED3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A727AA2E1C9EFD8100F44ED3 /* LaunchScreen.storyboard */; };
A7D97E381CA40A61007C185B /* Timer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D97E371CA40A61007C185B /* Timer.framework */; };
A72BFA0A1CA43209002BAD35 /* Timer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A72BFA091CA43209002BAD35 /* Timer.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -23,7 +23,7 @@
A727AA2C1C9EFD8100F44ED3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A727AA2F1C9EFD8100F44ED3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A727AA311C9EFD8100F44ED3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A7D97E371CA40A61007C185B /* Timer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Timer.framework; path = ../Carthage/Build/iOS/Timer.framework; sourceTree = "<group>"; };
A72BFA091CA43209002BAD35 /* Timer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Timer.framework; path = "$(CONFIGURATION_BUILD_DIR)/Timer.framework"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -31,7 +31,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A7D97E381CA40A61007C185B /* Timer.framework in Frameworks */,
A72BFA0A1CA43209002BAD35 /* Timer.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -41,7 +41,7 @@
A727AA191C9EFD8100F44ED3 = {
isa = PBXGroup;
children = (
A7D97E371CA40A61007C185B /* Timer.framework */,
A72BFA091CA43209002BAD35 /* Timer.framework */,
A727AA241C9EFD8100F44ED3 /* TimerDemo-iOS */,
A727AA231C9EFD8100F44ED3 /* Products */,
);
......@@ -78,7 +78,6 @@
A727AA1E1C9EFD8100F44ED3 /* Sources */,
A727AA1F1C9EFD8100F44ED3 /* Frameworks */,
A727AA201C9EFD8100F44ED3 /* Resources */,
A7D97E391CA40A69007C185B /* ShellScript */,
);
buildRules = (
);
......@@ -135,23 +134,6 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
A7D97E391CA40A69007C185B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/../Carthage/Build/iOS/Timer.framework",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
A727AA1E1C9EFD8100F44ED3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
......
#!/bin/sh
# Colours
successColour='\e[1;37;42m' # White on green
failColour='\e[1;37;41m' # White on red
regularColour='\e[0m'
if [ -d Carthage ]; then
# The Carthage folder exists, we’re reasonably sure that the
# installation script was run: Let’s open the workspace.
open Timer.xcworkspace
printf "\n${successColour}Workspace launched in Xcode.${regularColour}\n\nTo play with the framework, build and run the demonstration app in the workspace that just opened in Xcode.\n\n"
else
# The Carthage folder does not exist, inform the person that they
# must run the installation script first.
printf "\n${failColour}Dependencies not installed.${regularColour}\n\nPlease run the ./install script first.\n\n"
exit 1
fi
\ No newline at end of file
open Timer.xcworkspace
\ No newline at end of file
#!/bin/sh
# Colours
successColour='\e[1;37;42m' # White on green
failColour='\e[1;37;41m' # White on red
regularColour='\e[0m'
# Check that Carthage exists or lead person to install it.
if hash carthage 2>/dev/null; then
# Make errors abort the script
set -e
echo "\nInstalling dependencies…\n"
# Install the dependencies for the demo apps.
carthage bootstrap --platform iOS
# Done
printf "\n${successColour}Installation complete.${regularColour}\n\nTo start, type ./dev\n\n"
else
# Installation failed: Carthage not found.
printf "\n${failColour}Installation failed: Carthage not found.${regularColour}\n\nThe demonstration app uses Carthage to manage dependencies.\n\nTo fix: Please install Carthage from the address below and run the install script again:\nhttps://github.com/Carthage/Carthage#installing-carthage\n\n"
exit 1
fi
\ No newline at end of file
echo "\nNothing to install, please run ./dev\n"
\ No newline at end of file
carthage update --platform iOS
\ No newline at end of file
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