Skip to content

Commit d3b89da

Browse files
Pete SchwambPete Schwamb
authored andcommitted
Use embedded carthage binary
1 parent 18af414 commit d3b89da

4 files changed

Lines changed: 4 additions & 17 deletions

File tree

Loop.xcodeproj/project.pbxproj

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
isa = PBXAggregateTarget;
1212
buildConfigurationList = 432CF87820D8B8380066B889 /* Build configuration list for PBXAggregateTarget "Cartfile" */;
1313
buildPhases = (
14-
432CF88220D8BCD90066B889 /* Homebrew & Carthage Setup */,
1514
432CF87B20D8B8490066B889 /* Build Carthage Dependencies */,
1615
);
1716
dependencies = (
@@ -1094,6 +1093,7 @@
10941093
C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopCompletionFreshness.swift; sourceTree = "<group>"; };
10951094
C1A3EED1235233E1007672E3 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = "<group>"; };
10961095
C1A3EED323523551007672E3 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = "<group>"; };
1096+
C1BFEC2125B754C20017CEA8 /* carthage.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = carthage.sh; sourceTree = "<group>"; };
10971097
C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_dropping_then_rising.json; sourceTree = "<group>"; };
10981098
C1D197FE232CF92D0096D646 /* capture-build-details.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "capture-build-details.sh"; sourceTree = "<group>"; };
10991099
C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasalDeliveryState.swift; sourceTree = "<group>"; };
@@ -1888,6 +1888,7 @@
18881888
C18A491122FCC20B00FDA733 /* Scripts */ = {
18891889
isa = PBXGroup;
18901890
children = (
1891+
C1BFEC2125B754C20017CEA8 /* carthage.sh */,
18911892
C1D197FE232CF92D0096D646 /* capture-build-details.sh */,
18921893
C125F31A22FE7CE200FD0545 /* copy-frameworks.sh */,
18931894
C18A491222FCC22800FDA733 /* build-derived-assets.sh */,
@@ -2419,20 +2420,6 @@
24192420
shellPath = /bin/sh;
24202421
shellScript = "\n\nif [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n echo \"Bootstrapping carthage dependencies\"\n ./Scripts/carthage.sh bootstrap --project-directory \"$SRCROOT\" --platform ios,watchos --cache-builds --verbose\nfi\n";
24212422
};
2422-
432CF88220D8BCD90066B889 /* Homebrew & Carthage Setup */ = {
2423-
isa = PBXShellScriptBuildPhase;
2424-
buildActionMask = 2147483647;
2425-
files = (
2426-
);
2427-
inputPaths = (
2428-
);
2429-
name = "Homebrew & Carthage Setup";
2430-
outputPaths = (
2431-
);
2432-
runOnlyForDeploymentPostprocessing = 0;
2433-
shellPath = /bin/sh;
2434-
shellScript = "if ! [ -x \"$(command -v brew)\" ]; then\n # Install Homebrew\n ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\"\nfi\n\nif brew ls carthage > /dev/null; then\n brew upgrade carthage || echo \"Continuing…\"\nelse\n brew install carthage\nfi\n";
2435-
};
24362423
43D9FFE221EAE40600AF44BF /* Copy Frameworks with Carthage */ = {
24372424
isa = PBXShellScriptBuildPhase;
24382425
buildActionMask = 2147483647;

Scripts/carthage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x8
1616
echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
1717

1818
export XCODE_XCCONFIG_FILE="$xcconfig"
19-
carthage "$@"
19+
"${SRCROOT}/bin/carthage" "$@"

Scripts/copy-frameworks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ for COUNTER in $(seq 0 $(($SCRIPT_INPUT_FILE_COUNT - 1))); do
3838
done
3939

4040
echo "Copy Frameworks with Carthage"
41-
carthage copy-frameworks
41+
"${SRCROOT}/bin/carthage" copy-frameworks

bin/carthage

5.32 MB
Binary file not shown.

0 commit comments

Comments
 (0)