Remove references to skipapp-showcase-fuse and redirect to skipapp-showcase

Author: marcprux

astro.config.mjs

@@ -16,6 +16,9 @@ import { coreFrameworks, platformFrameworks, integrationFrameworks, sampleApps }
 export default defineConfig({
   site: 'https://skip.dev',
   //trailingSlash: 'always', // aspirational
+  redirects: {
+    '/docs/samples/skipapp-showcase-fuse': '/docs/samples/skipapp-showcase',
+  },
   markdown: {
     remarkPlugins: [remarkHeadingId],
     rehypePlugins: [[rehypeExternalLinks, {

scripts/sync-modules.js

@@ -61,6 +61,9 @@ async function processRepositories() {
 
       content = content.replace(/\]\(https:\/\/source\.skip\.dev\/(skipapp-[^\/]+)[\/]?\)/g, "](/docs/samples/$1)");
 
+      // skipapp-showcase-fuse has been consolidated into skipapp-showcase; redirect site paths to the canonical one
+      content = content.replaceAll('/docs/samples/skipapp-showcase-fuse', '/docs/samples/skipapp-showcase');
+
       // trim everything after the repo license
       content = content.replace(/## License[\s\S]*/i, '');
 

skip-repositories.js

@@ -46,8 +46,7 @@ export const integrationFrameworks = [
 ];
 
 export const sampleApps = [
-  { repo: 'skipapp-showcase-fuse', name: 'Showcase (Fuse)' },
-  { repo: 'skipapp-showcase', name: 'Showcase (Lite)' },
+  { repo: 'skipapp-showcase', name: 'Showcase' },
   { repo: 'skipapp-hello', name: 'Hello Skip (Lite)' },
   { repo: 'skipapp-howdy', name: 'Howdy Skip (Fuse)' },
   { repo: 'skipapp-ahoy', name: 'Ahoy Skipper (Split Fuse)' },

src/content/docs/blog/fully-native-android-swift-apps.md

@@ -70,7 +70,7 @@ On Android, however, the `SkipFuseUI` module bridges the SwiftUI API onto [Jetpa
 
 ![Diagram of Skip's Swift-on-Android build process](https://assets.skip.dev/diagrams/skip-diagrams-skip-fuse-ui-bridge.svg)
 
-Consult the `SkipUI` module's [documentation](/docs/modules/skip-ui/#supported-swiftui) for a listing of currently-supported SwiftUI constructs on Android. You can also examine the [ShowcaseFuse](https://github.com/skiptools/skipapp-showcase-fuse/tree/main/Sources/ShowcaseFuse) cross-platform sample app, which displays and exercises most supported SwiftUI components:
+Consult the `SkipUI` module's [documentation](/docs/modules/skip-ui/#supported-swiftui) for a listing of currently-supported SwiftUI constructs on Android. You can also examine the [Showcase](https://github.com/skiptools/skipapp-showcase) cross-platform sample app, which displays and exercises most supported SwiftUI components:
 
 <div class="centered">
 <img src="https://assets.skip.dev/videos/showcase.gif" alt="Screen recording" style="max-width: 600px"/>
@@ -157,7 +157,7 @@ Skip's unique ability to directly call both Swift and Kotlin/Java APIs separates
 
 ### Skip Showcase
 
-As a demonstration and validation of this technology, we have published one of our sample apps, [Skip Showcase](https://github.com/skiptools/skipapp-showcase-fuse), to both the Google Play Store and Apple App Store. This fully native Swift app demonstrates parity between SwiftUI components on iOS and Android.
+As a demonstration and validation of this technology, we have published one of our sample apps, [Skip Showcase](https://github.com/skiptools/skipapp-showcase), to both the Google Play Store and Apple App Store. This fully native Swift app demonstrates parity between SwiftUI components on iOS and Android.
 
 <div align="center">
   <a href="https://play.google.com/store/apps/details?id=org.appfair.app.Showcase" style="display: inline-block;"><img src="https://appfair.org/assets/badges/google-play-store.svg" alt="Download on the Google Play Store" style="height: 60px; vertical-align: middle; object-fit: contain;"></a>

src/content/docs/blog/official-swift-sdk-for-android.md

@@ -37,7 +37,7 @@ As mentioned, Skip is currently using our own preview release build of this SDK
 
 Note that this SDK is not just theoretical, but is in active use _today_ in many Skip-powered applications. Our own Skip Showcase[^showcase] app has been running using this SDK, and provides a comprehensive sample of what is possible when you combine native Swift with Skip's SwiftUI implementation for Android.
 
-[^showcase]: Skip Showcase [/docs/samples/skipapp-showcase-fuse/](/docs/samples/skipapp-showcase-fuse/)
+[^showcase]: Skip Showcase [/docs/samples/skipapp-showcase/](/docs/samples/skipapp-showcase/)
 
 ## The Future for Swift on Android
 

src/content/docs/blog/skip-block-blast.md

@@ -10,7 +10,7 @@ draft: false
 
 Easter Eggs in software are hidden delights, small features that are orthogonal to the core purpose of the product but which spark a little surprise and joy. Before they lost their collective senses of humor and whimsey, big tech companies routinely[^easteregg] included easter eggs in their products, such as a flight simulator in a spreadsheet or a pinball game in a word processor.
 
-Just in time for Easter, the [Skip Showcase](/docs/samples/skipapp-showcase-fuse/) app has released version 2.3.6 to both the [Apple App Store](https://apps.apple.com/us/app/skip-showcase/id6474885022) and [Google Play Store](https://play.google.com/store/apps/details?id=org.appfair.app.Showcase). This version contains a hidden gem: a completely native Swift and SwiftUI "Block Blast" style puzzle game.
+Just in time for Easter, the [Skip Showcase](/docs/samples/skipapp-showcase/) app has released version 2.3.6 to both the [Apple App Store](https://apps.apple.com/us/app/skip-showcase/id6474885022) and [Google Play Store](https://play.google.com/store/apps/details?id=org.appfair.app.Showcase). This version contains a hidden gem: a completely native Swift and SwiftUI "Block Blast" style puzzle game.
 
 <div align="center" style="margin: 0 auto; justify-content: center; box-sizing: border-box; display: flex; gap: 8px; align-items: center;">
   <img alt="Screenshot of Block Blast on iPhone" src="https://assets.skip.dev/posts/blockblast/skip_block_blast_iphone.png" style="height: 400px;" />
@@ -27,7 +27,7 @@ Easter eggs were historically activated via some secret gesture and sequence of
 
 Cross-platform gaming has historically been the provenance of specialized SDKs such a Godot[^godot], Unity[^unity], or Unreal[^unreal]. However, for casual games like board or puzzle games, these full-fledged engines can be overkill: you can just build it yourself with the view and gesture primitives that SwiftUI provides.
 
-Our implementation of the Block Blast game is done in under 1,000 lines of pure Swift: see [GamePlayground.swift](https://github.com/skiptools/skipapp-showcase-fuse/blob/main/Sources/ShowcaseFuse/GamePlayground.swift) for the whole thing. This code works out of the box on iOS, and on Android it builds with the newly-released Swift SDK for Android[^ss4a], using Skip Fuse to translate the SwiftUI into [SkipUI's](/docs/modules/skip-ui) Jetpack Compose on Android and handle all the details of packaging and running the app. Shapes, gestures, haptic feedback, high score persistence, and everything: all done in straightforward declarative SwiftUI, exactly the same on Android as it is on iOS.
+Our implementation of the Block Blast game is done in under 1,000 lines of pure Swift: see [GamePlayground.swift](https://github.com/skiptools/skipapp-showcase/blob/main/Sources/ShowcaseFuse/GamePlayground.swift) for the whole thing. This code works out of the box on iOS, and on Android it builds with the newly-released Swift SDK for Android[^ss4a], using Skip Fuse to translate the SwiftUI into [SkipUI's](/docs/modules/skip-ui) Jetpack Compose on Android and handle all the details of packaging and running the app. Shapes, gestures, haptic feedback, high score persistence, and everything: all done in straightforward declarative SwiftUI, exactly the same on Android as it is on iOS.
 
 Now, do we think that the next Grand Theft Auto ought be written in SwiftUI? Probably not. But for a large segment of casual games and game-like experiences, Xcode and SwiftUI may be all that you need. And augmenting your project with Skip will enable you to bring it to Android and [triple the market reach](/docs/) of your app!
 

src/content/docs/blog/swift-6.3-android-support.md

@@ -39,7 +39,7 @@ This is not a small thing. It removes the single largest concern we have heard f
 
 ### Skip Fuse on the official SDK
 
-We have already transitioned Skip's native Fuse mode to the final 6.3 SDK, and the [Skip Showcase](https://github.com/skiptools/skipapp-showcase-fuse) app built on this toolchain has been published to both the Google Play Store and the Apple App Store.
+We have already transitioned Skip's native Fuse mode to the final 6.3 SDK, and the [Skip Showcase](https://github.com/skiptools/skipapp-showcase) app built on this toolchain has been published to both the Google Play Store and the Apple App Store.
 
 <div align="center">
   <a href="https://assets.skip.dev/screens/swift-sdk-for-android-in-action-showcase.png" target="_blank"><img alt="Screenshot of Skip Showcase native app" src="https://assets.skip.dev/screens/swift-sdk-for-android-in-action-showcase.png" style="width: 100%; max-width: 1200px;" /></a>

src/content/docs/docs/contributing.md

@@ -12,7 +12,7 @@ Skip welcomes community contributions in all forms. There are many ways to contr
 
 ## Local Skip Libraries {#local-libraries}
 
-If you'd like to make local changes to Skip's libraries while working on an app - such as by improving [SkipUI](/docs/modules/skip-ui/) or [SkipFuseUI](/docs/modules/skip-fuse-ui/) and exercising your changes with its [ShowcaseFuse app](/docs/samples/skipapp-showcase-fuse/) - you will want to configure Xcode to use local library versions rather than the current Skip distributions. This is easily accomplished with an Xcode Workspace.
+If you'd like to make local changes to Skip's libraries while working on an app - such as by improving [SkipUI](/docs/modules/skip-ui/) or [SkipFuseUI](/docs/modules/skip-fuse-ui/) and exercising your changes with its [Showcase app](/docs/samples/skipapp-showcase/) - you will want to configure Xcode to use local library versions rather than the current Skip distributions. This is easily accomplished with an Xcode Workspace.
 
 1. Clone the [repositories](https://github.com/skiptools) you'd like to work on. We find it most convenient to make the clone directory a peer of your app directory.
 
@@ -62,20 +62,19 @@ Most contributions to the libraries, whether they are [Core Frameworks](/docs/mo
 
 Some improvements to `SkipUI`, such as fixing bugs with Compose implementations, can be done in just the [`skip-ui`](https://github.com/skiptools/skip-ui) repository. But if the improvement involves additional API that is being made available or any other changes to the `SwiftUI` surface, and PRs will need to be paired with a PR against the [`skip-fuse-ui`](https://github.com/skiptools/skip-fuse-ui) repository.
 
-In addition, when adding new features or otherwise changing behavior, it is always good to test it out in the Showcase apps, both the [`skipapp-showcase`](https://github.com/skiptools/skipapp-showcase) Skip Lite app and the equivalent [`skipapp-showcase-fuse`](https://github.com/skiptools/skipapp-showcase-fuse) app. This both serves as a way to test out your new feature, ensure that it doesn't break anything else, and provide a demonstration for other developers of how your improvement works.
+In addition, when adding new features or otherwise changing behavior, it is always good to test it out in the [`skipapp-showcase`](https://github.com/skiptools/skipapp-showcase) app, which can run in either Skip Lite or Skip Fuse mode. This both serves as a way to test out your new feature, ensure that it doesn't break anything else, and provide a demonstration for other developers of how your improvement works.
 
 So a sample workflow making a contribution would look like this:
 
 1. Fork SkipUI: [https://github.com/skiptools/skip-ui/fork](https://github.com/skiptools/skip-ui/fork)
 2. Fork SkipFuseUI: [https://github.com/skiptools/skip-fuse-ui/fork](https://github.com/skiptools/skip-fuse-ui/fork)
-3. Fork Showcase Lite: [https://github.com/skiptools/skipapp-showcase/fork](https://github.com/skiptools/skipapp-showcase/fork)
-4. Fork Showcase Fuse: [https://github.com/skiptools/skipapp-showcase-fuse/fork](https://github.com/skiptools/skipapp-showcase-fuse/fork)
-5. Clone each of the forked repositories to a local folder
-6. Create an Xcode workspace that incorporates both the `skip-ui` and `skip-fuse-ui` packages as well as the `skipapp-showcase/Darwin/Showcase.xcodeproj` and `skipapp-showcase-fuse/Darwin/ShowcaseFuse.xcodeproj` projects
-7. Run each of the `ShowcaseLite App` and `ShowcaseFuse App` targets to ensure they work
-8. Start implementing changes to `SkipUI`, testing them out by launching the `ShowcaseLite App` target
-9. When you are happy with the changes, begin implementing the equivalent functionality in the `SkipFuseUI` module, and test those out by launching the `ShowcaseFuse App` target
-10. When everything is working, push your changes to your local forks and submit 4 separate PRs to each of the upstream repositories.
+3. Fork Showcase: [https://github.com/skiptools/skipapp-showcase/fork](https://github.com/skiptools/skipapp-showcase/fork)
+4. Clone each of the forked repositories to a local folder
+5. Create an Xcode workspace that incorporates both the `skip-ui` and `skip-fuse-ui` packages as well as the `skipapp-showcase/Darwin/Showcase.xcodeproj` project
+6. Run both the `ShowcaseLite App` and `ShowcaseFuse App` targets to ensure they work
+7. Start implementing changes to `SkipUI`, testing them out by launching the `ShowcaseLite App` target
+8. When you are happy with the changes, begin implementing the equivalent functionality in the `SkipFuseUI` module, and test those out by launching the `ShowcaseFuse App` target
+9. When everything is working, push your changes to your local forks and submit PRs to each of the upstream repositories.
 
 :::note
 If the PRs involve changing the API surface (including removing `@unavailable` annotations), then the CI will likely fail on everything except the `SkipUI` changes due to the fact that the other packages are only built against the most recent release tags of `SkipUI` rather than the `main` branch. That's OK: when the PRs are reviewed, they will all be reviewed together and once merged and included in a new release, the CI will become green again.
@@ -87,8 +86,7 @@ An example of a series of pull requests that demonstrates the workflow of adding
 
 1. Add `View.contextMenu` modifier: https://github.com/skiptools/skip-ui/pull/356
 2. Support `View.contextMenu` modifier: https://github.com/skiptools/skip-fuse-ui/pull/93
-3. Add ContextMenuPlayground to demonstrate SkipUI `View.contextMenu`: https://github.com/skiptools/skipapp-showcase/pull/74
-4. Add ContextMenuPlayground to demonstrate SkipFuseUI `View.contextMenu`: https://github.com/skiptools/skipapp-showcase-fuse/pull/50
+3. Add ContextMenuPlayground to demonstrate `View.contextMenu`: https://github.com/skiptools/skipapp-showcase/pull/74
 
 
 ## Integration Frameworks

src/content/docs/docs/modules/skip-av/index.md

@@ -268,7 +268,7 @@ Support levels:
       </td>
     </tr>
     <tr>
-      <td>🟠</td>
+      <td>🟡</td>
       <td>
           <details>
               <summary><code>AVPlayer</code></summary>
@@ -279,6 +279,21 @@ Support levels:
                   <li><code>func play()</code></li>
                   <li><code>func pause()</code></li>
                   <li><code>func seek(to time: CMTime)</code></li>
+                  <li><code>func seek(to time: CMTime, completionHandler: @escaping (Bool) -&gt; Void)</code></li>
+                  <li><code>func seek(to time: CMTime, toleranceBefore: CMTime, toleranceAfter: CMTime)</code></li>
+                  <li><code>func seek(to time: CMTime, toleranceBefore: CMTime, toleranceAfter: CMTime, completionHandler: @escaping (Bool) -&gt; Void)</code></li>
+                  <li><code>func currentTime() -&gt; CMTime</code></li>
+                  <li><code>func replaceCurrentItem(with item: AVPlayerItem?)</code></li>
+                  <li><code>var currentItem: AVPlayerItem?</code></li>
+                  <li><code>var volume: Float</code></li>
+                  <li><code>var rate: Float</code></li>
+                  <li><code>var isMuted: Bool</code></li>
+                  <li><code>var status: AVPlayer.Status</code></li>
+                  <li><code>var error: Error?</code></li>
+                  <li><code>var actionAtItemEnd: AVPlayer.ActionAtItemEnd</code></li>
+                  <li><code>var automaticallyWaitsToMinimizeStalling: Bool</code></li>
+                  <li><code>var timeControlStatus: AVPlayer.TimeControlStatus</code></li>
+                  <li><code>var reasonForWaitingToPlay: AVPlayer.WaitingReason?</code></li>
               </ul>
           </details> 
       </td>
@@ -290,6 +305,45 @@ Support levels:
               <summary><code>AVPlayerItem</code></summary>
               <ul>
                   <li><code>init(url: URL)</code></li>
+                  <li><code>init(asset: AVAsset)</code></li>
+                  <li><code>var asset: AVAsset</code></li>
+                  <li><code>var duration: CMTime</code></li>
+              </ul>
+          </details> 
+      </td>
+    </tr>
+   <tr>
+      <td>🟠</td>
+      <td>
+          <details>
+              <summary><code>AVAsset</code></summary>
+              <ul>
+                  <li><code>init(url: URL)</code></li>
+                  <li><code>var url: URL?</code></li>
+                  <li><code>var duration: CMTime</code></li>
+              </ul>
+          </details> 
+      </td>
+    </tr>
+   <tr>
+      <td>🟢</td>
+      <td>
+          <details>
+              <summary><code>CMTime</code> / <code>CMTimeRange</code></summary>
+              <ul>
+                  <li><code>init(value: CMTimeValue, timescale: CMTimeScale)</code></li>
+                  <li><code>init(seconds: Double, preferredTimescale: CMTimeScale)</code></li>
+                  <li><code>init(value: CMTimeValue, timescale: CMTimeScale, flags: CMTimeFlags, epoch: CMTimeEpoch)</code></li>
+                  <li><code>var seconds: Double</code></li>
+                  <li><code>var isValid: Bool</code></li>
+                  <li><code>var isIndefinite: Bool</code></li>
+                  <li><code>var isPositiveInfinity: Bool</code></li>
+                  <li><code>var isNegativeInfinity: Bool</code></li>
+                  <li><code>var isNumeric: Bool</code></li>
+                  <li><code>static let zero, invalid, indefinite, positiveInfinity, negativeInfinity</code></li>
+                  <li><code>CMTimeGetSeconds, CMTimeMake, CMTimeMakeWithSeconds, CMTimeAdd, CMTimeSubtract, CMTimeCompare, CMTimeMinimum, CMTimeMaximum</code></li>
+                  <li><code>CMTimeRange { start, duration, end, containsTime }</code></li>
+                  <li><code>CMTimeRangeMake, CMTimeRangeGetEnd, CMTimeRangeContainsTime</code></li>
               </ul>
           </details> 
       </td>