Skip to content

Commit 86b4dc7

Browse files
authored
[PM-20288 ] On SDK update, also update Package.resolved (#1910)
1 parent af7dd6c commit 86b4dc7

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

Scripts/update-sdk-version.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Update SDK revision in project-common.yml
3+
# Update SDK revision in project-common.yml and Package.resolved
44

55
set -euo pipefail
66

@@ -13,9 +13,17 @@ fi
1313
SDK_PACKAGE="$1"
1414
SDK_SWIFT_REF="$2"
1515
SDK_VERSION="$3"
16-
FILE="project-common.yml"
16+
PROJECT_FILE="project-common.yml"
17+
PACKAGE_RESOLVED="Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved"
1718

18-
echo "🔧 Updating revision in $FILE..."
19-
yq -i ".packages[\"$SDK_PACKAGE\"].revision = \"$SDK_SWIFT_REF\" | .packages[\"$SDK_PACKAGE\"].revision line_comment = \"$SDK_VERSION\"" "$FILE"
20-
echo "✅ Updated revision line:"
21-
grep -A 3 "$SDK_PACKAGE:" "$FILE"
19+
# Update project-common.yml
20+
echo "🔧 Updating revision in $PROJECT_FILE..."
21+
yq -i ".packages[\"$SDK_PACKAGE\"].revision = \"$SDK_SWIFT_REF\" | .packages[\"$SDK_PACKAGE\"].revision line_comment = \"$SDK_VERSION\"" "$PROJECT_FILE"
22+
echo "✅ Updated revision line in $PROJECT_FILE"
23+
24+
# Update Package.resolved
25+
echo "🔧 Updating revision in $PACKAGE_RESOLVED..."
26+
CURRENT_HASH=$(jq -r '.pins[] | select(.identity == "sdk-swift") | .state.revision' "$PACKAGE_RESOLVED")
27+
echo "Current hash in Package.resolved: $CURRENT_HASH"
28+
sed -i '' "s/$CURRENT_HASH/$SDK_SWIFT_REF/g" "$PACKAGE_RESOLVED"
29+
echo "✅ Updated revision in $PACKAGE_RESOLVED"

0 commit comments

Comments
 (0)