expo-manifests 0.1.1 → 0.2.3

package/CHANGELOG.md

@@ -10,6 +10,30 @@
 
 ### 💡 Others
 
+## 0.2.3 — 2022-01-18
+
+_This version does not introduce any user-facing changes._
+
+## 0.2.2 — 2021-10-15
+
+_This version does not introduce any user-facing changes._
+
+## 0.2.1 — 2021-10-06
+
+### 🐛 Bug fixes
+
+- Support platform shared jsEngine schema. ([#14654](https://github.com/expo/expo/pull/14654) by [@kudo](https://github.com/kudo))
+
+## 0.2.0 — 2021-09-28
+
+### 🎉 New features
+
+- Added `version` getter to both platforms, and `hostUri` getter to Android, for compatibility with expo-dev-client. ([#14460](https://github.com/expo/expo/pull/14460) by [@esamelson](https://github.com/esamelson))
+
+### 🐛 Bug fixes
+
+- Fix building errors from use_frameworks! in Podfile. ([#14523](https://github.com/expo/expo/pull/14523) by [@kudo](https://github.com/kudo))
+
 ## 0.1.1 — 2021-09-16
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.1.1'
+version = '0.2.3'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -57,7 +57,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 31
-    versionName '0.1.1'
+    versionName '0.2.3'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {

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

@@ -99,6 +99,7 @@ abstract class Manifest(protected val json: JSONObject) {
 
   fun getDebuggerHost(): String = getExpoGoConfigRootObject()!!.require("debuggerHost")
   fun getMainModuleName(): String = getExpoGoConfigRootObject()!!.require("mainModuleName")
+  fun getHostUri(): String? = getExpoGoConfigRootObject()?.getNullable("hostUri")
 
   fun isVerified(): Boolean = json.require("isVerified")
 
@@ -109,6 +110,11 @@ abstract class Manifest(protected val json: JSONObject) {
     return expoClientConfig.getNullable("name")
   }
 
+  fun getVersion(): String? {
+    val expoClientConfig = getExpoClientConfigRootObject() ?: return null
+    return expoClientConfig.getNullable("version")
+  }
+
   fun getUpdatesInfo(): JSONObject? {
     val expoClientConfig = getExpoClientConfigRootObject() ?: return null
     return expoClientConfig.getNullable("updates")
@@ -162,8 +168,10 @@ abstract class Manifest(protected val json: JSONObject) {
 
   fun getAndroidJsEngine(): String? {
     val expoClientConfig = getExpoClientConfigRootObject() ?: return null
-    val android = expoClientConfig.getNullable<JSONObject>("android") ?: return null
-    return android.getNullable("jsEngine")
+    val sharedJsEngine = expoClientConfig.getNullable<String>("jsEngine")
+    val androidJsEngine = expoClientConfig
+      .getNullable<JSONObject>("android")?.getNullable<String>("jsEngine")
+    return androidJsEngine ?: sharedJsEngine ?: null
   }
 
   fun getIconUrl(): String? {

package/ios/EXManifests/EXManifestsBaseManifest.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSString *)slug;
 - (nullable NSString *)appKey;
 - (nullable NSString *)name;
+- (nullable NSString *)version;
 - (nullable NSDictionary *)notificationPreferences;
 - (nullable NSDictionary *)updatesInfo;
 - (nullable NSDictionary *)iosConfig;

package/ios/EXManifests/EXManifestsBaseManifest.m

@@ -55,6 +55,14 @@
   return [expoClientConfig nullableStringForKey:@"name"];
 }
 
+- (nullable NSString *)version {
+  NSDictionary *expoClientConfig = self.expoClientConfigRootObject;
+  if (!expoClientConfig) {
+    return nil;
+  }
+  return [expoClientConfig nullableStringForKey:@"version"];
+}
+
 - (nullable NSDictionary *)notificationPreferences {
   NSDictionary *expoClientConfig = self.expoClientConfigRootObject;
   if (!expoClientConfig) {

package/ios/EXManifests/EXManifestsManifest.h

@@ -48,6 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSString *)slug;
 - (nullable NSString *)appKey;
 - (nullable NSString *)name;
+- (nullable NSString *)version;
 - (nullable NSDictionary *)notificationPreferences;
 - (nullable NSDictionary *)updatesInfo;
 - (nullable NSDictionary *)iosConfig;

package/ios/EXManifests.podspec

@@ -12,6 +12,7 @@ Pod::Spec.new do |s|
   s.homepage       = package['homepage']
   s.platform       = :ios, '12.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
+  s.static_framework = true
 
   s.dependency 'EXJSONUtils'
 
@@ -20,6 +21,9 @@ Pod::Spec.new do |s|
     'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES'
   }
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES" }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
     s.source_files = "#{s.name}/**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-manifests",
-  "version": "0.1.1",
+  "version": "0.2.3",
   "description": "Code to parse and use Expo and Expo Updates manifests.",
   "main": "index.js",
   "keywords": [
@@ -20,7 +20,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
   "dependencies": {
-    "expo-json-utils": "~0.1.0"
+    "expo-json-utils": "~0.2.0"
   },
-  "gitHead": "6552696cd8bdd2e92ff6dd09ceed8028efc96d12"
+  "gitHead": "7add72f8da01964733755ebc94a1963827e428a0"
 }