feat: address review comments

Author: YogendraShelke

.github/CI_DOCUMENTATION.md

@@ -28,7 +28,7 @@ All workflows use standardized tooling versions to ensure consistency:
 
 | Tool                    | Version                  | Defined In                     |
 | ----------------------- | ------------------------ | ------------------------------ |
-| **Java**                | `17` (Zulu distribution) | All Android workflows          |
+| **Java**                | `21` (Zulu distribution) | All Android workflows          |
 | **Gradle**              | `8.12`                   | `gradle-wrapper.properties`    |
 | **Android Build Tools** | `35.0.0`                 | `example/android/build.gradle` |
 | **NDK**                 | `27.3.13750724`          | `example/android/build.gradle` |
@@ -56,7 +56,7 @@ All workflows use standardized tooling versions to ensure consistency:
 | Tool                     | Version               | Defined In              |
 | ------------------------ | --------------------- | ----------------------- |
 | **React Native Harness** | `1.0.0-alpha.21`      | `package.json`          |
-| **Android Emulator**     | Pixel_API_34 (API 34) | `rn-harness.config.mjs` |
+| **Android Emulator**     | Pixel_API_35 (API 35) | `rn-harness.config.mjs` |
 | **iOS Simulator**        | iPhone 17 (iOS 26.2) | `rn-harness.config.mjs` |
 
 ### GitHub Actions
@@ -129,7 +129,7 @@ All actions are pinned to specific commit SHAs for security and reproducibility:
 - Sets up Android emulator
 - Runs harness tests
 - Runs on: `ubuntu-latest`
-- Uses: Java 17, Android SDK, NDK 27.3.13750724
+- Uses: Java 21, Android SDK, NDK 27.3.13750724
 
 #### 3. iOS Build & Test (`.github/workflows/ios.yml`)
 
