expo-modules-core 0.10.0 → 0.11.2

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionBuilder.kt

@@ -0,0 +1,271 @@
+/**
+ * We used a function from the experimental STD API - typeOf (see kotlinlang.org/api/latest/jvm/stdlib/kotlin.reflect/type-of.html).
+ * We shouldn't have any problem with that function, cause it's widely used in other libraries created by JetBrains like kotlinx-serializer.
+ * This function is super handy if we want to receive a collection type.
+ * For example, it's very hard to obtain the generic parameter type from the list class.
+ * In plain Java, it's almost impossible. There is a trick to getting such information using something called TypeToken.
+ * For instance, the Gson library uses this workaround. But there still will be a problem with nullability.
+ * We didn't find a good solution to distinguish between List<Any?> and List<Any>.
+ * Mainly because from the JVM perspective it's the same type.
+ * That's why we used typeOf. It solves all problems described above.
+ */
+@file:OptIn(ExperimentalStdlibApi::class)
+@file:Suppress("FunctionName")
+
+package expo.modules.kotlin.objects
+
+import expo.modules.kotlin.Promise
+import expo.modules.kotlin.events.EventsDefinition
+import expo.modules.kotlin.functions.AsyncFunction
+import expo.modules.kotlin.functions.AsyncFunctionBuilder
+import expo.modules.kotlin.functions.AsyncFunctionComponent
+import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
+import expo.modules.kotlin.functions.SyncFunctionComponent
+import expo.modules.kotlin.types.toAnyType
+import kotlin.reflect.typeOf
+
+/**
+ * Base class for other definitions representing an object, such as `ModuleDefinition`.
+ */
+open class ObjectDefinitionBuilder {
+  private var constantsProvider = { emptyMap<String, Any?>() }
+  private var eventsDefinition: EventsDefinition? = null
+
+  @PublishedApi
+  internal var syncFunctions = mutableMapOf<String, SyncFunctionComponent>()
+
+  @PublishedApi
+  internal var asyncFunctions = mutableMapOf<String, AsyncFunction>()
+
+  private var functionBuilders = mutableMapOf<String, AsyncFunctionBuilder>()
+
+  @PublishedApi
+  internal var properties = mutableMapOf<String, PropertyComponentBuilder>()
+
+  fun buildObject(): ObjectDefinitionData {
+    return ObjectDefinitionData(
+      constantsProvider,
+      syncFunctions,
+      asyncFunctions,
+      functionBuilders.mapValues { (_, value) -> value.build() },
+      eventsDefinition,
+      properties.mapValues { (_, value) -> value.build() }
+    )
+  }
+
+  /**
+   * Definition function setting the module's constants to export.
+   */
+  fun Constants(constantsProvider: () -> Map<String, Any?>) {
+    this.constantsProvider = constantsProvider
+  }
+
+  /**
+   * Definition of the module's constants to export.
+   */
+  fun Constants(vararg constants: Pair<String, Any?>) {
+    constantsProvider = { constants.toMap() }
+  }
+
+  @JvmName("FunctionWithoutArgs")
+  inline fun Function(
+    name: String,
+    crossinline body: () -> Any?
+  ) {
+    SyncFunctionComponent(name, arrayOf()) { body() }.also {
+      syncFunctions[name] = it
+    }
+  }
+
+  inline fun <reified R> Function(
+    name: String,
+    crossinline body: () -> R
+  ) {
+    SyncFunctionComponent(name, arrayOf()) { body() }.also {
+      syncFunctions[name] = it
+    }
+  }
+
+  inline fun <reified R, reified P0> Function(
+    name: String,
+    crossinline body: (p0: P0) -> R
+  ) {
+    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { body(it[0] as P0) }.also {
+      syncFunctions[name] = it
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1> Function(
+    name: String,
+    crossinline body: (p0: P0, p1: P1) -> R
+  ) {
+    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { body(it[0] as P0, it[1] as P1) }.also {
+      syncFunctions[name] = it
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2> Function(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2) -> R
+  ) {
+    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2) }.also {
+      syncFunctions[name] = it
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> Function(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
+  ) {
+    SyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5) }.also {
+      syncFunctions[name] = it
+    }
+  }
+
+  @JvmName("AsyncFunctionWithoutArgs")
+  inline fun AsyncFunction(
+    name: String,
+    crossinline body: () -> Any?
+  ) {
+    asyncFunctions[name] = AsyncFunctionComponent(name, arrayOf()) { body() }
+  }
+
+  inline fun <reified R> AsyncFunction(
+    name: String,
+    crossinline body: () -> R
+  ) {
+    asyncFunctions[name] = AsyncFunctionComponent(name, arrayOf()) { body() }
+  }
+
+  inline fun <reified R, reified P0> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0) -> R
+  ) {
+    asyncFunctions[name] = if (P0::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf()) { _, promise -> body(promise as P0) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType())) { body(it[0] as P0) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1) -> R
+  ) {
+    asyncFunctions[name] = if (P1::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType())) { args, promise -> body(args[0] as P0, promise as P1) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { body(it[0] as P0, it[1] as P1) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2) -> R
+  ) {
+    asyncFunctions[name] = if (P2::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, promise as P2) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
+  ) {
+    asyncFunctions[name] = if (P3::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, promise as P3) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
+  ) {
+    asyncFunctions[name] = if (P4::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, promise as P4) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
+  ) {
+    asyncFunctions[name] = if (P5::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, promise as P5) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
+  ) {
+    asyncFunctions[name] = if (P6::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, args[5] as P5, promise as P6) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6) }
+    }
+  }
+
+  inline fun <reified R, reified P0, reified P1, reified P2, reified P3, reified P4, reified P5, reified P6, reified P7> AsyncFunction(
+    name: String,
+    crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
+  ) {
+    asyncFunctions[name] = if (P7::class == Promise::class) {
+      AsyncFunctionWithPromiseComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType())) { args, promise -> body(args[0] as P0, args[1] as P1, args[2] as P2, args[3] as P3, args[4] as P4, args[5] as P5, args[6] as P6, promise as P7) }
+    } else {
+      AsyncFunctionComponent(name, arrayOf(typeOf<P0>().toAnyType(), typeOf<P1>().toAnyType(), typeOf<P2>().toAnyType(), typeOf<P3>().toAnyType(), typeOf<P4>().toAnyType(), typeOf<P5>().toAnyType(), typeOf<P6>().toAnyType(), typeOf<P7>().toAnyType())) { body(it[0] as P0, it[1] as P1, it[2] as P2, it[3] as P3, it[4] as P4, it[5] as P5, it[6] as P6, it[7] as P7) }
+    }
+  }
+
+  fun AsyncFunction(
+    name: String
+  ) = AsyncFunctionBuilder(name).also { functionBuilders[name] = it }
+
+  /**
+   * Defines event names that this module can send to JavaScript.
+   */
+  fun Events(vararg events: String) {
+    eventsDefinition = EventsDefinition(events)
+  }
+
+  /**
+   * Creates module's lifecycle listener that is called right after the first event listener is added.
+   */
+  inline fun OnStartObserving(crossinline body: () -> Unit) {
+    AsyncFunction("startObserving", body)
+  }
+
+  /**
+   * Creates module's lifecycle listener that is called right after all event listeners are removed.
+   */
+  inline fun OnStopObserving(crossinline body: () -> Unit) {
+    AsyncFunction("stopObserving", body)
+  }
+
+  /**
+   * Creates the property with given name. The component is basically no-op if you don't call `.get()` or `.set()` on it.
+   */
+  fun Property(name: String): PropertyComponentBuilder {
+    return PropertyComponentBuilder(name).also {
+      properties[name] = it
+    }
+  }
+
+  /**
+   * Creates the read-only property whose getter doesn't take the caller as an argument.
+   */
+  inline fun <T> Property(name: String, crossinline body: () -> T): PropertyComponentBuilder {
+    return PropertyComponentBuilder(name).also {
+      it.get(body)
+      properties[name] = it
+    }
+  }
+}

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionData.kt

