expo-updates-interface 0.9.2 → 0.9.3

package/CHANGELOG.md

@@ -10,11 +10,9 @@
 
 ### 💡 Others
 
-## 0.9.2 — 2023-05-08
+## 0.9.3 — 2023-05-11
 
-### 💡 Others
-
-- iOS: convert to swift. ([#21646](https://github.com/expo/expo/pull/21646) by [@wschurman](https://github.com/wschurman))
+_This version does not introduce any user-facing changes._
 
 ## 0.9.1 — 2023-02-09
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.9.2'
+version = '0.9.3'
 
 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 1
-    versionName '0.9.2'
+    versionName '0.9.3'
   }
   lintOptions {
     abortOnError false

package/ios/EXUpdatesInterface/EXUpdatesControllerRegistry.h

@@ -0,0 +1,16 @@
+//  Copyright © 2022-present 650 Industries. All rights reserved.
+
+#import <EXUpdatesInterface/EXUpdatesExternalInterface.h>
+
+/**
+ * Simple singleton registry that holds a reference to a single controller implementing
+ * EXUpdatesExternalInterface. This allows modules (like expo-dev-launcher) to acccess such a
+ * controller without their podspec needing to declare a dependency on expo-updates.
+ */
+@interface EXUpdatesControllerRegistry : NSObject
+
+@property (nonatomic, weak) id<EXUpdatesExternalInterface> controller;
+
++ (instancetype)sharedInstance;
+
+@end

package/ios/EXUpdatesInterface/EXUpdatesControllerRegistry.m

@@ -0,0 +1,19 @@
+//  Copyright © 2022-present 650 Industries. All rights reserved.
+
+#import <EXUpdatesInterface/EXUpdatesControllerRegistry.h>
+
+@implementation EXUpdatesControllerRegistry
+
++ (instancetype)sharedInstance
+{
+  static EXUpdatesControllerRegistry *theRegistry;
+  static dispatch_once_t once;
+  dispatch_once(&once, ^{
+    if (!theRegistry) {
+      theRegistry = [[EXUpdatesControllerRegistry alloc] init];
+    }
+  });
+  return theRegistry;
+}
+
+@end

package/ios/EXUpdatesInterface/EXUpdatesExternalInterface.h

@@ -0,0 +1,46 @@
+//  Copyright © 2021 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^EXUpdatesErrorBlock) (NSError *error);
+typedef void (^EXUpdatesUpdateSuccessBlock) (NSDictionary * _Nullable manifest);
+typedef void (^EXUpdatesQuerySuccessBlock) (NSArray<NSUUID *> * _Nonnull updateIds);
+typedef void (^EXUpdatesProgressBlock) (NSUInteger successfulAssetCount, NSUInteger failedAssetCount, NSUInteger totalAssetCount);
+/**
+ * Called when a manifest has been downloaded. The return value indicates whether or not to
+ * continue downloading the update described by this manifest. Returning `NO` will abort the
+ * load, and the success block will be immediately called with a nil `manifest`.
+ */
+typedef BOOL (^EXUpdatesManifestBlock) (NSDictionary *manifest);
+
+/**
+ * Protocol for modules that depend on expo-updates for loading production updates but do not want
+ * to depend on expo-updates or delegate control to the singleton EXUpdatesAppController.
+ */
+@protocol EXUpdatesExternalInterface
+
+@property (nonatomic, weak) id bridge;
+
+- (NSURL *)launchAssetURL;
+
+- (void)reset;
+
+- (void)fetchUpdateWithConfiguration:(NSDictionary *)configuration
+                          onManifest:(EXUpdatesManifestBlock)manifestBlock
+                            progress:(EXUpdatesProgressBlock)progressBlock
+                             success:(EXUpdatesUpdateSuccessBlock)successBlock
+                               error:(EXUpdatesErrorBlock)errorBlock;
+
+/**
+ * Obtains a list of UUIDs for updates already in the updates DB that are in the READY state.
+ * The success block will pass in the array of UUIDs
+ */
+- (void)storedUpdateIdsWithConfiguration:(NSDictionary *)configuration
+                                 success:(EXUpdatesQuerySuccessBlock)successBlock
+                                   error:(EXUpdatesErrorBlock)errorBlock;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/EXUpdatesInterface.podspec

@@ -11,22 +11,13 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '13.0'
-  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
-  s.source_files = 'EXUpdatesInterface/**/*.{h,m,swift}'
+  s.source_files   = 'EXUpdatesInterface/**/*.{h,m}'
+  s.preserve_paths = 'EXUpdatesInterface/**/*.{h,m}'
+  s.requires_arc   = true
 
-  # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
-    'GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS' => 'YES',
-    'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
     'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
-  }
-
-  s.script_phase = {
-    :name => 'Copy Swift Header',
-    :script => 'COMPATIBILITY_HEADER_PATH="${BUILT_PRODUCTS_DIR}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"; ditto "${COMPATIBILITY_HEADER_PATH}" "${PODS_ROOT}/Headers/Public/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}-Swift.h"',
-    :execution_position => :after_compile
   }
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates-interface",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Native interface for modules that optionally depend on expo-updates, e.g. expo-dev-launcher.",
   "main": "index.js",
   "keywords": [
@@ -23,5 +23,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
+  "gitHead": "69f32b825787c4c99c14898a9a854db7524e82fe"
 }

package/ios/EXUpdatesInterface/UpdatesControllerRegistry.swift

@@ -1,11 +0,0 @@
-//  Copyright © 2022-present 650 Industries. All rights reserved.
-
-import Foundation
-
-@objc(EXUpdatesControllerRegistry)
-@objcMembers
-public final class UpdatesControllerRegistry: NSObject {
-  public weak var controller: UpdatesExternalInterface?
-
-  public static let sharedInstance = UpdatesControllerRegistry()
-}

package/ios/EXUpdatesInterface/UpdatesExternalInterface.swift

@@ -1,45 +0,0 @@
-//  Copyright © 2021 650 Industries. All rights reserved.
-
-import Foundation
-
-public typealias UpdatesErrorBlock = (_ error: Error) -> Void
-public typealias UpdatesUpdateSuccessBlock = (_ manifest: [String: Any]?) -> Void
-public typealias UpdatesQuerySuccessBlock = (_ updateIds: [UUID]) -> Void
-public typealias UpdatesProgressBlock = (_ successfulAssetCount: UInt, _ failedAssetCount: UInt, _ totalAssetCount: UInt) -> Void
-
-/**
- * Called when a manifest has been downloaded. The return value indicates whether or not to
- * continue downloading the update described by this manifest. Returning `NO` will abort the
- * load, and the success block will be immediately called with a nil `manifest`.
- */
-public typealias UpdatesManifestBlock = (_ manifest: [String: Any]) -> Bool
-
-/**
- * Protocol for modules that depend on expo-updates for loading production updates but do not want
- * to depend on expo-updates or delegate control to the singleton EXUpdatesAppController.
- */
-@objc(EXUpdatesExternalInterface)
-public protocol UpdatesExternalInterface {
-  @objc weak var bridge: AnyObject? { get set }
-  @objc var launchAssetURL: URL? { get }
-
-  @objc func reset()
-
-  @objc func fetchUpdate(
-    withConfiguration configuration: [String: Any],
-    onManifest manifestBlock: @escaping UpdatesManifestBlock,
-    progress progressBlock: @escaping UpdatesProgressBlock,
-    success successBlock: @escaping UpdatesUpdateSuccessBlock,
-    error errorBlock: @escaping UpdatesErrorBlock
-  )
-
-  /**
-   * Obtains a list of UUIDs for updates already in the updates DB that are in the READY state.
-   * The success block will pass in the array of UUIDs
-   */
-  @objc func storedUpdateIds(
-    withConfiguration configuration: [String: Any],
-    success successBlock: @escaping UpdatesQuerySuccessBlock,
-    error errorBlock: @escaping UpdatesErrorBlock
-  )
-}