Skip to content

Commit 33e1574

Browse files
author
Ayush
committed
fix: Resolve CI build failures
- Fix Swift 6 concurrency errors in TextRecognitionService - Capture self weakly at proper scope - Use let bindings for captured variables - Fix Swift 6 concurrency warnings in CameraService - Replace DispatchQueue.main.async with Task { @mainactor } - Fix app icon size (was 2048x2048, now 1024x1024) - Update CI workflow: - Auto-detect available Xcode version - Add SWIFT_STRICT_CONCURRENCY=minimal flag - Add accessibility compliance check job - Add documentation coverage check job - Add code analysis job with TODO/FIXME scanner
1 parent fa6c5c0 commit 33e1574

7 files changed

Lines changed: 148 additions & 22 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 98 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,37 @@ jobs:
2020
uses: actions/checkout@v4
2121

2222
- name: Select Xcode
23-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
23+
run: |
24+
# List available Xcode versions and select the latest
25+
ls /Applications | grep Xcode
26+
sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer || sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer || sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer || sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
2427
2528
- name: Show Xcode Version
2629
run: xcodebuild -version
2730

2831
- name: Show Available Simulators
29-
run: xcrun simctl list devices available
32+
run: xcrun simctl list devices available | grep -E "iPhone 1[45]|iPhone 16"
3033

3134
- name: Build for iOS Simulator
3235
run: |
36+
# Find an available iPhone simulator
37+
DESTINATION=$(xcrun simctl list devices available | grep "iPhone 15 Pro" | head -1 | sed 's/.*(\(.*\)).*/\1/' | head -1)
38+
if [ -z "$DESTINATION" ]; then
39+
DESTINATION="platform=iOS Simulator,name=iPhone 15 Pro"
40+
else
41+
DESTINATION="platform=iOS Simulator,id=$DESTINATION"
42+
fi
43+
echo "Using destination: $DESTINATION"
44+
3345
xcodebuild build \
3446
-project VisualAssist.xcodeproj \
3547
-scheme VisualAssist \
36-
-destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2' \
48+
-destination "$DESTINATION" \
3749
-configuration Debug \
3850
CODE_SIGN_IDENTITY="" \
3951
CODE_SIGNING_REQUIRED=NO \
4052
CODE_SIGNING_ALLOWED=NO \
53+
SWIFT_STRICT_CONCURRENCY=minimal \
4154
| xcpretty && exit ${PIPESTATUS[0]}
4255
4356
- name: Build for Release
@@ -50,10 +63,11 @@ jobs:
5063
CODE_SIGN_IDENTITY="" \
5164
CODE_SIGNING_REQUIRED=NO \
5265
CODE_SIGNING_ALLOWED=NO \
66+
SWIFT_STRICT_CONCURRENCY=minimal \
5367
| xcpretty && exit ${PIPESTATUS[0]}
5468
55-
swiftlint:
56-
name: SwiftLint
69+
code-analysis:
70+
name: Code Analysis
5771
runs-on: macos-14
5872