@@ -0,0 +1,21 @@
+package expo.modules.kotlin.objects
+
+import expo.modules.kotlin.ModuleHolder
+import expo.modules.kotlin.events.EventsDefinition
+import expo.modules.kotlin.functions.AsyncFunction
+import expo.modules.kotlin.functions.SuspendFunctionComponent
+import expo.modules.kotlin.functions.SuspendFunctionComponentBuilder
+import expo.modules.kotlin.functions.SyncFunctionComponent
+
+class ObjectDefinitionData(
+  val constantsProvider: () -> Map<String, Any?>,
+  val syncFunctions: Map<String, SyncFunctionComponent>,
+  val asyncFunctions: Map<String, AsyncFunction>,
+  val suspendFunctionBuilders: Map<String, SuspendFunctionComponentBuilder>,
+  val eventsDefinition: EventsDefinition?,
+  val properties: Map<String, PropertyComponent>
+) {
+  fun buildSuspendFunctions(moduleHolder: ModuleHolder): Map<String, SuspendFunctionComponent> {
+    return suspendFunctionBuilders.mapValues { (_, value) -> value.build(moduleHolder) }
+  }
+}

package/android/src/main/java/expo/modules/kotlin/objects/PropertyComponent.kt

@@ -0,0 +1,54 @@
+package expo.modules.kotlin.objects
+
+import com.facebook.react.bridge.Arguments
+import expo.modules.kotlin.functions.SyncFunctionComponent
+import expo.modules.kotlin.jni.CppType
+import expo.modules.kotlin.jni.JNIFunctionBody
+import expo.modules.kotlin.jni.JavaScriptModuleObject
+
+class PropertyComponent(
+  /**
+   * Name of the property.
+   */
+  val name: String,
+
+  /**
+   * Synchronous function that is called when the property is being accessed.
+   */
+  val getter: SyncFunctionComponent? = null,
+
+  /**
+   * Synchronous function that is called when the property is being set.
+   */
+  val setter: SyncFunctionComponent? = null
+) {
+  /**
+   * Attaches property to the provided js object.
+   */
+  fun attachToJSObject(jsObject: JavaScriptModuleObject) {
+    val jniGetter = if (getter != null) {
+      JNIFunctionBody {
+        val result = getter.call(emptyArray())
+        return@JNIFunctionBody Arguments.fromJavaArgs(arrayOf(result))
+      }
+    } else {
+      null
+    }
+
+    val jniSetter = if (setter != null) {
+      JNIFunctionBody { args ->
+        setter.call(args)
+        return@JNIFunctionBody null
+      }
+    } else {
+      null
+    }
+
+    jsObject.registerProperty(
+      name,
+      setter?.getCppRequiredTypes()?.first() ?: CppType.NONE.value,
+      jniGetter,
+      jniSetter
+    )
+  }
+}