@@ -149,7 +149,7 @@ The harness tests are configured in `example/rn-harness.config.mjs`:
 runners: [
   androidPlatform({
     name: 'android',
-    device: androidEmulator('Pixel_API_34'),
+    device: androidEmulator('Pixel_API_35'),
     bundleId: 'mendixnative.example',
   }),
   applePlatform({
@@ -186,7 +186,7 @@ yarn harness:ios:with:build
 
 ### Android
 
-Make sure emulator with name `Pixel_API_34` is up and running
+Make sure emulator with name `Pixel_API_35` is up and running
 
 ```bash
 corepack enable
@@ -205,7 +205,7 @@ yarn harness:android:with:build
 - Check AVD cache - clear `avd-*` entries if corrupted
 - Verify KVM is enabled (workflows handle this automatically)
 - Check emulator logs in workflow output
-- Ensure AVD_NAME matches harness config (`Pixel_API_34`)
+- Ensure AVD_NAME matches harness config (`Pixel_API_35`)
 
 **iOS simulator not found or fails to boot:**
 

.github/actions/setup-node-yarn/action.yml

@@ -5,7 +5,7 @@ runs:
   using: 'composite'
   steps:
     - name: Setup Node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.2.2
       with:
         node-version-file: '.nvmrc'
 
@@ -19,7 +19,7 @@ runs:
       run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
     - name: Cache Yarn dependencies
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.0
       with:
         path: |
           ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -35,7 +35,7 @@ runs:
 
     - name: Cache built library
       id: cache-lib
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.0
       with:
         path: lib
         key: ${{ runner.os }}-lib-${{ hashFiles('src/**/*.{ts,tsx,js,jsx}', 'package.json', 'tsconfig.json') }}

.github/workflows/android.yml

@@ -4,10 +4,13 @@ on:
   workflow_call:
 
 env:
-  DEVICE_API_LEVEL: '34'
+  DEVICE_API_LEVEL: '35'
   DEVICE_ARCH: 'x86_64'
   DEVICE_TARGET: 'google_apis'
-  AVD_NAME: 'Pixel_API_34'
+  AVD_NAME: 'Pixel_API_35'
+  ANDROID_SDK_ROOT: /usr/local/lib/android/sdk
+  ANDROID_HOME: /usr/local/lib/android/sdk
+  NDK_VERSION: '27.3.13750724'
 
 jobs:
   android:
@@ -17,19 +20,31 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.2.2
 
       - name: Setup Project
         uses: ./.github/actions/setup-node-yarn
 
       - name: Setup Java
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v4.7.1
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
+
+      # Restore NDK from cache before sdkmanager runs.
+      - name: Cache NDK
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.0
+        with:
+          path: ${{ env.ANDROID_SDK_ROOT }}/ndk/${{ env.NDK_VERSION }}
+          key: ${{ runner.os }}-ndk-${{ env.NDK_VERSION }}
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.1
+        with:
+          packages: |
+            tools
+            platform-tools
+            ndk;${{ env.NDK_VERSION }}
 
       - name: Enable KVM
         run: |
@@ -38,18 +53,8 @@ jobs:
           sudo udevadm trigger --name-match=kvm
           ls /dev/kvm
 
-      # Build dependencies (only if APK not cached)
-      - name: Cache NDK
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
-        with:
-          path: /usr/local/lib/android/sdk/ndk/27.3.13750724
-          key: ${{ runner.os }}-ndk-27.3.13750724
-
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.3.13750724"
-
       - name: Cache Gradle
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.0
         with:
           path: |
             ~/.gradle/caches
@@ -67,7 +72,7 @@ jobs:
         run: yarn app:package:android
 
       - name: AVD cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.0
         with:
           path: |
             ~/.android/avd/*
@@ -76,7 +81,7 @@ jobs:
 
       # Create AVD (only if not cached, runs after build)
       - name: Create AVD and generate snapshot for caching
-        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.33.0
         with:
           api-level: ${{ env.DEVICE_API_LEVEL }}
           target: ${{ env.DEVICE_TARGET }}
@@ -91,7 +96,7 @@ jobs:
 
       # Launch AVD, install app, and run tests
       - name: Run Harness E2E tests
-        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.33.0
         with:
           working-directory: example
           api-level: ${{ env.DEVICE_API_LEVEL }}

.github/workflows/ios.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.2.2
 
       - name: Setup Project
         uses: ./.github/actions/setup-node-yarn
@@ -27,15 +27,15 @@ jobs:
         run: sudo xcode-select -s /Applications/Xcode_26.2.app
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c
+        uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.204.0
         with:
           ruby-version: '3.2'
           bundler-cache: true
           working-directory: example
 
       # Build dependencies (only if app not cached)
       - name: Cache CocoaPods
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.0
         with:
           path: |
             example/ios/Pods

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.2.2
 
       - name: Setup Project
         uses: ./.github/actions/setup-node-yarn

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.2.2
         with:
           fetch-depth: 0
 
@@ -66,15 +66,15 @@ jobs:
           echo "tgz=mendix-native-${{ steps.bump.outputs.version }}.tgz" >> $GITHUB_OUTPUT
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         with:
           tag_name: ${{ steps.bump.outputs.version }}
           name: ${{ steps.bump.outputs.version }}
           body: ${{ steps.changelog.outputs.notes }}
           files: ${{ steps.pack.outputs.tgz }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
         with:
           commit-message: "chore: release ${{ steps.bump.outputs.version }}"
           branch: release/${{ steps.bump.outputs.version }}

android/build.gradle

@@ -52,8 +52,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_21
+    targetCompatibility JavaVersion.VERSION_21
+  }
+
+  kotlinOptions {
+    jvmTarget = "21"
   }
 
   sourceSets {

example/android/app/build.gradle

@@ -105,6 +105,15 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+
+    kotlinOptions {
+        jvmTarget = "21"
+    }
 }
 
 dependencies {

example/rn-harness.config.mjs

@@ -20,7 +20,7 @@ const config = {
   runners: [
     androidPlatform({
       name: 'android',
-      device: androidEmulator('Pixel_API_34'),
+      device: androidEmulator('Pixel_API_35'),
       bundleId: 'mendixnative.example',
     }),
     applePlatform({