Skip to content

Commit 395399b

Browse files
committed
added fix for libfido structure, completed testing
1 parent 3747f21 commit 395399b

3 files changed

Lines changed: 23 additions & 11 deletions

File tree

Scripts/fix_libfido2_framework.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
# Fix libfido2.framework structure for macOS validation
4+
# If this script is not run, the build will fail because xcodebuild is expecting the library in a specific structure
45
FRAMEWORK_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfido2.framework"
56

67
if [ -d "$FRAMEWORK_PATH" ] && [ -f "$FRAMEWORK_PATH/Info.plist" ] && [ ! -d "$FRAMEWORK_PATH/Versions" ]; then
@@ -11,10 +12,10 @@ if [ -d "$FRAMEWORK_PATH" ] && [ -f "$FRAMEWORK_PATH/Info.plist" ] && [ ! -d "$F
1112

1213
# Move files to proper locations
1314
mv "$FRAMEWORK_PATH/Info.plist" "$FRAMEWORK_PATH/Versions/A/Resources/"
14-
#mv "$FRAMEWORK_PATH/libfido2" "$FRAMEWORK_PATH/Versions/A/"
15-
#if [ -f "$FRAMEWORK_PATH/LICENSE" ]; then
16-
# mv "$FRAMEWORK_PATH/LICENSE" "$FRAMEWORK_PATH/Versions/A/"
17-
#fi
15+
mv "$FRAMEWORK_PATH/libfido2" "$FRAMEWORK_PATH/Versions/A/"
16+
if [ -f "$FRAMEWORK_PATH/LICENSE" ]; then
17+
mv "$FRAMEWORK_PATH/LICENSE" "$FRAMEWORK_PATH/Versions/A/"
18+
fi
1819

1920
# Create symbolic links
2021
ln -sf A "$FRAMEWORK_PATH/Versions/Current"

Xcodes.xcodeproj/project.pbxproj

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@
696696
buildConfigurationList = CAD2E7BC2449575100113D76 /* Build configuration list for PBXNativeTarget "Xcodes" */;
697697
buildPhases = (
698698
CAD2E79A2449574E00113D76 /* Sources */,
699+
05EACA532E76D21100CF1F9D /* Fix libfido2 structure */,
699700
CAD2E79B2449574E00113D76 /* Frameworks */,
700701
CA9FF8292594F33200E47BAF /* Generate Acknowledgements */,
701702
CAD2E79C2449574E00113D76 /* Resources */,
@@ -845,6 +846,15 @@
845846
/* End PBXResourcesBuildPhase section */
846847

847848
/* Begin PBXShellScriptBuildPhase section */
849+
05EACA532E76D21100CF1F9D /* Fix libfido2 structure */ = {
850+
isa = PBXShellScriptBuildPhase;
851+
name = "Fix libfido2 structure";
852+
shellPath = /bin/sh;
853+
shellScript = (
854+
"/Users/genesis/Coding/XCode/OpenSourceContributions/XcodesApp/Scripts/fix_libfido2_framework.sh",
855+
"",
856+
);
857+
};
848858
CA9FF8292594F33200E47BAF /* Generate Acknowledgements */ = {
849859
isa = PBXShellScriptBuildPhase;
850860
inputPaths = (
@@ -863,6 +873,7 @@
863873
" -o \"${SRCROOT}/Xcodes/Resources/Licenses.rtf\"",
864874
"",
865875
"",
876+
"",
866877
);
867878
};
868879
/* End PBXShellScriptBuildPhase section */
@@ -1088,7 +1099,7 @@
10881099
CODE_SIGN_IDENTITY = "-";
10891100
CODE_SIGN_STYLE = Manual;
10901101
COMBINE_HIDPI_IMAGES = YES;
1091-
CURRENT_PROJECT_VERSION = 32;
1102+
CURRENT_PROJECT_VERSION = 33;
10921103
DEAD_CODE_STRIPPING = YES;
10931104
DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\"";
10941105
DEVELOPMENT_TEAM = "";
@@ -1101,7 +1112,7 @@
11011112
"@executable_path/../Frameworks",
11021113
);
11031114
MACOSX_DEPLOYMENT_TARGET = 13.0;
1104-
MARKETING_VERSION = 3.0.0;
1115+
MARKETING_VERSION = 3.0.1;
11051116
PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp;
11061117
PRODUCT_NAME = Xcodes;
11071118
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1354,7 +1365,7 @@
13541365
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13551366
CODE_SIGN_STYLE = Automatic;
13561367
COMBINE_HIDPI_IMAGES = YES;
1357-
CURRENT_PROJECT_VERSION = 32;
1368+
CURRENT_PROJECT_VERSION = 33;
13581369
DEAD_CODE_STRIPPING = YES;
13591370
DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\"";
13601371
DEVELOPMENT_TEAM = 9NP473RSFG;
@@ -1367,7 +1378,7 @@
13671378
"@executable_path/../Frameworks",
13681379
);
13691380
MACOSX_DEPLOYMENT_TARGET = 13.0;
1370-
MARKETING_VERSION = 3.0.0;
1381+
MARKETING_VERSION = 3.0.1;
13711382
PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp;
13721383
PRODUCT_NAME = Xcodes;
13731384
SWIFT_VERSION = 5.0;
@@ -1383,7 +1394,7 @@
13831394
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13841395
CODE_SIGN_STYLE = Automatic;
13851396
COMBINE_HIDPI_IMAGES = YES;
1386-
CURRENT_PROJECT_VERSION = 32;
1397+
CURRENT_PROJECT_VERSION = 33;
13871398
DEAD_CODE_STRIPPING = YES;
13881399
DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\"";
13891400
DEVELOPMENT_TEAM = 9NP473RSFG;
@@ -1396,7 +1407,7 @@
13961407
"@executable_path/../Frameworks",
13971408
);
13981409
MACOSX_DEPLOYMENT_TARGET = 13.0;
1399-
MARKETING_VERSION = 3.0.0;
1410+
MARKETING_VERSION = 3.0.1;
14001411
PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp;
14011412
PRODUCT_NAME = Xcodes;
14021413
SWIFT_VERSION = 5.0;

Xcodes/Frontend/XcodeList/XcodeListView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ struct PlatformsPocket: View {
146146
.font(.body.weight(.medium))
147147
.padding(.horizontal)
148148
.padding(.vertical, 12)
149-
.background(.quaternary.opacity(0.75))
149+
.background(.quaternary.opacity(0.9))
150150
.clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
151151
}
152152
.buttonStyle(.plain)

0 commit comments

Comments
 (0)