package/android/src/main/java/expo/modules/kotlin/objects/PropertyComponentBuilder.kt

@@ -0,0 +1,32 @@
+@file:OptIn(ExperimentalStdlibApi::class)
+
+package expo.modules.kotlin.objects
+
+import expo.modules.kotlin.functions.SyncFunctionComponent
+import expo.modules.kotlin.types.toAnyType
+import kotlin.reflect.typeOf
+
+class PropertyComponentBuilder(
+  val name: String
+) {
+  var getter: SyncFunctionComponent? = null
+  var setter: SyncFunctionComponent? = null
+
+  /**
+   * Modifier that sets property getter that has no arguments (the caller is not used).
+   */
+  inline fun <T> get(crossinline body: () -> T) = apply {
+    getter = SyncFunctionComponent("get", arrayOf()) { body() }
+  }
+
+  /**
+   * Modifier that sets property setter that receives only the new value as an argument.
+   */
+  inline fun <reified T> set(crossinline body: (newValue: T) -> Unit) = apply {
+    setter = SyncFunctionComponent("set", arrayOf(typeOf<T>().toAnyType())) { body(it[0] as T) }
+  }
+
+  fun build(): PropertyComponent {
+    return PropertyComponent(name, getter, setter)
+  }
+}

package/android/src/main/java/expo/modules/kotlin/types/AnyTypeConverter.kt

