Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Private assets
# Generated into the app bundle by Scripts/gengoogle; a copy here is stale.
Flipcash/Supporting Files/GoogleService-Info.plist
Configurations/secrets.local.xcconfig
ci_scripts/ci_post_xcodebuild.sh
.env
Expand Down
7 changes: 4 additions & 3 deletions Code.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
"Supporting Files/apple-app-site-association",
"Supporting Files/GoogleService-Info.plist",
"Supporting Files/Info.plist",
);
target = 9A516F792D9B12E800AF478B /* Flipcash */;
Expand Down Expand Up @@ -417,10 +418,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 9A516F9B2D9B12EA00AF478B /* Build configuration list for PBXNativeTarget "Flipcash" */;
buildPhases = (
9ADEF1CD2DD516A5001B260A /* Generate Google */,
9A516F762D9B12E800AF478B /* Sources */,
9A516F772D9B12E800AF478B /* Frameworks */,
9A516F782D9B12E800AF478B /* Resources */,
9ADEF1CD2DD516A5001B260A /* Generate Google */,
4C7D70022FC8892D0091C7A4 /* Embed Foundation Extensions */,
);
buildRules = (
Expand Down Expand Up @@ -656,11 +657,11 @@
outputFileListPaths = (
);
outputPaths = (
"$(SOURCE_ROOT)/Flipcash/Supporting Files/GoogleService-Info.plist",
"$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/GoogleService-Info.plist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$SOURCE_ROOT/Scripts\"\n\n./gengoogle \"$SOURCE_ROOT/Flipcash/Supporting Files/GoogleService-Info.plist\" \"FG_\"\n";
shellScript = "cd \"$SOURCE_ROOT/Scripts\"\n\n./gengoogle \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/GoogleService-Info.plist\" \"FG_\"\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
38 changes: 0 additions & 38 deletions Flipcash/Supporting Files/GoogleService-Info.plist

This file was deleted.

3 changes: 2 additions & 1 deletion Scripts/git-hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# CI scripts, or any file that flips between dummy/real values per local
# environment. Most of these are gitignored, but `git add -f` bypasses
# .gitignore and would silently commit secrets; this hook is the safety net.
# Deletions pass: removing a file cannot leak its contents.

set -e

Expand Down Expand Up @@ -48,7 +49,7 @@ while IFS= read -r -d '' staged_path; do
$pattern) block "$staged_path" ;;
esac
done
done < <(git diff --cached --name-only -z)
done < <(git diff --cached --name-only --diff-filter=d -z)

# Contract pins: FlipcashAPI/Package.swift pins each contract package with an
# exact version, and the workspace Package.resolved has to record the same one.
Expand Down
Loading