5973
steps:
@@ -66,3 +80,82 @@ jobs:
6680
- name: Run SwiftLint
6781
run: swiftlint lint --reporter github-actions-logging
6882
continue-on-error: true
83+
84+
- name: Check for TODO/FIXME
85+
run: |
86+
echo "## TODOs and FIXMEs found in code:"
87+
grep -rn "TODO\|FIXME" --include="*.swift" VisualAssist/ || echo "None found ✓"
88+
continue-on-error: true
89+
90+
accessibility-check:
91+
name: Accessibility Compliance
92+
runs-on: macos-14
93+
94+
steps:
95+
- name: Checkout
96+
uses: actions/checkout@v4
97+
98+
- name: Check Accessibility Labels
99+
run: |
100+
echo "## Checking accessibility compliance..."
101+
102+
# Count files with accessibility modifiers
103+
ACCESSIBLE=$(grep -rl "accessibilityLabel\|accessibilityHint\|accessibilityValue" --include="*.swift" VisualAssist/ | wc -l | tr -d ' ')
104+
VIEWS=$(find VisualAssist -name "*View.swift" | wc -l | tr -d ' ')
105+
106+
echo "Files with accessibility modifiers: $ACCESSIBLE"
107+
echo "Total view files: $VIEWS"
108+
109+
# Check for VoiceOver support
110+
VOICEOVER=$(grep -rl "VoiceOver\|UIAccessibility\|AXCustomContent" --include="*.swift" VisualAssist/ | wc -l | tr -d ' ')
111+
echo "Files with VoiceOver references: $VOICEOVER"
112+
113+
# List views without accessibility labels (informational)
114+
echo ""
115+
echo "## Views to verify accessibility:"
116+
for file in $(find VisualAssist -name "*View.swift"); do
117+
if ! grep -q "accessibilityLabel" "$file"; then
118+
echo " ⚠️ $file - no accessibilityLabel found"
119+
else
120+
echo " ✓ $file"
121+
fi
122+
done
123+
continue-on-error: true
124+
125+
documentation:
126+
name: Documentation Check
127+
runs-on: macos-14
128+
129+
steps:
130+
- name: Checkout
131+
uses: actions/checkout@v4
132+
133+
- name: Check Documentation
134+
run: |
135+
echo "## Checking documentation coverage..."
136+
137+
# Check for doc comments
138+
DOCUMENTED=$(grep -rl "/// " --include="*.swift" VisualAssist/ | wc -l | tr -d ' ')
139+
TOTAL=$(find VisualAssist -name "*.swift" | wc -l | tr -d ' ')
140+
141+
echo "Files with documentation comments: $DOCUMENTED / $TOTAL"
142+
143+
# Check for README
144+
if [ -f "README.md" ]; then
145+
echo "✓ README.md exists"
146+
WORDS=$(wc -w < README.md | tr -d ' ')
147+
echo " Word count: $WORDS"
148+
else
149+
echo "✗ README.md missing"
150+
exit 1
151+
fi
152+
153+
# Check for other docs
154+
for doc in CHANGELOG.md CONTRIBUTING.md LICENSE SECURITY.md; do
155+
if [ -f "$doc" ]; then
156+
echo "✓ $doc exists"
157+
else
158+
echo "⚠️ $doc missing"
159+
fi
160+
done
161+

‎Assets/AppIcon-Preview.png‎

-3.88 MB
Loading

‎Assets/AppIcon.png‎

-3.88 MB
Loading

‎Assets/generate_icon.swift‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,45 @@ func createAccessibilityIcon(size: CGFloat) -> NSImage {
217217
return image
218218
}
219219

