Preparing release 1.2.1

Author: queue-it

README.md

@@ -6,7 +6,10 @@ React Native Module for integrating Queue-it's virtual waiting room into React N
 
 ## Sample app
 
-A sample app project to try out functionality in the library can be found in the [exampleApp](https://github.com/queueit/react-native-queue-it/tree/master/exampleApp) directory.
+Two sample apps are available to try out the library:
+
+- [`exampleApp`](https://github.com/queueit/react-native-queue-it/tree/master/exampleApp) — bare React Native
+- [`example-expo-app`](https://github.com/queueit/react-native-queue-it/tree/master/example-expo-app) — Expo (managed)
 
 ## Installation
 
@@ -20,12 +23,54 @@ npm install --save react-native-queue-it
 cd ios && pod install
 ```
 
-When Android is used, the following activity also needs to be included in the application's manifest file.
+On Android, the library automatically registers the required `QueueActivity` — no manual `AndroidManifest.xml` changes are needed.
+
+### Expo
+
+The library works in a managed Expo project with no extra setup. The only exception is `android:allowBackup`: the Queue-it android SDK uses `allowBackup="true"`, so if your app sets `android.allowBackup` to `false` in `app.json` the Android manifest merge fails. To keep `false`, add a config plugin so your app's value wins the merge.
+
+Create `plugins/withQueueItAllowBackup.js`:
 
-```xml
-<activity android:name="com.queue_it.androidsdk.QueueActivity"/>
+```js
+const {
+  withAndroidManifest,
+  createRunOncePlugin,
+} = require('expo/config-plugins');
+
+// Makes the app's android:allowBackup value win the manifest merge.
+const withQueueItAllowBackup = (config) =>
+  withAndroidManifest(config, (config) => {
+    const app = config.modResults?.manifest?.application?.[0];
+    if (!app) return config;
+    app.$ = app.$ || {};
+    const existing = app.$['tools:replace'];
+    app.$['tools:replace'] = existing
+      ? `${existing},android:allowBackup`
+      : 'android:allowBackup';
+    return config;
+  });
+
+const pkg = require('react-native-queue-it/package.json');
+
+module.exports = createRunOncePlugin(
+  withQueueItAllowBackup,
+  pkg.name,
+  pkg.version
+);
 ```
 
+Register it and regenerate the native project:
+
+```json
+{ "expo": { "plugins": ["./plugins/withQueueItAllowBackup"] } }
+```
+
+```sh
+npx expo prebuild --clean
+```
+
+> Bare React Native apps can instead add `tools:replace="android:allowBackup"` to the `<application>` element in `android/app/src/main/AndroidManifest.xml`.
+
 ## Usage
 
 To protect parts of your application you'll need to make a `QueueIt.run` call and await it's result.
@@ -73,7 +118,6 @@ enqueue = async () => {
         this.state.clientId,
         this.state.eventOrAlias,
         this.getEnqueueKey()
-        
       );
     } else if (this.state.enqueueToken) {
       enqueueResult = await QueueIt.runWithEnqueueToken(
@@ -89,7 +133,9 @@ enqueue = async () => {
     }
     switch (enqueueResult.State) {
       case EnqueueResultState.Disabled:
-        console.log(`queue is disabled and QueueITToken is: ${enqueueResult.QueueITToken}`);
+        console.log(
+          `queue is disabled and QueueITToken is: ${enqueueResult.QueueITToken}`
+        );
         break;
       case EnqueueResultState.Passed:
         console.log(

android/build.gradle

@@ -102,11 +102,17 @@ android {
 def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation(libs.react.android)
-  implementation(libs.fbjni)
+  // The 'com.facebook.react' Gradle plugin (applied above) substitutes react-native ->
+  // react-android and supplies the version from the host app's installed React Native,
+  // so no version is pinned here. fbjni is provided transitively by react-android (its
+  // prefab is configured by React Native's CMake helper), so it needs no explicit entry.
+  implementation 'com.facebook.react:react-native:+'
 
   //App dependencies
-  implementation('com.queue-it.androidsdk:library:2.0.36')
-  implementation('com.android.support:appcompat-v7:28.0.0')
-  implementation('com.android.support:design:28.0.0')
+  // Queue-it Android SDK 2.3.0+ is AndroidX-native, so it needs no com.android.support
+  // exclude and works with Jetifier disabled.
+  implementation('com.queue-it.androidsdk:library:2.3.0')
+  implementation('androidx.appcompat:appcompat:1.7.1')
+  implementation('com.google.android.material:material:1.14.0')
+  implementation('androidx.localbroadcastmanager:localbroadcastmanager:1.1.0')
 }

android/gradle.properties

@@ -2,5 +2,5 @@ QueueIt_kotlinVersion=1.9.24
 QueueIt_compileSdkVersion=34
 QueueIt_targetSdkVersion=34
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=false
 newArchEnabled=true

android/src/main/AndroidManifest.xml

@@ -1,3 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+  <!--
+    Declare QueueActivity. This merges into the host app via
+    autolinking for both bare React Native and managed Expo projects.
+  -->
+  <application>
+    <activity android:name="com.queue_it.androidsdk.QueueActivity" />
+  </application>
+
 </manifest>

android/src/main/java/com/reactnativequeueit/QueueItModule.kt

@@ -23,50 +23,58 @@ class QueueItModule(reactContext: ReactApplicationContext) {
   }
 
   fun enableTesting(value: Boolean) {
-    QueueService.IsTest = value
+    // No-op: the Queue-it Android SDK no longer has a global test flag. Test environments
+    // are now targeted by passing a test `waitingRoomDomain` to QueueITEngine. Kept for
+    // cross-platform API compatibility.
   }
 
-  fun runAsync(customerId: String, eventAlias: String, layoutName: String?, language: String?, queueListener: QueueListener?, promise: Promise) {
+  fun runAsync(customerId: String, eventAlias: String, layoutName: String?, language: String?, queueListener: QueueListener, promise: Promise) {
     handler.post {
-      if (context.currentActivity == null) {
+      val activity = context.currentActivity
+      if (activity == null) {
         promise.reject("error", "Calling QueueItRun with a null activity/context")
         return@post
       }
       try {
-        val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, queueListener)
-        queueEngine.run(context.currentActivity)
+        // QueueITEngine args: (context, customerId, eventOrAliasId, layoutName, language,
+        // waitingRoomDomain, queuePathPrefix, queueListener, options). The domain/prefix are
+        // optional (null = default/production); options uses the SDK defaults.
+        val queueEngine = QueueITEngine(activity, customerId, eventAlias, layoutName, language, null, null, queueListener, QueueItEngineOptions.getDefault())
+        queueEngine.run(activity)
       } catch (e: Exception) {
         promise.reject("error", e.message)
         return@post
       }
     }
   }
 
-  fun runWithEnqueueTokenAsync(customerId: String, eventAlias: String, enqueueToken: String, layoutName: String?, language: String?, queueListener: QueueListener?, promise: Promise) {
+  fun runWithEnqueueTokenAsync(customerId: String, eventAlias: String, enqueueToken: String, layoutName: String?, language: String?, queueListener: QueueListener, promise: Promise) {
     handler.post {
-      if (context.currentActivity == null) {
+      val activity = context.currentActivity
+      if (activity == null) {
         promise.reject("error", "Calling QueueItRun with a null activity/context")
         return@post
       }
       try {
-        val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, queueListener)
-        queueEngine.runWithEnqueueToken(context.currentActivity, enqueueToken)
+        val queueEngine = QueueITEngine(activity, customerId, eventAlias, layoutName, language, null, null, queueListener, QueueItEngineOptions.getDefault())
+        queueEngine.runWithEnqueueToken(activity, enqueueToken)
       } catch (e: Exception) {
         promise.reject("error", e.message)
         return@post
       }
     }
   }
 
-  fun runWithEnqueueKeyAsync(customerId: String, eventAlias: String, enqueueKey: String, layoutName: String?, language: String?, queueListener: QueueListener?, promise: Promise) {
+  fun runWithEnqueueKeyAsync(customerId: String, eventAlias: String, enqueueKey: String, layoutName: String?, language: String?, queueListener: QueueListener, promise: Promise) {
     handler.post {
-      if (context.currentActivity == null) {
+      val activity = context.currentActivity
+      if (activity == null) {
         promise.reject("error", "Calling QueueItRun with a null activity/context")
         return@post
       }
       try {
-        val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, queueListener)
-        queueEngine.runWithEnqueueKey(context.currentActivity, enqueueKey)
+        val queueEngine = QueueITEngine(activity, customerId, eventAlias, layoutName, language, null, null, queueListener, QueueItEngineOptions.getDefault())
+        queueEngine.runWithEnqueueKey(activity, enqueueKey)
       } catch (e: Exception) {
         promise.reject("error", e.message)
         return@post

android/src/main/jni/CMakeLists.txt

@@ -24,9 +24,14 @@ file(TO_CMAKE_PATH "${CODEGEN_DIR}" CODEGEN_DIR)
 
 include("${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake")
 
-set(SOURCE_FILES
-  "${CODEGEN_DIR}/ReactNativeQueueIt-generated.cpp"
-  "${CODEGEN_DIR}/react/renderer/components/ReactNativeQueueIt/ReactNativeQueueItJSI-generated.cpp"
+# React Native's codegen emits a different set of .cpp files per RN version, so glob the
+# generated sources instead of hardcoding filenames to stay resilient across versions.
+# CONFIGURE_DEPENDS re-runs the glob when the generated files change.
+file(
+  GLOB SOURCE_FILES
+  CONFIGURE_DEPENDS
+  "${CODEGEN_DIR}/*.cpp"
+  "${CODEGEN_DIR}/react/renderer/components/ReactNativeQueueIt/*.cpp"
 )
 
 include_directories(

documentation/ReactNative16kbComplianceInstructions.md

@@ -1,126 +1,24 @@
-# React Native (v0.80.1) 16kb Page Size Update - Configuration
+# React Native 16kb Page Size Update - Configuration
 This document describes the required changes in the react-native application to accommodate the new update of react-native-queue-it connector.
 
+> **Note:** react-native-queue-it now resolves React Native itself through the `com.facebook.react` Gradle plugin, so the app **no longer needs to create a `gradle/libs.versions.toml` version catalog** or register it in `settings.gradle`. It automatically uses the React Native version already installed in your app, so these steps work across React Native versions (verified on 0.83 and 0.86). The instructions below have been simplified accordingly.
+
 ## iOS
 iOS applications should not be impacted by this update.
 
 ## Android
 Android apps will need to include the following changes to support the new update.
 
-### gradle/libs.versions.toml
-This file contains all the necessary information for the needed dependencies and versions. If this file does not exist, it needs to be created.
-```toml
-[versions]
-# Android versions
-minSdk = "24"
-targetSdk = "35"
-compileSdk = "35"
-buildTools = "35.0.0"
-ndkVersion = "27.1.12297006"
-# Dependencies versions
-agp = "8.7.2"
-androidx-annotation = "1.6.0"
-androidx-appcompat = "1.6.1"
-androidx-autofill = "1.1.0"
-androidx-swiperefreshlayout = "1.1.0"
-androidx-test = "1.5.0"
-androidx-tracing = "1.1.0"
-assertj = "3.21.0"
-binary-compatibility-validator = "0.13.2"
-download = "5.4.0"
-fbjni = "0.7.0"
-fresco = "3.4.0"
-infer-annotation = "0.18.0"
-javax-annotation-api = "1.3.2"
-javax-inject = "1"
-jsr305 = "3.0.2"
-junit = "4.13.2"
-kotlin = "2.0.21"
-mockito = "3.12.4"
-nexus-publish = "1.3.0"
-okhttp = "4.9.2"
-okio = "2.9.0"
-robolectric = "4.9.2"
-soloader = "0.12.1"
-xstream = "1.4.20"
-yoga-proguard-annotations = "1.19.0"
-# Native Dependencies
-boost="1_83_0"
-doubleconversion="1.1.6"
-fastFloat="6.1.4"
-fmt="11.0.2"
-folly="2024.11.18.00"
-glog="0.3.5"
-gtest="1.12.1"
-react-android="0.80.1"
-
-[libraries]
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
-androidx-appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" }
-androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
-androidx-autofill = { module = "androidx.autofill:autofill", version.ref = "androidx-autofill" }
-androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "androidx-swiperefreshlayout" }
-androidx-tracing = { module = "androidx.tracing:tracing", version.ref = "androidx-tracing" }
-androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
-androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
-
-fbjni = { module = "com.facebook.fbjni:fbjni", version.ref = "fbjni" }
-folly = { module = "com.facebook.folly:folly", version.ref = "folly" }
-fresco = { module = "com.facebook.fresco:fresco", version.ref = "fresco" }
-fresco-middleware = { module = "com.facebook.fresco:middleware", version.ref = "fresco" }
-fresco-imagepipeline-okhttp3 = { module = "com.facebook.fresco:imagepipeline-okhttp3", version.ref = "fresco" }
-fresco-ui-common = { module = "com.facebook.fresco:ui-common", version.ref = "fresco" }
-infer-annotation = { module = "com.facebook.infer.annotation:infer-annotation", version.ref = "infer-annotation" }
-soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" }
-yoga-proguard-annotations = { module = "com.facebook.yoga:proguard-annotations", version.ref = "yoga-proguard-annotations" }
-
-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
-okhttp3-urlconnection = { module = "com.squareup.okhttp3:okhttp-urlconnection", version.ref = "okhttp" }
-okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
-okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
-javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
-javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation-api" }
-
-react-android = { module = "com.facebook.react:react-android", version.ref = "react-android" }
-hermes-android = { module = "com.facebook.react:hermes-android", version.ref = "react-android" }
-
-junit = {module = "junit:junit", version.ref = "junit" }
-assertj = {module = "org.assertj:assertj-core", version.ref = "assertj" }
-mockito = {module = "org.mockito:mockito-inline", version.ref = "mockito" }
-robolectric = {module = "org.robolectric:robolectric", version.ref = "robolectric" }
-thoughtworks = {module = "com.thoughtworks.xstream:xstream", version.ref = "xstream" }
-
-[plugins]
-react = { id = "com.facebook.react", version.ref = "react-android" }
-android-application = { id = "com.android.application", version.ref = "agp" }
-android-library = { id = "com.android.library" }
-download = { id = "de.undercouch.download", version.ref = "download" }
-nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus-publish" }
-kotlin-android = { id = "org.jetbrains.kotlin.android" }
-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
-```
-
 ### settings.gradle
-1. Add the ```dependencyResolutionManagement``` block to reference .toml file;
-2. Include ```react-native-queue-it``` directives;
-3. Include ```react-native-community_checkbox``` directives (if used by the app);
+1. Include ```react-native-queue-it``` directives;
+2. Include ```react-native-community_checkbox``` directives (if used by the app);
 
 ```gradle
 // Example settings.gradle file
 pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 
-// .toml file reference
-dependencyResolutionManagement {
-  versionCatalogs {
-    create("libs") {
-      from(files("$rootDir/../gradle/libs.versions.toml"))
-    }
-  }
-}
-// .toml file reference
-
 rootProject.name = 'RNTestSample'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
@@ -138,8 +36,7 @@ include ':app'
 ```
 
 ### gradle.properties
-1. Add ```android.enableJetifier=true```;
-2. Add ```QueueIt_kotlinVersion=1.9.24```;
+1. Add ```QueueIt_kotlinVersion=1.9.24```;
 ```properties
 # Example gradle.properties file
 # JVM
@@ -152,7 +49,6 @@ hermesEnabled=true
 
 # Android
 android.useAndroidX=true
-android.enableJetifier=true
 
 # QueueIt
 QueueIt_kotlinVersion=1.9.24
@@ -292,7 +188,7 @@ android {
 dependencies {
   implementation fileTree(dir: "libs", include: ["*.jar"])
 
-  implementation(libs.react.android)
+  implementation("com.facebook.react:react-android")
 
   if (enableHermes) {
     implementation("com.facebook.react:hermes-engine:+") {
@@ -342,4 +238,4 @@ dependencies {
   </application>
 
 </manifest>
-```
+```