@@ -0,0 +1,36 @@
+package expo.modules.kotlin.types
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableType
+import expo.modules.kotlin.jni.CppType
+
+/**
+ * Type converter that handles conversion from [Any] or [Dynamic] to [Any].
+ * In the first case, it will just pass provided value.
+ * In case when it receives [Dynamic], it will unpack the provided value.
+ * In that way, we produce the same output for JSI and bridge implementation.
+ */
+class AnyTypeConverter(isOptional: Boolean) : DynamicAwareTypeConverters<Any>(isOptional) {
+  override fun convertFromDynamic(value: Dynamic): Any {
+    return when (value.type) {
+      ReadableType.Boolean -> value.asBoolean()
+      ReadableType.Number -> value.asDouble()
+      ReadableType.String -> value.asString()
+      ReadableType.Map -> value.asMap()
+      ReadableType.Array -> value.asArray()
+      else -> error("Unknown dynamic type: ${value.type}")
+    }
+  }
+
+  override fun convertFromAny(value: Any): Any {
+    return value
+  }
+
+  override fun getCppRequiredTypes(): List<CppType> = listOf(
+    CppType.READABLE_MAP,
+    CppType.READABLE_ARRAY,
+    CppType.STRING,
+    CppType.BOOLEAN,
+    CppType.DOUBLE
+  )
+}

package/android/src/main/java/expo/modules/kotlin/types/TypeConverterProvider.kt

@@ -30,6 +30,11 @@ inline fun <reified T> convert(value: Dynamic): T {
   return converter.convert(value) as T
 }
 
+inline fun <reified T> convert(value: Any?): T {
+  val converter = TypeConverterProviderImpl.obtainTypeConverter(typeOf<T>())
+  return converter.convert(value) as T
+}
+
 fun convert(value: Dynamic, type: KType): Any? {
   val converter = TypeConverterProviderImpl.obtainTypeConverter(type)
   return converter.convert(value)
@@ -115,6 +120,8 @@ object TypeConverterProviderImpl : TypeConverterProvider {
 
       JavaScriptValue::class.createType(nullable = isOptional) to JavaScriptValueTypeConvert(isOptional),
       JavaScriptObject::class.createType(nullable = isOptional) to JavaScriptObjectTypeConverter(isOptional),
+
+      Any::class.createType(nullable = isOptional) to AnyTypeConverter(isOptional),
     )
   }
 }

package/android/src/main/java/expo/modules/kotlin/views/ViewGroupDefinitionBuilder.kt

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalStdlibApi::class)
 @file:Suppress("FunctionName")
 
 package expo.modules.kotlin.views
@@ -32,14 +31,6 @@ class ViewGroupDefinitionBuilder {
     removeViewAtAction
   )
 
-  @Deprecated(
-    message = "The 'addChildView' component was renamed to 'AddChildView'.",
-    replaceWith = ReplaceWith("AddChildView(body)")
-  )
-  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> addChildView(
-    noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
-  ) = AddChildView(body)
-
   inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> AddChildView(
     noinline body: (parent: ParentViewType, child: ChildViewType, index: Int) -> Unit
   ) {
@@ -48,14 +39,6 @@ class ViewGroupDefinitionBuilder {
     }
   }
 
-  @Deprecated(
-    message = "The 'getChildCount' component was renamed to 'GetChildCount'.",
-    replaceWith = ReplaceWith("GetChildCount(body)")
-  )
-  inline fun <reified ParentViewType : ViewGroup> getChildCount(
-    noinline body: (view: ParentViewType) -> Int
-  ) = GetChildCount(body)
-
   inline fun <reified ParentViewType : ViewGroup> GetChildCount(
     noinline body: (view: ParentViewType) -> Int
   ) {
@@ -64,14 +47,6 @@ class ViewGroupDefinitionBuilder {
     }
   }
 
-  @Deprecated(
-    message = "The 'getChildViewAt' component was renamed to 'GetChildViewAt'.",
-    replaceWith = ReplaceWith("GetChildViewAt(body)")
-  )
-  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> getChildViewAt(
-    noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
-  ) = GetChildViewAt(body)
-
   inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> GetChildViewAt(
     noinline body: (view: ParentViewType, index: Int) -> ChildViewType?
   ) {
@@ -80,14 +55,6 @@ class ViewGroupDefinitionBuilder {
     }
   }
 
-  @Deprecated(
-    message = "The 'removeChildViewAt' component was renamed to 'RemoveChildViewAt'.",
-    replaceWith = ReplaceWith("RemoveChildViewAt(body)")
-  )
-  inline fun <reified ParentViewType : ViewGroup> removeChildViewAt(
-    noinline body: (view: ParentViewType, index: Int) -> Unit
-  ) = RemoveChildViewAt(body)
-
   inline fun <reified ParentViewType : ViewGroup> RemoveChildViewAt(
     noinline body: (view: ParentViewType, index: Int) -> Unit
   ) {
@@ -96,14 +63,6 @@ class ViewGroupDefinitionBuilder {
     }
   }
 
