expo-modules-core 1.5.3 → 1.5.4

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 1.5.4 — 2023-07-04
+
+### 🐛 Bug fixes
+
+- Fix the `View cannot be cast to ViewGroup` exception on Android. ([#23264](https://github.com/expo/expo/pull/23264) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Changed Objective-C names for `ExpoReactDelegate` and `ExpoReactDelegateHandler` to fix issues with versioning in Expo Go. ([#23229](https://github.com/expo/expo/pull/23229) by [@tsapeta](https://github.com/tsapeta))
+
 ## 1.5.3 — 2023-06-24
 
 ### 🎉 New features

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.3'
+version = '1.5.4'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -160,7 +160,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.3"
+    versionName "1.5.4"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -0,0 +1,11 @@
+package expo.modules.kotlin.views
+
+import android.content.Context
+import android.view.ViewGroup
+
+/**
+ * A NOOP view group, which is used when an error occurs.
+ */
+class ErrorViewGroup(context: Context) : ViewGroup(context) {
+  override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) = Unit
+}

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

@@ -334,7 +334,12 @@ class ViewDefinitionBuilder<T : View>(
         UnexpectedException(e)
       }
     )
-    return View(context)
+
+    return if (ViewGroup::class.java.isAssignableFrom(viewClass.java)) {
+      ErrorViewGroup(context)
+    } else {
+      View(context)
+    }
   }
 
   private fun getPrimaryConstructor(): KFunction<T>? {

package/build/sweet/setUpErrorManager.fx.js

@@ -10,5 +10,5 @@ if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
     });
 }
 // We have to export `CodedError` via global object to use in later in the C++ code.
-global.ExpoModulesCore_CodedError = CodedError;
+globalThis.ExpoModulesCore_CodedError = CodedError;
 //# sourceMappingURL=setUpErrorManager.fx.js.map

package/build/sweet/setUpErrorManager.fx.js.map

@@ -1 +1 @@
-{"version":3,"file":"setUpErrorManager.fx.js","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,IAAI,OAAO,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,kBAAkB,EAAE;IAC9D,MAAM,cAAc,GAAG,4CAA4C,CAAC;IACpE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAE1D,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC5E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;CACJ;AAED,oFAAoF;AACpF,MAAM,CAAC,0BAA0B,GAAG,UAAU,CAAC","sourcesContent":["import { EventEmitter } from '../EventEmitter';\nimport Platform from '../Platform';\nimport { CodedError } from '../errors/CodedError';\nimport NativeErrorManager from './NativeErrorManager';\n\nif (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {\n  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';\n  const eventEmitter = new EventEmitter(NativeErrorManager);\n\n  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {\n    console.error(message);\n  });\n}\n\n// We have to export `CodedError` via global object to use in later in the C++ code.\nglobal.ExpoModulesCore_CodedError = CodedError;\n"]}
+{"version":3,"file":"setUpErrorManager.fx.js","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,IAAI,OAAO,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,kBAAkB,EAAE;IAC9D,MAAM,cAAc,GAAG,4CAA4C,CAAC;IACpE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAE1D,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC5E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;CACJ;AAED,oFAAoF;AACpF,UAAU,CAAC,0BAA0B,GAAG,UAAU,CAAC","sourcesContent":["import { EventEmitter } from '../EventEmitter';\nimport Platform from '../Platform';\nimport { CodedError } from '../errors/CodedError';\nimport NativeErrorManager from './NativeErrorManager';\n\nif (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {\n  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';\n  const eventEmitter = new EventEmitter(NativeErrorManager);\n\n  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {\n    console.error(message);\n  });\n}\n\n// We have to export `CodedError` via global object to use in later in the C++ code.\nglobalThis.ExpoModulesCore_CodedError = CodedError;\n"]}

package/ios/ReactDelegates/EXReactDelegateWrapper+Private.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface EXReactDelegateWrapper(Private)
 
-- (instancetype)initWithExpoReactDelegate:(ExpoReactDelegate *)expoReactDelegate;
+- (instancetype)initWithExpoReactDelegate:(EXReactDelegate *)expoReactDelegate;
 
 @end
 

package/ios/ReactDelegates/EXReactDelegateWrapper.m

@@ -7,13 +7,13 @@
 
 @interface EXReactDelegateWrapper()
 
-@property (nonatomic, weak) ExpoReactDelegate *expoReactDelegate;
+@property (nonatomic, weak) EXReactDelegate *expoReactDelegate;
 
 @end
 
 @implementation EXReactDelegateWrapper
 
-- (instancetype)initWithExpoReactDelegate:(ExpoReactDelegate *)expoReactDelegate
+- (instancetype)initWithExpoReactDelegate:(EXReactDelegate *)expoReactDelegate
 {
   if (self = [super init]) {
     _expoReactDelegate = expoReactDelegate;

package/ios/ReactDelegates/ExpoReactDelegate.swift

@@ -3,7 +3,7 @@
 /**
  An extensible react instance creation delegate. This class will loop through each `ExpoReactDelegateHandler` to determine the winner to create the instance.
  */
-@objc
+@objc(EXReactDelegate)
 public class ExpoReactDelegate: NSObject {
   private let handlers: [ExpoReactDelegateHandler]
 

package/ios/ReactDelegates/ExpoReactDelegateHandler.swift

@@ -5,7 +5,7 @@ import React
 /**
  The handler for `ExpoReactDelegate`. A module can implement a handler to process react instance creation.
  */
-@objc
+@objc(EXReactDelegateHandler)
 open class ExpoReactDelegateHandler: NSObject {
   public override required init() {}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "19e6561830e33168b1c963ec50b7248baafbb758"
+  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
 }

package/src/sweet/setUpErrorManager.fx.ts

@@ -13,4 +13,4 @@ if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
 }
 
 // We have to export `CodedError` via global object to use in later in the C++ code.
-global.ExpoModulesCore_CodedError = CodedError;
+globalThis.ExpoModulesCore_CodedError = CodedError;