8000 build.sbt: galleryAndroid does not depend on pickersApple or cameraApple by rleibman · Pull Request #147 · rleibman/thicket · GitHub
[go: up one dir, main page]

Skip to content

build.sbt: galleryAndroid does not depend on pickersApple or cameraApple - #147

Merged
rleibman merged 1 commit into
mainfrom
fix/gallery-android-deps
Nov 4, 2026
Merged

rleibman merged 1 commit into
mainfrom
fix/gallery-android-deps

Conversation

@rleibman
@rleibman rleibman commented Nov 3, 2026
Copy link
Copy Markdown
Owner

#142 and #143 each added their Apple module (Scala Native) to galleryAndroid's dependsOn, next to the Android one. The Android gallery uses neither module. build.sh packages its own list of jars, and that list never included them. This PR removes the two lines.

Measured

  • galleryAndroid/compile and platforms/Test/compile: 0 errors.
  • SELFTEST=1 examples/gallery/android/build.sh on s2test: 95 checks, ALL CHECKS PASSED, the same 95 as before.

The macOS and iOS galleries keep both dependencies.

🤖 Generated with Claude Code

#142 and #143 each added their Apple module (Scala Native) to the Android
gallery's dependsOn, beside the Android one; the Android gallery uses
neither, and build.sh packages its own jar list, which never had them.

Measured: galleryAndroid/compile and platforms/Test/compile, 0 errors;
SELFTEST=1 examples/gallery/android/build.sh on s2test, 95 checks, ALL
CHECKS PASSED (95 before as well).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@rleibman
rleibman requested a balanced review from Copilot November 3, 2026 19:30
Copilot AI left a comment
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request. Check if the Files changed in this pull request are included in default exclusions.

@rleibman
rleibman merged commit f95eea6 into main Nov 4, 2026
2 checks passed
rleibman added a commit that referenced this pull request Nov 4, 2026
The same two-line fix was on both sides; the one conflict is the line this
branch adds next to it, cameraPreviewAndroid, kept. galleryAndroid/compile
and platforms/Test/compile: 0 errors. Nothing else changed on main, so the
GTK (148) and Android (102) counts measured on this branch stand.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
rleibman added a commit that referenced this pull request Nov 4, 2026
… 2) (#149)

* The camera preview: thicket-camera-preview and -android (docs/17 step 2)

A live camera preview in the app's own layout, through the embedding point:
- thicket-camera-preview (JVM, Native): CameraPreview (availability, facing,
  running, view(fit), capture), Facing, CameraPreview.unavailable, a fake.
- thicket-camera-preview-android: Camera2 into a TextureView, a JPEG
  ImageReader on the same session; orientation and fit by the view's
  transform; runs only while mounted, its surface ready, in front and
  permitted; one preview at a time; each close records its reason.
- Gallery: a Camera preview section. Android runs it (the gallery declares
  CAMERA; the undeclared-permission check moves to the microphone); GTK
  shows CameraPreview.unavailable; Apple has none yet (#148).
- galleryAndroid no longer depends on pickersApple/cameraApple (as #147).

Measured: checkLinux exit 0 (a first run failed ScaleSpec's frame budget
on coreNative, 27.22 ms under load; 3/3 alone at 2.8-3.4 ms; this branch
does not touch core). CameraPreviewSpec 2/2 JVM and Native. GTK gallery
148 (144 + 4), todo 69. Android gallery 102 (95 + 7) on s2test: frames,
not blank, a 1280x720 JPEG capture, Home closes the camera (by the
preview's lifecycle first), front reopens, no front camera, flip back.
platforms/Test/compile 0 errors.
Falsified: without the lifecycle's background stop the background check
fails (stops: facing..., error 3, disconnected: Android takes the camera
itself); with capture stubbed the JPEG check fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Improve handling of camera output sizes

Refactor size selection for camera preview and JPEG output.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Refactor camera permission status check

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Refactor image writing logic in AndroidCameraPreview

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* AndroidCameraPreview: remove the line 8cadb52 left behind, which broke the build

8cadb52 (Copilot autofix) made the JPEG write a Try[Option[Path]] and added
`finishCapture(written.toOption.flatten)`, but kept the old
`finishCapture(written.toOption)` after it, which no longer type-checks
(Found Option[Option[Path]], required Option[Path]), so #149 did not compile
from 8cadb52 on. The autofix's change itself (a null image answers None) is
kept; only the stale line goes.

Measured after: checkLinux exit 0; SELFTEST=1
examples/gallery/android/build.sh on s2test, 102 checks, ALL CHECKS PASSED
(with 72ffc16's size guard and df7c129's undeclared-permission throw too).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

0