codenameone
diff --git a/‎.github/workflows/scripts-ios.yml‎
Lines changed: 147 additions & 0 deletions b/‎.github/workflows/scripts-ios.yml‎
Lines changed: 147 additions & 0 deletions
diff --git a/‎CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java‎
Lines changed: 11 additions & 0 deletions b/‎CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎CodenameOne/src/com/codename1/ui/CN.java‎
Lines changed: 11 additions & 0 deletions b/‎CodenameOne/src/com/codename1/ui/CN.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎CodenameOne/src/com/codename1/ui/Display.java‎
Lines changed: 11 additions & 0 deletions b/‎CodenameOne/src/com/codename1/ui/Display.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎Ports/Android/src/com/codename1/impl/android/AndroidImplementation.java‎
Lines changed: 17 additions & 0 deletions b/‎Ports/Android/src/com/codename1/impl/android/AndroidImplementation.java‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎Ports/JavaSE/src/com/codename1/impl/javase/BuildHintSchemaDefaults.java‎
Lines changed: 100 additions & 0 deletions b/‎Ports/JavaSE/src/com/codename1/impl/javase/BuildHintSchemaDefaults.java‎
Lines changed: 100 additions & 0 deletions
diff --git a/‎Ports/iOSPort/nativeSources/AudioPlayer.h‎
Lines changed: 5 additions & 0 deletions b/‎Ports/iOSPort/nativeSources/AudioPlayer.h‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎Ports/iOSPort/nativeSources/AudioPlayer.m‎
Lines changed: 4 additions & 1 deletion b/‎Ports/iOSPort/nativeSources/AudioPlayer.m‎
Lines changed: 4 additions & 1 deletion
@@ -9,6 +9,7 @@ on:
       - 'scripts/build-ios-port.sh'
       - 'scripts/build-ios-app.sh'
       - 'scripts/run-ios-ui-tests.sh'
+      - 'scripts/run-watch-ui-tests.sh'
       - 'scripts/run-ios-native-tests.sh'
       - 'scripts/ios/notification-tests/native-tests/**'
       - 'scripts/ios/notification-tests/install-native-notification-tests.sh'
@@ -17,6 +18,7 @@ on:
       - 'scripts/ios/tests/**'
       - 'scripts/ios/screenshots/**'
       - 'scripts/ios/screenshots-metal/**'
+      - 'scripts/ios/screenshots-watch/**'
       - 'scripts/templates/**'
       - '!scripts/templates/**/*.md'
       - 'CodenameOne/src/**'
@@ -41,6 +43,7 @@ on:
       - 'scripts/build-ios-port.sh'
       - 'scripts/build-ios-app.sh'
       - 'scripts/run-ios-ui-tests.sh'
+      - 'scripts/run-watch-ui-tests.sh'
       - 'scripts/run-ios-native-tests.sh'
       - 'scripts/ios/notification-tests/native-tests/**'
       - 'scripts/ios/notification-tests/install-native-notification-tests.sh'
@@ -49,6 +52,7 @@ on:
       - 'scripts/ios/tests/**'
       - 'scripts/ios/screenshots/**'
       - 'scripts/ios/screenshots-metal/**'
+      - 'scripts/ios/screenshots-watch/**'
       - 'scripts/templates/**'
       - '!scripts/templates/**/*.md'
       - 'CodenameOne/src/**'
@@ -506,3 +510,146 @@ jobs:
           path: artifacts
           if-no-files-found: warn
           retention-days: 14
