expo-manifests 0.5.1 → 0.5.2

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.5.2 — 2023-02-21
+
+### 🐛 Bug fixes
+
+- Fixed default `expo.jsEngine` value when SDK is lower than 48. ([#21266](https://github.com/expo/expo/pull/21266) by [@kudo](https://github.com/kudo))
+
 ## 0.5.1 — 2023-02-09
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.5.1'
+version = '0.5.2'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.5.1'
+    versionName '0.5.2'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {

package/android/src/main/java/expo/modules/manifests/core/Manifest.kt

@@ -169,8 +169,14 @@ abstract class Manifest(protected val json: JSONObject) {
 
   val jsEngine: String by lazy {
     val expoClientConfig = getExpoClientConfigRootObject()
-    expoClientConfig
-      ?.getNullable<JSONObject>("android")?.getNullable<String>("jsEngine") ?: expoClientConfig?.getNullable<String>("jsEngine") ?: "hermes"
+    var result = expoClientConfig
+      ?.getNullable<JSONObject>("android")?.getNullable<String>("jsEngine") ?: expoClientConfig?.getNullable<String>("jsEngine")
+    if (result == null) {
+      val sdkVersionComponents = getSDKVersion()?.split(".")
+      val sdkMajorVersion = if (sdkVersionComponents?.size == 3) sdkVersionComponents[0].toIntOrNull() else 0
+      result = if (sdkMajorVersion in 1..47) "jsc" else "hermes"
+    }
+    result
   }
 
   fun getIconUrl(): String? {

package/ios/EXManifests/EXManifestsBaseManifest.h

@@ -1,10 +1,11 @@
 //  Copyright © 2021 650 Industries. All rights reserved.
 
 #import <EXJSONUtils/NSDictionary+EXJSONUtils.h>
+#import <EXManifests/EXManifestsManifest.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface EXManifestsBaseManifest : NSObject
+@interface EXManifestsBaseManifest : NSObject<EXManifestsManifestBehavior>
 
 @property (nonatomic, readonly, strong) NSDictionary* rawManifestJSON;
 

package/ios/EXManifests/EXManifestsBaseManifest.m

@@ -163,7 +163,12 @@
                                          ]];
   }
   if (!result) {
-    result = @"hermes";
+    int sdkMajorVersion = [self sdkMajorVersion];
+    if (sdkMajorVersion > 0 && sdkMajorVersion < 48) {
+      result = @"jsc";
+    } else {
+      result = @"hermes";
+    }
   }
   return result;
 }
@@ -305,4 +310,14 @@
   return nil;
 }
 
+- (int)sdkMajorVersion
+{
+  NSString *sdkVersion = [self sdkVersion];
+  NSArray<NSString *> *components = [sdkVersion componentsSeparatedByString:@"."];
+  if (components.count == 3) {
+    return [components[0] intValue];
+  }
+  return 0;
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-manifests",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Code to parse and use Expo and Expo Updates manifests.",
   "main": "index.js",
   "keywords": [
@@ -22,5 +22,5 @@
   "dependencies": {
     "expo-json-utils": "~0.5.0"
   },
-  "gitHead": "1f8a6a09570fd451378565ca34933018ce48454e"
+  "gitHead": "d7ecf4eaf234d2f1100249a2c893a948d47376aa"
 }