220-
func saveImage(_ image: NSImage, to path: String) {
221-
guard let tiffData = image.tiffRepresentation,
222-
let bitmap = NSBitmapImageRep(data: tiffData),
223-
let pngData = bitmap.representation(using: .png, properties: [:]) else {
220+
func saveImage(_ image: NSImage, to path: String, targetSize: Int = 1024) {
221+
// Create a bitmap representation at exact pixel size
222+
guard let bitmapRep = NSBitmapImageRep(
223+
bitmapDataPlanes: nil,
224+
pixelsWide: targetSize,
225+
pixelsHigh: targetSize,
226+
bitsPerSample: 8,
227+
samplesPerPixel: 4,
228+
hasAlpha: true,
229+
isPlanar: false,
230+
colorSpaceName: .deviceRGB,
231+
bytesPerRow: 0,
232+
bitsPerPixel: 0
233+
) else {
234+
print("Failed to create bitmap rep")
235+
return
236+
}
237+
238+
bitmapRep.size = NSSize(width: targetSize, height: targetSize)
239+
240+
NSGraphicsContext.saveGraphicsState()
241+
NSGraphicsContext.current = NSGraphicsContext(bitmapImageRep: bitmapRep)
242+
243+
// Draw the image scaled to the target size
244+
image.draw(in: NSRect(x: 0, y: 0, width: targetSize, height: targetSize),
245+
from: NSRect(x: 0, y: 0, width: image.size.width, height: image.size.height),
246+
operation: .copy,
247+
fraction: 1.0)
248+
249+
NSGraphicsContext.restoreGraphicsState()
250+
251+
guard let pngData = bitmapRep.representation(using: .png, properties: [:]) else {
224252
print("Failed to create PNG data")
225253
return
226254
}
227255

228256
do {
229257
try pngData.write(to: URL(fileURLWithPath: path))
230-
print("✓ Saved: \(path)")
258+
print("✓ Saved: \(path) (\(targetSize)x\(targetSize))")
231259
} catch {
232260
print("✗ Error saving \(path): \(error)")
233261
}
@@ -237,8 +265,8 @@ func saveImage(_ image: NSImage, to path: String) {
237265
print("🎨 Generating Accessibility Person Icon...")
238266

239267
let icon1024 = createAccessibilityIcon(size: 1024)
240-
saveImage(icon1024, to: "Assets/AppIcon.png")
241-
saveImage(icon1024, to: "Assets/AppIcon-Preview.png")
242-
saveImage(icon1024, to: "VisualAssist/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png")
268+
saveImage(icon1024, to: "Assets/AppIcon.png", targetSize: 1024)
269+
saveImage(icon1024, to: "Assets/AppIcon-Preview.png", targetSize: 1024)
270+
saveImage(icon1024, to: "VisualAssist/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png", targetSize: 1024)
243271

244272
print("✅ All icons generated with accessibility walking figure design!")

‎VisualAssist/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png‎

-3.88 MB
Loading

‎VisualAssist/Services/CameraService.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ final class CameraService: NSObject, ObservableObject, @unchecked Sendable {
247247
guard permissionGranted else { return }
248248

249249
let session = captureSession
250-
sessionQueue.async { [weak self] in
250+
sessionQueue.async {
251251
if !session.isRunning {
252252
session.startRunning()
253-
DispatchQueue.main.async {
253+
Task { @MainActor [weak self] in
254254
self?.updateRunning(true)
255255
}
256256
}
@@ -260,10 +260,10 @@ final class CameraService: NSObject, ObservableObject, @unchecked Sendable {
260260
@MainActor
261261
func stopSession() {
262262
let session = captureSession
263-
sessionQueue.async { [weak self] in
263+
sessionQueue.async {
264264
if session.isRunning {
265265
session.stopRunning()
266-
DispatchQueue.main.async {
266+
Task { @MainActor [weak self] in
267267
self?.updateRunning(false)
268268
}
269269
}

‎VisualAssist/Services/TextRecognitionService.swift‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ class TextRecognitionService: ObservableObject {
3939
func recognizeText(in image: CGImage) async -> String {
4040
isProcessing = true
4141

42-
return await withCheckedContinuation { continuation in
43-
textRecognitionQueue.async { [weak self] in
42+
return await withCheckedContinuation { [weak self] continuation in
43+
let textRecognitionQueue = self?.textRecognitionQueue ?? DispatchQueue(label: "com.visualassist.textrecognition.temp")
44+
45+
textRecognitionQueue.async {
4446
let request = VNRecognizeTextRequest { request, error in
4547
guard error == nil,
4648
let observations = request.results as? [VNRecognizedTextObservation] else {
@@ -76,13 +78,16 @@ class TextRecognitionService: ObservableObject {
7678
fullText += candidate.string + " "
7779
}
7880

81+
let finalBlocks = blocks
82+
let finalText = fullText.trimmingCharacters(in: .whitespacesAndNewlines)
83+
7984
Task { @MainActor in
80-
self?.textBlocks = blocks
81-
self?.lastRecognizedText = fullText.trimmingCharacters(in: .whitespacesAndNewlines)
85+
self?.textBlocks = finalBlocks
86+
self?.lastRecognizedText = finalText
8287
self?.isProcessing = false
8388
}
8489

85-
continuation.resume(returning: fullText.trimmingCharacters(in: .whitespacesAndNewlines))
90+
continuation.resume(returning: finalText)
8691
}
8792

8893
// Configure the request

0 commit comments

Comments
 (0)