+
+  build-ios-watch:
+    # Native Apple Watch (watchOS) screenshot pipeline. The watch slice
+    # auto-enables from codename1.watchMain in the sample, so build-ios-app.sh
+    # generates the <Main>Watch target alongside the iOS app. This job renders
+    # the cn1ss suite on the watch simulator through the Core Graphics backend
+    # (no GL/Metal on watchOS), streams frames to the same Cn1ssScreenshotServer
+    # WS sink the iOS jobs use, and compares against scripts/ios/screenshots-watch.
+    # Isolated in its own job (like build-ios-metal) so the watch result is a
+    # distinct check and a regression there doesn't mask the iOS path.
+    needs: build-port
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
+    runs-on: macos-15
+    timeout-minutes: 60
+    concurrency:
+      group: mac-ci-${{ github.workflow }}-watch-${{ github.ref_name }}
+      cancel-in-progress: true
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.CN1SS_GH_TOKEN }}
+      GH_TOKEN: ${{ secrets.CN1SS_GH_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Cache CocoaPods and user gems
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.gem
+            ~/Library/Caches/CocoaPods
+            ~/.cocoapods/repos
+          key: ${{ runner.os }}-pods-v1-${{ hashFiles('scripts/setup-workspace.sh') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-v1-
+
+      - name: Ensure CocoaPods tooling
+        run: |
+          mkdir -p ~/.codenameone
+          cp maven/UpdateCodenameOne.jar ~/.codenameone/
+          set -euo pipefail
+          if ! command -v ruby >/dev/null; then
+            echo "ruby not found"; exit 1
+          fi
+          GEM_USER_DIR="$(ruby -e 'print Gem.user_dir')"
+          export PATH="$GEM_USER_DIR/bin:$PATH"
+          if ! command -v pod >/dev/null 2>&1; then
+            gem install cocoapods xcodeproj --no-document --user-install
+          fi
+          pod --version
+
+      - name: Compute setup-workspace hash
+        id: setup_hash
+        run: |
+          set -euo pipefail
+          echo "hash=$(shasum -a 256 scripts/setup-workspace.sh | awk '{print $1}')" >> "$GITHUB_OUTPUT"
+
+      - name: Set TMPDIR
+        run: echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV
+
+      - name: Cache codenameone-tools
+        uses: actions/cache@v5
+        with:
+          path: ${{ runner.temp }}/codenameone-tools
+          key: ${{ runner.os }}-cn1-tools-${{ steps.setup_hash.outputs.hash }}
+          restore-keys: |
+            ${{ runner.os }}-cn1-tools-
+
+      - name: Cache Maven repository
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-m2-
+
+      - name: Restore cn1-binaries cache
+        uses: actions/cache@v5
+        with:
+          path: ../cn1-binaries
+          key: cn1-binaries-${{ runner.os }}-${{ steps.setup_hash.outputs.hash }}
+          restore-keys: |
+            cn1-binaries-${{ runner.os }}-
+
+      - name: Restore built CN1 + iOS port artifacts
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.m2/repository/com/codenameone
+            Themes
+            Ports/iOSPort/nativeSources
+          key: ${{ needs.build-port.outputs.cn1_built_cache_key }}
+          fail-on-cache-miss: true
+
+      - name: Build sample iOS app (generates the watch target)
+        id: build-ios-app
+        run: ./scripts/build-ios-app.sh -q -DskipTests
+        timeout-minutes: 30
+
+      - name: Ensure watchOS simulator runtime
+        run: |
+          set -euo pipefail
+          if ! xcrun simctl list runtimes available 2>/dev/null | grep -qi watchOS; then
+            echo "No watchOS runtime found; attempting download"
+            xcodebuild -downloadPlatform watchOS || true
+          fi
+          xcrun simctl list runtimes available 2>/dev/null | grep -i watchOS || true
+          xcrun simctl list devices available 2>/dev/null | grep -i "Apple Watch" || true
+
+      - name: Run watchOS UI screenshot tests
+        env:
+          ARTIFACTS_DIR: ${{ github.workspace }}/artifacts/watch-ui-tests
+          SCREENSHOT_REF_DIR: ${{ github.workspace }}/scripts/ios/screenshots-watch
+          CN1SS_COMMENT_MARKER: '<!-- CN1SS_IOS_WATCH_COMMENT -->'
+          CN1SS_PREVIEW_SUBDIR: ios-watch
+          CN1SS_REPORT_TITLE: 'Apple Watch (watchOS) screenshot updates'
+          CN1SS_SUCCESS_MESSAGE: '✅ Native Apple Watch (watchOS, Core Graphics) screenshot tests passed.'
+          CN1SS_COMMENT_LOG_PREFIX: '[run-watch-ui-tests]'
+          CN1SS_FAIL_ON_MISMATCH: '1'
+          # The watch form factor splits the iOS 2x2 graphics grid into separate
+          # full-screen captures; tolerate a small tail drop, matching the GL job.
+          CN1SS_ALLOWED_MISSING: '4'
+        run: |
+          set -euo pipefail
+          mkdir -p "${ARTIFACTS_DIR}"
+          echo "workspace='${{ steps.build-ios-app.outputs.workspace }}'"
+          echo "scheme='${{ steps.build-ios-app.outputs.scheme }}'"
+          ./scripts/run-watch-ui-tests.sh \
+            "${{ steps.build-ios-app.outputs.workspace }}" \
+            "${{ steps.build-ios-app.outputs.scheme }}"
+        timeout-minutes: 45
+
+      - name: Upload watch artifacts
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: watch-ui-tests
+          path: artifacts
+          if-no-files-found: warn
+          retention-days: 14
@@ -5601,6 +5601,17 @@ public boolean isDesktop() {
         return false;
     }
 
+    /// Indicates whether the application is running on a smartwatch form factor
+    /// (Apple Watch / Wear OS). Notice that this is often a guess derived from
+    /// the device/skin metadata.
+    ///
+    /// #### Returns
+    ///
+    /// true if the device is assumed to be a smartwatch
+    public boolean isWatch() {
+        return false;
+    }
+
     /// Returns true if the device has dialing capabilities
     ///
     /// #### Returns
 
@@ -891,6 +891,17 @@ public static boolean isDesktop() {
         return Display.impl.isDesktop();
     }
 
+    /// Indicates whether the application is running on a smartwatch form factor
+    /// (Apple Watch / Wear OS). Notice that this is often a guess derived from
+    /// the device metadata.
+    ///
+    /// #### Returns
+    ///
+    /// true if the device is assumed to be a smartwatch
+    public static boolean isWatch() {
+        return Display.impl.isWatch();
+    }
+
     /// Returns the size of the desktop hosting the application window when running on a desktop platform.
     ///
     /// #### Returns
 
@@ -4343,6 +4343,17 @@ public boolean isDesktop() {
         return impl.isDesktop();
     }
 
+    /// Indicates whether the application is running on a smartwatch form factor
+    /// (Apple Watch / Wear OS). Notice that this is often a guess derived from
+    /// the device metadata.
+    ///
+    /// #### Returns
+    ///
+    /// true if the device is assumed to be a smartwatch
+    public boolean isWatch() {
+        return impl.isWatch();
+    }
+
     /// Returns true if the device has dialing capabilities
     ///
     /// #### Returns
 
@@ -5670,6 +5670,20 @@ public boolean isTablet() {
                 >= Configuration.SCREENLAYOUT_SIZE_LARGE;
     }
 
+    private Boolean watchCache;
+
+    @Override
+    public boolean isWatch() {
+        if(watchCache == null) {
+            // PackageManager.FEATURE_WATCH ("android.hardware.type.watch") is
+            // the canonical Wear OS marker; use the string literal so this
+            // compiles regardless of the configured minimum SDK level.
+            watchCache = getContext().getPackageManager()
+                    .hasSystemFeature("android.hardware.type.watch");
+        }
+        return watchCache;
+    }
+
     /**
      * Executes r on the UI thread and blocks the EDT to completion
      * @param r runnable to execute
@@ -8228,6 +8242,9 @@ public String getPlatformName() {
      * @inheritDoc
      */
     public String[] getPlatformOverrides() {
+        if (isWatch()) {
+            return new String[]{"watch", "android", "android-watch"};
+        }
         if (isTablet()) {
             return new String[]{"tablet", "android", "android-tab"};
         } else {
 
@@ -94,6 +94,106 @@ static void register() {
                 + "hololight = Android Holo Light (API 14+). legacy = pre-Holo "
                 + "Android theme. (Deprecated alias: cn1.androidTheme; "
                 + "and.hololight=true is also accepted for back-compat.)");
+
+        // watchOS native build (Apple Watch). Adds a watchOS app target to the
+        // iOS Xcode project, rendering the CN1 UI via the Core Graphics backend.
+        set("{{@watchNative}}.label", "Apple Watch (watchOS)");
+        set("{{@watchNative}}.description",
+                "Builds an Apple Watch app from the same project, rendering the "
+                + "Codename One UI on watchOS via the Core Graphics backend. The "
+                + "watch app is a separate arm64_32 target; in the default "
+                + "companion mode it is embedded in the iOS .ipa and installs "
+                + "with the phone app.");
+
+        set("{{#watchNative#watchNative.enabled}}.label", "Enable watchOS target");
+        set("{{#watchNative#watchNative.enabled}}.type", "Select");
+        set("{{#watchNative#watchNative.enabled}}.values", "false,true");
+        set("{{#watchNative#watchNative.enabled}}.description",
+                "When true, adds an Apple Watch app target to the generated "
+                + "Xcode project. Also auto-enabled whenever codename1.watchMain "
+                + "is declared next to codename1.mainName in "
+                + "codenameone_settings.properties, so the double app is produced "
+                + "as part of the regular iPhone build. Requires the Ruby "
+                + "xcodeproj gem (bundled with CocoaPods).");
+
+        set("{{#watchNative#watchNative.mainClass}}.label", "Watch lifecycle class");
+        set("{{#watchNative#watchNative.mainClass}}.type", "String");
+        set("{{#watchNative#watchNative.mainClass}}.description",
+                "Fully-qualified watch entry/lifecycle class. Normally set via "
+                + "codename1.watchMain; this hint is an override. May equal the "
+                + "phone main class - a distinct class lets the watch slice "
+                + "tree-shake from its own root. Defaults to the phone main class "
+                + "when watchNative.enabled=true without a watch entry.");
+
+        set("{{#watchNative#watchNative.distribution}}.label", "Distribution");
+        set("{{#watchNative#watchNative.distribution}}.type", "Select");
+        set("{{#watchNative#watchNative.distribution}}.values", "companion,standalone");
+        set("{{#watchNative#watchNative.distribution}}.description",
+                "companion = the watch app is embedded in the iOS app and "
+                + "installs with it (WKCompanionAppBundleIdentifier pinned to "
+                + "the iOS bundle). standalone = an independent watch-only app.");
+
+        set("{{#watchNative#watchNative.bundleId}}.label", "Watch bundle identifier");
+        set("{{#watchNative#watchNative.bundleId}}.type", "String");
+        set("{{#watchNative#watchNative.bundleId}}.description",
+                "Bundle id of the watch app. Defaults to <package>.watchkitapp.");
+
+        set("{{#watchNative#watchNative.minDeploymentTarget}}.label", "Minimum watchOS version");
+        set("{{#watchNative#watchNative.minDeploymentTarget}}.type", "String");
+        set("{{#watchNative#watchNative.minDeploymentTarget}}.description",
+                "WATCHOS_DEPLOYMENT_TARGET for the watch target. Defaults to 10.0 "
+                + "(single-target WKApplication apps + WidgetKit complications).");
+
+        set("{{#watchNative#watchNative.teamId}}.label", "Apple team id");
+        set("{{#watchNative#watchNative.teamId}}.type", "String");
+        set("{{#watchNative#watchNative.teamId}}.description",
+                "Development team for signing the watch target. Defaults to the "
+                + "iOS team id (ios.teamId / ios.release.teamId).");
+
+        set("{{#watchNative#watchNative.displayName}}.label", "Watch app name");
+        set("{{#watchNative#watchNative.displayName}}.type", "String");
+        set("{{#watchNative#watchNative.displayName}}.description",
+                "Name shown under the watch app icon. Defaults to the app display "
+                + "name (codename1.displayName), then the main class name.");
+
+        set("{{#watchNative#watchNative.embedCompanion}}.label", "Embed in iOS app");
+        set("{{#watchNative#watchNative.embedCompanion}}.type", "Select");
+        set("{{#watchNative#watchNative.embedCompanion}}.values", "false,true");
+        set("{{#watchNative#watchNative.embedCompanion}}.description",
+                "When true (companion distribution), adds the watch app as a build "
+                + "dependency of the iOS app so the pair archives together. Off by "
+                + "default so the iOS build is unaffected; enable it for a packaged "
+                + "companion submission.");
+
+        // Wear OS native build (Android). A Wear OS app is a regular Android app
+        // that declares the watch hardware feature; the CN1 UI renders through
+        // the normal Android pipeline (no separate backend, unlike watchOS).
+        set("{{@androidWear}}.label", "Wear OS (Android)");
+        set("{{@androidWear}}.description",
+                "Builds the Android app as a Wear OS app: declares the watch "
+                + "hardware feature, marks the app standalone (runs without a "
+                + "paired phone app) and raises the minimum SDK to the Wear OS 2.0 "
+                + "baseline (API 23). CN.isWatch() returns true at runtime via "
+                + "PackageManager.FEATURE_WATCH. Independent of the Apple Watch "
+                + "build; enable both to target both wearables.");
+
+        set("{{#androidWear#android.wear}}.label", "Enable Wear OS build");
+        set("{{#androidWear#android.wear}}.type", "Select");
+        set("{{#androidWear#android.wear}}.values", "false,true");
+        set("{{#androidWear#android.wear}}.description",
+                "When true, marks the Android build as a Wear OS app (manifest "
+                + "uses-feature android.hardware.type.watch, standalone meta-data, "
+                + "minimum SDK floor API 23). With the hint off the manifest is "
+                + "unchanged.");
+
+        set("{{#androidWear#android.wear.standalone}}.label", "Standalone Wear app");
+        set("{{#androidWear#android.wear.standalone}}.type", "Select");
+        set("{{#androidWear#android.wear.standalone}}.values", "true,false");
+        set("{{#androidWear#android.wear.standalone}}.description",
+                "Declares the Wear app standalone (com.google.android.wearable."
+                + "standalone), so it installs and runs directly on the watch "
+                + "without a companion phone app. Defaults to true. Only applies "
+                + "when android.wear=true.");
     }
 
     /** Idempotent setter: does not overwrite user / project-level hint metadata. */
 
@@ -23,7 +23,12 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <AVFoundation/AVFoundation.h>
+#include "TargetConditionals.h"
+#if !TARGET_OS_WATCH
+// AudioToolbox is unavailable on watchOS; AudioPlayer uses AVAudioPlayer
+// (AVFoundation, present on watch) and doesn't need AudioToolbox types here.
 #import <AudioToolbox/AudioToolbox.h>
+#endif
 
 @interface AudioPlayer : NSObject<AVAudioPlayerDelegate> {
     AVAudioPlayer* playerInstance;
 
@@ -167,8 +167,11 @@ - (void)playAudio {
     if (!success) {
         CN1Log(@"ERROR");
     }
+#if !TARGET_OS_WATCH
+    // UIApplication is unavailable on watchOS.
     [[UIApplication sharedApplication] beginReceivingRemoteControlEvents];
-    
+#endif
+
     currentlyPlaying = self;
     if(playerInstance != nil) {
 /*#ifndef CN1_USE_ARC