Preparing release 1.2.0

Author: queue-it

.gitignore

@@ -11,7 +11,6 @@ jsconfig.json
 .vs/
 
 # Xcode
-#
 build/
 *.pbxuser
 !default.pbxuser
@@ -31,25 +30,27 @@ DerivedData
 project.xcworkspace
 
 # Android/IJ
-#
 .idea
 .gradle
 local.properties
 android.iml
+android/bin/
 
 # Cocoapods
-#
-example/ios/Pods
+exampleApp/ios/Pods
 ios/Pods
 **/Pods
 
 # node.js
-#
 node_modules/
 npm-debug.log
 yarn-debug.log
 yarn-error.log
 
+# Generated
+**/.cxx/
+**/packages/
+
 # BUCK
 buck-out/
 \.buckd/

.npmignore

@@ -1,3 +1,3 @@
-example
+exampleApp
 .circleci
 node_modules

README.md

@@ -6,7 +6,7 @@ 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 [example](https://github.com/queueit/react-native-queue-it/tree/master/example) directory.
+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.
 
 ## Installation
 

android/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android_</name>
+	<name>react-native-queue-it</name>
 	<comment>Project android_ created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1751535839006</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

android/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +1,11 @@
 arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
+override.workspace.settings=true

android/build.gradle

@@ -1,22 +1,29 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
   def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['QueueIt_kotlinVersion']
 
   repositories {
     mavenCentral()
-    mavenLocal()
     google()
+    maven{
+      url "https://repo1.maven.org/maven2/"
+    }
+    maven {
+      url "https://maven.google.com"
+    }
+    mavenLocal()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.3'
-    // noinspection DifferentKotlinGradleVersion
+    classpath 'com.android.tools.build:gradle:8.3.2'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+  id 'com.android.library'
+  id 'com.facebook.react'
+  id 'kotlin-android'
+}
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['QueueIt_' + name]
@@ -27,16 +34,32 @@ def getExtOrIntegerDefault(name) {
 }
 
 android {
+  namespace "com.reactnativequeueit"
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  buildToolsVersion getExtOrDefault('buildToolsVersion')
+  buildFeatures {
+    prefab true
+  }
   defaultConfig {
-    minSdkVersion 21
+    minSdkVersion 24
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
     versionCode 1
     versionName "1.0"
 
-  }
+    externalNativeBuild {
+      cmake {
+        cppFlags "-std=c++17"
+        arguments "-DANDROID_STL=c++_shared",
+                  "-DCMAKE_OBJECT_PATH_MAX=1024",
+                  "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
+                  "-DREACT_NATIVE_DIR=${rootProject.projectDir}/../node_modules/react-native",
+                  "-DCODEGEN_DIR=${buildDir}/generated/source/codegen/jni"
+      }
+    }
 
+    ndk {
+      abiFilters "armeabi-v7a", "arm64-v8a", "x86_64"
+    }
+  }
   buildTypes {
     release {
       minifyEnabled false
@@ -45,92 +68,28 @@ android {
   lintOptions {
     disable 'GradleCompatible'
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-}
-
-repositories {
-  mavenCentral()
-  mavenLocal()
-  google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
+  externalNativeBuild {
+    cmake {
+      path "src/main/jni/CMakeLists.txt"
     }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-              parentDir,
-              'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-              parentDir,
-              'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
   }
-
-  if (!found) {
-    throw new GradleException(
-            "${project.name}: unable to locate React Native android sources. " +
-                    "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
+  sourceSets {
+    main {
+      java.srcDirs += "$buildDir/generated/source/codegen/java"
+      jniLibs.srcDirs += "$buildDir/generated/source/codegen/jni"
+    }
   }
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
-
 dependencies {
-  // noinspection GradleDynamicVersion
-  api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
+  implementation(libs.react.android)
+  implementation(libs.fbjni)
+
   //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'
+  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')
 }

android/gradle.properties

@@ -1,6 +1,6 @@
-QueueIt_kotlinVersion=1.4.10
-QueueIt_compileSdkVersion=31
-QueueIt_buildToolsVersion=28.0.3
-QueueIt_targetSdkVersion=31
+QueueIt_kotlinVersion=1.9.24
+QueueIt_compileSdkVersion=34
+QueueIt_targetSdkVersion=34
 android.useAndroidX=true
 android.enableJetifier=true
+newArchEnabled=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 05 15:12:32 CET 2021
-distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+#Fri Feb 05 15:12:32 CET 2021
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativequeueit">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

android/src/main/cpp/include/folly/folly-config.h

@@ -0,0 +1,2 @@
+#pragma once
+#define FOLLY_USE_LIBCPP 1