diff --git a/Scripts/fix_libfido2_framework.sh b/Scripts/fix_libfido2_framework.sh index 0a40bed..d911106 100755 --- a/Scripts/fix_libfido2_framework.sh +++ b/Scripts/fix_libfido2_framework.sh @@ -1,6 +1,7 @@ #!/bin/sh # Fix libfido2.framework structure for macOS validation +# If this script is not run, the build will fail because xcodebuild is expecting the library in a specific structure FRAMEWORK_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/libfido2.framework" 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 # Move files to proper locations mv "$FRAMEWORK_PATH/Info.plist" "$FRAMEWORK_PATH/Versions/A/Resources/" - #mv "$FRAMEWORK_PATH/libfido2" "$FRAMEWORK_PATH/Versions/A/" - #if [ -f "$FRAMEWORK_PATH/LICENSE" ]; then - # mv "$FRAMEWORK_PATH/LICENSE" "$FRAMEWORK_PATH/Versions/A/" - #fi + mv "$FRAMEWORK_PATH/libfido2" "$FRAMEWORK_PATH/Versions/A/" + if [ -f "$FRAMEWORK_PATH/LICENSE" ]; then + mv "$FRAMEWORK_PATH/LICENSE" "$FRAMEWORK_PATH/Versions/A/" + fi # Create symbolic links ln -sf A "$FRAMEWORK_PATH/Versions/Current" diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index b9ea497..4064e96 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -696,6 +696,7 @@ buildConfigurationList = CAD2E7BC2449575100113D76 /* Build configuration list for PBXNativeTarget "Xcodes" */; buildPhases = ( CAD2E79A2449574E00113D76 /* Sources */, + 05EACA532E76D21100CF1F9D /* Fix libfido2 structure */, CAD2E79B2449574E00113D76 /* Frameworks */, CA9FF8292594F33200E47BAF /* Generate Acknowledgements */, CAD2E79C2449574E00113D76 /* Resources */, @@ -845,6 +846,15 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 05EACA532E76D21100CF1F9D /* Fix libfido2 structure */ = { + isa = PBXShellScriptBuildPhase; + name = "Fix libfido2 structure"; + shellPath = /bin/sh; + shellScript = ( + "/Users/genesis/Coding/XCode/OpenSourceContributions/XcodesApp/Scripts/fix_libfido2_framework.sh", + "", + ); + }; CA9FF8292594F33200E47BAF /* Generate Acknowledgements */ = { isa = PBXShellScriptBuildPhase; inputPaths = ( @@ -863,6 +873,7 @@ " -o \"${SRCROOT}/Xcodes/Resources/Licenses.rtf\"", "", "", + "", ); }; /* End PBXShellScriptBuildPhase section */ @@ -1088,7 +1099,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 32; + CURRENT_PROJECT_VERSION = 33; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\""; DEVELOPMENT_TEAM = ""; @@ -1101,7 +1112,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 3.0.0; + MARKETING_VERSION = 3.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp; PRODUCT_NAME = Xcodes; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1354,7 +1365,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 32; + CURRENT_PROJECT_VERSION = 33; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\""; DEVELOPMENT_TEAM = 9NP473RSFG; @@ -1367,7 +1378,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 3.0.0; + MARKETING_VERSION = 3.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp; PRODUCT_NAME = Xcodes; SWIFT_VERSION = 5.0; @@ -1383,7 +1394,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 32; + CURRENT_PROJECT_VERSION = 33; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\""; DEVELOPMENT_TEAM = 9NP473RSFG; @@ -1396,7 +1407,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 3.0.0; + MARKETING_VERSION = 3.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp; PRODUCT_NAME = Xcodes; SWIFT_VERSION = 5.0; diff --git a/Xcodes/Frontend/XcodeList/XcodeListView.swift b/Xcodes/Frontend/XcodeList/XcodeListView.swift index 24db069..3704f38 100644 --- a/Xcodes/Frontend/XcodeList/XcodeListView.swift +++ b/Xcodes/Frontend/XcodeList/XcodeListView.swift @@ -146,7 +146,7 @@ struct PlatformsPocket: View { .font(.body.weight(.medium)) .padding(.horizontal) .padding(.vertical, 12) - .background(.quaternary.opacity(0.75)) + .background(.quaternary.opacity(0.9)) .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous)) } .buttonStyle(.plain)