-  @Deprecated(
-    message = "The 'removeChildView' component was renamed to 'RemoveChildView'.",
-    replaceWith = ReplaceWith("RemoveChildView(body)")
-  )
-  inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> removeChildView(
-    noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
-  ) = RemoveChildView(body)
-
   inline fun <reified ParentViewType : ViewGroup, reified ChildViewType : View> RemoveChildView(
     noinline body: (parent: ParentViewType, child: ChildViewType) -> Unit
   ) {

package/android/src/main/java/expo/modules/kotlin/views/ViewManagerDefinitionBuilder.kt

@@ -37,12 +37,6 @@ class ViewManagerDefinitionBuilder {
       viewGroupDefinition
     )
 
-  @Deprecated(
-    message = "The 'view' component was renamed to 'View'.",
-    replaceWith = ReplaceWith("View(body)")
-  )
-  inline fun <reified ViewType : View> view(noinline body: (Context) -> ViewType) = View(body)
-
   /**
    * Defines the factory creating a native view when the module is used as a view.
    */
@@ -51,12 +45,6 @@ class ViewManagerDefinitionBuilder {
     viewFactory = body
   }
 
-  @Deprecated(
-    message = "The 'onViewDestroys' component was renamed to 'OnViewDestroys'.",
-    replaceWith = ReplaceWith("OnViewDestroys(body)")
-  )
-  inline fun <reified ViewType : View> onViewDestroys(noinline body: (view: ViewType) -> Unit) = OnViewDestroys(body)
-
   /**
    * Creates view's lifecycle listener that is called right after the view isn't longer used by React Native.
    */
@@ -64,15 +52,6 @@ class ViewManagerDefinitionBuilder {
     onViewDestroys = { body(it as ViewType) }
   }
 
-  @Deprecated(
-    message = "The 'prop' component was renamed to 'Prop'.",
-    replaceWith = ReplaceWith("Prop(body)")
-  )
-  inline fun <reified ViewType : View, reified PropType> prop(
-    name: String,
-    noinline body: (view: ViewType, prop: PropType) -> Unit
-  ) = Prop(name, body)
-
   /**
    * Creates a view prop that defines its name and setter.
    */
@@ -87,12 +66,6 @@ class ViewManagerDefinitionBuilder {
     )
   }
 
-  @Deprecated(
-    message = "The 'events' component was renamed to 'Events'.",
-    replaceWith = ReplaceWith("Events(callbacks)")
-  )
-  fun events(vararg callbacks: String) = Events(*callbacks)
-
   /**
    * Defines prop names that should be treated as callbacks.
    */
@@ -100,12 +73,6 @@ class ViewManagerDefinitionBuilder {
     callbacksDefinition = CallbacksDefinition(callbacks)
   }
 
-  @Deprecated(
-    message = "The 'groupView' component was renamed to 'GroupView'.",
-    replaceWith = ReplaceWith("GroupView(callbacks)")
-  )
-  inline fun groupView(body: ViewGroupDefinitionBuilder.() -> Unit) = GroupView(body)
-
   /**
    * Creates the group view definition that scopes group view-related definitions.
    */

package/build/PermissionsInterface.d.ts

@@ -1,13 +1,42 @@
 export declare enum PermissionStatus {
+    /**
+     * User has granted the permission.
+     */
     GRANTED = "granted",
+    /**
+     * User hasn't granted or denied the permission yet.
+     */
     UNDETERMINED = "undetermined",
+    /**
+     * User has denied the permission.
+     */
     DENIED = "denied"
 }
+/**
+ * Permission expiration time. Currently, all permissions are granted permamently.
+ */
 export declare type PermissionExpiration = 'never' | number;
+/**
+ * An object obtained by `getPermissionsAsync` and `requestPermissionsAsync` functions.
+ */
 export interface PermissionResponse {
+    /**
+     * Determines the status of the permission.
+     */
     status: PermissionStatus;
+    /**
+     * Determines time when the permission expires.
+     */
     expires: PermissionExpiration;
+    /**
+     * A convenience boolean that indicates if the permission is granted.
+     */
     granted: boolean;
+    /**
+     * Indicates if user can be asked again for specific permission.
+     * If not, one should be directed to the Settings app
+     * in order to enable/disable the permission.
+     */
     canAskAgain: boolean;
 }
 //# sourceMappingURL=PermissionsInterface.d.ts.map

