Merge pull request #395 from THEOplayer/maintenance/e2e

Update dependencies

Author: tvanlaerhoven

.github/workflows/pr_android.yml

@@ -2,7 +2,7 @@ name: Build Android on PRs
 on:
   workflow_dispatch:
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [opened, reopened, synchronize, ready_for_review]
 
 # Cancel in-progress runs on the same PR to avoid wasting runner minutes.
 concurrency:
@@ -14,13 +14,13 @@ env:
 
 jobs:
   build:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 34 ]
-        newArchEnabled: [ true ]
-    name: Build for API Level ${{ matrix.api-level }} using ${{matrix.newArchEnabled == true && 'New' || 'Old' }} Architecture
+        api-level: [ 36 ]
+    name: Build for API Level ${{ matrix.api-level }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -101,7 +101,7 @@ jobs:
         run: |
           echo "YOSPACE_USERNAME=${{ secrets.YOSPACE_USERNAME }}" >> ./gradle.properties
           echo "YOSPACE_PASSWORD=${{ secrets.YOSPACE_PASSWORD }}" >> ./gradle.properties
-          echo "newArchEnabled=${{ matrix.newArchEnabled }}"       >> ./gradle.properties
+          echo "newArchEnabled=true" >> ./gradle.properties
           # Only build the x86_64 ABI needed by the CI emulator.
           echo "reactNativeArchitectures=x86_64"                   >> ./gradle.properties
 

.github/workflows/pr_ios.yml

@@ -2,7 +2,7 @@ name: Build iOS on PRs
 on:
   workflow_dispatch:
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [opened, reopened, synchronize, ready_for_review]
 
 # Cancel in-progress runs on the same PR to avoid wasting runner minutes.
 concurrency:
@@ -11,14 +11,14 @@ concurrency:
 
 jobs:
   build:
-    runs-on: macos-14
+    if: github.event.pull_request.draft == false
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix:
-        xcode_version: [ '16.1.0' ]
-        newArchEnabled: [ 1 ]
+        xcode_version: [ '26.2.0' ]
         platform: [iOS, tvOS]
-    name: Build for ${{ matrix.platform }} using XCode version ${{ matrix.xcode_version }} and ${{matrix.newArchEnabled  == 1 && 'New' || 'Old' }} Architecture
+    name: Build for ${{ matrix.platform }} using XCode version ${{ matrix.xcode_version }}
 
     steps:
       - name: Checkout repository
@@ -47,9 +47,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: apps/e2e/ios/Pods
-          key: pods-${{ runner.os }}-${{ matrix.platform }}-${{ matrix.newArchEnabled }}-${{ hashFiles('apps/e2e/ios/Podfile.lock') }}
+          key: pods-${{ runner.os }}-${{ hashFiles('apps/e2e/ios/Podfile.lock') }}
           restore-keys: |
-            pods-${{ runner.os }}-${{ matrix.platform }}-${{ matrix.newArchEnabled }}-
+            pods-${{ runner.os }}-
 
       - name: Run npm install
         run: |
@@ -79,9 +79,9 @@ jobs:
       - name: Start iOS simulator
         uses: futureware-tech/simulator-action@v4
         with:
-          model: ${{ matrix.platform == 'iOS' && 'iPhone 15' || 'Apple TV' }}
+          model: ${{ matrix.platform == 'iOS' && 'iPhone 17' || 'Apple TV' }}
           os: ${{ matrix.platform }}
-          os_version: '>=15.0'
+          os_version: '>=26.2'
 
       - name: Run e2e tests
         working-directory: apps/e2e

.prettierrc.js

@@ -1,6 +1,4 @@
 module.exports = {
-  bracketSpacing: true,
-  bracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
   printWidth: 150,

adscript/src/manifest.json

@@ -1 +1 @@
-{"version":"1.0.0","buildDate":"2025-09-16T15:10:22.731Z"}
+{"version":"1.4.0","buildDate":"2026-04-30T12:33:17.580Z"}

apps/e2e/.ruby-version

@@ -20,9 +20,9 @@ react {
 
   /* Variants */
   //   The list of variants to that are debuggable. For those we're going to
-  //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
+  //   skip the bundling of the JS bundle and the assets. Default is "debug", "debugOptimized".
   //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-  // debuggableVariants = ["liteDebug", "prodDebug"]
+  // debuggableVariants = ["liteDebug", "liteDebugOptimized", "prodDebug", "prodDebugOptimized"]
 
   /* Bundling */
   //   A list containing the node command and its flags. Default is just 'node'.
@@ -96,6 +96,9 @@ android {
       keyPassword 'android'
     }
   }
+  compileOptions {
+      coreLibraryDesugaringEnabled true
+  }
   buildTypes {
     debug {
       signingConfig signingConfigs.debug
@@ -130,6 +133,8 @@ dependencies {
   // The version of react-native is set by the React Native Gradle Plugin
   implementation("com.facebook.react:react-android")
 
+  coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+
   if (hermesEnabled.toBoolean()) {
     implementation("com.facebook.react:hermes-android")
   } else {

apps/e2e/android/app/build.gradle

@@ -16,6 +16,7 @@
     android:roundIcon="@mipmap/ic_launcher_round"
     android:allowBackup="false"
     android:theme="@style/AppTheme"
+    android:usesCleartextTraffic="${usesCleartextTraffic}"
     android:supportsRtl="true">
 
     <activity

apps/e2e/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.reactnativetheoplayer
 
+import android.app.PictureInPictureUiState
 import android.content.Intent
 import android.content.res.Configuration
 import android.media.AudioManager
@@ -55,4 +56,21 @@ open class MainActivity : ReactActivity() {
     intent.putExtra("isInPictureInPictureMode", isInPictureInPictureMode)
     this.sendBroadcast(intent)
   }
+
+  /**
+   * Called by the system when the activity is in PiP and has state changes. Compare to
+   * onPictureInPictureModeChanged, which is only called when PiP mode changes (meaning, enters
+   * or exits PiP), this can be called at any time while the activity is in PiP mode.
+   */
+  override fun onPictureInPictureUiStateChanged(pipState: PictureInPictureUiState) {
+    super.onPictureInPictureUiStateChanged(pipState)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM &&
+      pipState.isTransitioningToPip
+    ) {
+      Intent("onPictureInPictureModeChanged").also {
+        it.putExtra("isTransitioningToPip", true)
+        sendBroadcast(it)
+      }
+    }
+  }
 }

apps/e2e/android/app/src/main/AndroidManifest.xml

@@ -4,13 +4,8 @@ import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
-import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 import com.theoplayer.reactnative.adobe.edge.ReactTHEOplayerAdobeEdgePackage
 import com.theoplayer.reactnative.adobe.ReactTHEOplayerAdobePackage
 import com.theoplayer.reactnative.bitmovin.ReactTHEOplayerBitmovinPackage
@@ -20,37 +15,25 @@ import com.theoplayernielsen.ReactTHEOplayerNielsenPackage
 //import com.theoplayeryospace.ReactTHEOplayerYospacePackage
 
 class MainApplication : Application(), ReactApplication {
-  override val reactNativeHost: ReactNativeHost =
-    object : DefaultReactNativeHost(this) {
-      override fun getPackages(): List<ReactPackage> =
-        PackageList(this).packages.apply {
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          add(ReactTHEOplayerBitmovinPackage())
-          add(ReactTHEOplayerComscorePackage())
-          add(ReactTHEOplayerConvivaPackage())
-          add(ReactTHEOplayerNielsenPackage())
-          add(ReactTHEOplayerAdobePackage())
-          add(ReactTHEOplayerAdobeEdgePackage())
-//          add(ReactTHEOplayerYospacePackage())
-        }
-
-      override fun getJSMainModuleName(): String = "index"
-
-      override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
-
-      override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-      override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
-
-  override val reactHost: ReactHost
-    get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
+  override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+        packageList =
+          PackageList(this).packages.apply {
+            // Packages that cannot be autolinked yet can be added manually here, for example:
+            add(ReactTHEOplayerBitmovinPackage())
+            add(ReactTHEOplayerComscorePackage())
+            add(ReactTHEOplayerConvivaPackage())
+            add(ReactTHEOplayerNielsenPackage())
+            add(ReactTHEOplayerAdobePackage())
+            add(ReactTHEOplayerAdobeEdgePackage())
+            // add(ReactTHEOplayerYospacePackage())
+          },
+    )
+  }
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load(bridgelessEnabled = true)
-    }
+    loadReactNative(this)
   }
 }