package/build/PermissionsInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionsInterface.d.ts","sourceRoot":"","sources":["../src/PermissionsInterface.ts"],"names":[],"mappings":"AAAA,oBAAY,gBAAgB;IAC1B,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEpD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB"}
+{"version":3,"file":"PermissionsInterface.d.ts","sourceRoot":"","sources":["../src/PermissionsInterface.ts"],"names":[],"mappings":"AAAA,oBAAY,gBAAgB;IAC1B;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,YAAY,iBAAiB;IAC7B;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,oBAAY,oBAAoB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAC;IACzB;;OAEG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAC9B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB"}

package/build/PermissionsInterface.js

@@ -1,7 +1,16 @@
 export var PermissionStatus;
 (function (PermissionStatus) {
+    /**
+     * User has granted the permission.
+     */
     PermissionStatus["GRANTED"] = "granted";
+    /**
+     * User hasn't granted or denied the permission yet.
+     */
     PermissionStatus["UNDETERMINED"] = "undetermined";
+    /**
+     * User has denied the permission.
+     */
     PermissionStatus["DENIED"] = "denied";
 })(PermissionStatus || (PermissionStatus = {}));
 //# sourceMappingURL=PermissionsInterface.js.map

package/build/PermissionsInterface.js.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionsInterface.js","sourceRoot":"","sources":["../src/PermissionsInterface.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,iDAA6B,CAAA;IAC7B,qCAAiB,CAAA;AACnB,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B","sourcesContent":["export enum PermissionStatus {\n  GRANTED = 'granted',\n  UNDETERMINED = 'undetermined',\n  DENIED = 'denied',\n}\n\nexport type PermissionExpiration = 'never' | number;\n\nexport interface PermissionResponse {\n  status: PermissionStatus;\n  expires: PermissionExpiration;\n  granted: boolean;\n  canAskAgain: boolean;\n}\n"]}
+{"version":3,"file":"PermissionsInterface.js","sourceRoot":"","sources":["../src/PermissionsInterface.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,gBAaX;AAbD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,uCAAmB,CAAA;IACnB;;OAEG;IACH,iDAA6B,CAAA;IAC7B;;OAEG;IACH,qCAAiB,CAAA;AACnB,CAAC,EAbW,gBAAgB,KAAhB,gBAAgB,QAa3B","sourcesContent":["export enum PermissionStatus {\n  /**\n   * User has granted the permission.\n   */\n  GRANTED = 'granted',\n  /**\n   * User hasn't granted or denied the permission yet.\n   */\n  UNDETERMINED = 'undetermined',\n  /**\n   * User has denied the permission.\n   */\n  DENIED = 'denied',\n}\n\n/**\n * Permission expiration time. Currently, all permissions are granted permamently.\n */\nexport type PermissionExpiration = 'never' | number;\n\n/**\n * An object obtained by `getPermissionsAsync` and `requestPermissionsAsync` functions.\n */\nexport interface PermissionResponse {\n  /**\n   * Determines the status of the permission.\n   */\n  status: PermissionStatus;\n  /**\n   * Determines time when the permission expires.\n   */\n  expires: PermissionExpiration;\n  /**\n   * A convenience boolean that indicates if the permission is granted.\n   */\n  granted: boolean;\n  /**\n   * Indicates if user can be asked again for specific permission.\n   * If not, one should be directed to the Settings app\n   * in order to enable/disable the permission.\n   */\n  canAskAgain: boolean;\n}\n"]}

package/ios/ExpoModulesCore.podspec

@@ -22,9 +22,10 @@ Pod::Spec.new do |s|
     'DEFINES_MODULE' => 'YES',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
+    'HEADER_SEARCH_PATHS' => "\"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
   }
   s.user_target_xcconfig = {
-    "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/ExpoModulesCore/Swift Compatibility Header\"",
+    "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/ExpoModulesCore/Swift Compatibility Header\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
   }
 
   s.dependency 'React-Core'