expo-updates 0.10.0 → 0.10.4

package/CHANGELOG.md

@@ -10,6 +10,30 @@
 
 ### 💡 Others
 
+## 0.10.4 — 2021-10-15
+
+### 🐛 Bug fixes
+
+- Fix auto setup `EXUpdatesAppDelegate` breaking reanimated installation. ([#14755](https://github.com/expo/expo/pull/14755) by [@kudo](https://github.com/kudo))
+
+## 0.10.3 — 2021-10-12
+
+### 🐛 Bug fixes
+
+- Fix `Updates.reloadAsync` behavior in bare apps when a new update is available (downloaded). ([#14706](https://github.com/expo/expo/pull/14706) by [@esamelson](https://github.com/esamelson))
+
+## 0.10.2 — 2021-10-01
+
+### 🐛 Bug fixes
+
+- Fix expo-screen-orientation breaking for expo-updates + expo-splash-screen integration. ([#14519](https://github.com/expo/expo/pull/14519) by [@kudo](https://github.com/kudo))
+
+## 0.10.1 — 2021-09-28
+
+### 🎉 New features
+
+- [android] Make asset "type" key nullable ([#14499](https://github.com/expo/expo/pull/14499) by [@jkhales](https://github.com/jkhales))
+
 ## 0.10.0 — 2021-09-28
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.10.0'
+version = '0.10.4'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -59,7 +59,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 31
-    versionName '0.10.0'
+    versionName '0.10.4'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     // uncomment below to export the database schema when making changes

package/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.java

@@ -22,7 +22,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase;
 
 import java.util.Date;
 
-@Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 6)
+@Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 7)
 @TypeConverters({Converters.class})
 public abstract class UpdatesDatabase extends RoomDatabase {
 
@@ -39,6 +39,8 @@ public abstract class UpdatesDatabase extends RoomDatabase {
     if (sInstance == null) {
       sInstance = Room.databaseBuilder(context, UpdatesDatabase.class, DB_NAME)
               .addMigrations(MIGRATION_4_5)
+              .addMigrations(MIGRATION_5_6)
+              .addMigrations(MIGRATION_6_7)
               .fallbackToDestructiveMigration()
               .allowMainThreadQueries()
               .build();
@@ -96,4 +98,32 @@ public abstract class UpdatesDatabase extends RoomDatabase {
       }
     }
   };
+
+  /**
+   * Make the `assets` table `type` column nullable
+   */
+  static final Migration MIGRATION_6_7 = new Migration(6, 7) {
+    @Override
+    public void migrate(@NonNull SupportSQLiteDatabase database) {
+      // https://www.sqlite.org/lang_altertable.html#otheralter
+      database.execSQL("PRAGMA foreign_keys=OFF");
+      database.beginTransaction();
+      try {
+        try {
+           database.execSQL("CREATE TABLE IF NOT EXISTS `new_assets` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT, `key` TEXT, `headers` TEXT, `type` TEXT, `metadata` TEXT, `download_time` INTEGER, `relative_path` TEXT, `hash` BLOB, `hash_type` INTEGER NOT NULL, `marked_for_deletion` INTEGER NOT NULL)");
+           database.execSQL("INSERT INTO `new_assets` (`id`, `url`, `key`, `headers`, `type`, `metadata`, `download_time`, `relative_path`, `hash`, `hash_type`, `marked_for_deletion`)" +
+                                              " SELECT `id`, `url`, `key`, `headers`, `type`, `metadata`, `download_time`, `relative_path`, `hash`, `hash_type`, `marked_for_deletion` FROM `assets`");
+           database.execSQL("DROP TABLE `assets`");
+           database.execSQL("ALTER TABLE `new_assets` RENAME TO `assets`");
+           database.execSQL("CREATE UNIQUE INDEX `index_assets_key` ON `assets` (`key`)");
+
+           database.setTransactionSuccessful();
+        } finally {
+          database.endTransaction();
+        }
+      } finally {
+        database.execSQL("PRAGMA foreign_keys=ON");
+      }
+    }
+  };
 }

package/android/src/main/java/expo/modules/updates/db/entity/AssetEntity.java

@@ -29,7 +29,6 @@ public class AssetEntity {
 
   public JSONObject headers = null;
 
-  @NonNull
   public String type;
 
   public JSONObject metadata = null;

package/ios/EXUpdates/AppLoader/EXUpdatesEmbeddedAppLoader.m

@@ -30,6 +30,15 @@ static NSString * const EXUpdatesEmbeddedAppLoaderErrorDomain = @"EXUpdatesEmbed
       NSBundle *bundle = [NSBundle bundleWithURL:bundleUrl];
       NSString *path = [bundle pathForResource:EXUpdatesEmbeddedManifestName ofType:EXUpdatesEmbeddedManifestType];
       NSData *manifestData = [NSData dataWithContentsOfFile:path];
+
+      // Fallback to main bundle if the embedded manifest is not found in EXUpdates.bundle. This is a special case
+      // to support the existing structure of Expo "shell apps"
+      if (!manifestData) {
+        path = [[NSBundle mainBundle] pathForResource:EXUpdatesEmbeddedManifestName ofType:EXUpdatesEmbeddedManifestType];
+        manifestData = [NSData dataWithContentsOfFile:path];
+      }
+
+      // Not found in EXUpdates.bundle or main bundle
       if (!manifestData) {
         @throw [NSException exceptionWithName:NSInternalInconsistencyException
                                        reason:@"The embedded manifest is invalid or could not be read. Make sure you have configured expo-updates correctly in your Xcode Build Phases."

package/ios/EXUpdates/EXUpdatesAppController.m

@@ -146,27 +146,27 @@ static NSString * const EXUpdatesErrorEventName = @"error";
 
 - (void)startAndShowLaunchScreen:(UIWindow *)window
 {
+  UIView *view = nil;
   NSBundle *mainBundle = [NSBundle mainBundle];
-  UIViewController *rootViewController = [UIViewController new];
   NSString *launchScreen = (NSString *)[mainBundle objectForInfoDictionaryKey:@"UILaunchStoryboardName"] ?: @"LaunchScreen";
   
   if ([mainBundle pathForResource:launchScreen ofType:@"nib"] != nil) {
     NSArray *views = [mainBundle loadNibNamed:launchScreen owner:self options:nil];
-    rootViewController.view = views.firstObject;
-    rootViewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    view = views.firstObject;
+    view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   } else if ([mainBundle pathForResource:launchScreen ofType:@"storyboard"] != nil ||
              [mainBundle pathForResource:launchScreen ofType:@"storyboardc"] != nil) {
     UIStoryboard *launchScreenStoryboard = [UIStoryboard storyboardWithName:launchScreen bundle:nil];
-    rootViewController = [launchScreenStoryboard instantiateInitialViewController];
+    UIViewController *viewController = [launchScreenStoryboard instantiateInitialViewController];
+    view = viewController.view;
+    viewController.view = nil;
   } else {
     NSLog(@"Launch screen could not be loaded from a .xib or .storyboard. Unexpected loading behavior may occur.");
-    UIView *view = [UIView new];
+    view = [UIView new];
     view.backgroundColor = [UIColor whiteColor];
-    rootViewController.view = view;
   }
   
-  window.rootViewController = rootViewController;
-  [window makeKeyAndVisible];
+  window.rootViewController.view = view;
 
   [self start];
 }

package/ios/EXUpdates/EXUpdatesAppDelegate.m

@@ -21,6 +21,7 @@
 @interface EXUpdatesAppDelegate() <EXUpdatesAppControllerDelegate>
 
 @property (nonatomic, strong) NSDictionary *launchOptions;
+@property (nonatomic, strong) EXUpdatesBridgeDelegateInterceptor *bridgeDelegate;
 
 @end
 
@@ -95,10 +96,10 @@ EX_REGISTER_SINGLETON_MODULE(EXUpdatesAppDelegate)
   if (![UIApplication.sharedApplication.delegate conformsToProtocol:@protocol(RCTBridgeDelegate)]) {
     [NSException raise:NSInvalidArgumentException format:@"AppDelegate does not conforms to RCTBridgeDelegate"];
   }
-  EXUpdatesBridgeDelegateInterceptor* bridgeDelegate = [[EXUpdatesBridgeDelegateInterceptor alloc]
-                                                        initWithBridgeDelegate:(id<RCTBridgeDelegate>)UIApplication.sharedApplication.delegate];
+  self.bridgeDelegate = [[EXUpdatesBridgeDelegateInterceptor alloc]
+                         initWithBridgeDelegate:(id<RCTBridgeDelegate>)UIApplication.sharedApplication.delegate];
 
-  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:bridgeDelegate launchOptions:self.launchOptions];
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self.bridgeDelegate launchOptions:self.launchOptions];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
   id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
   if (rootViewBackgroundColor != nil) {
@@ -107,11 +108,8 @@ EX_REGISTER_SINGLETON_MODULE(EXUpdatesAppDelegate)
     rootView.backgroundColor = [UIColor whiteColor];
   }
 
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
   UIWindow *window = UIApplication.sharedApplication.delegate.window;
-  window.rootViewController = rootViewController;
-  [window makeKeyAndVisible];
+  window.rootViewController.view = rootView;
 
   return bridge;
  }
@@ -128,6 +126,11 @@ EX_REGISTER_SINGLETON_MODULE(EXUpdatesAppDelegate)
   return self;
 }
 
+- (BOOL)conformsToProtocol:(Protocol *)protocol
+{
+  return [self.bridgeDelegate conformsToProtocol:protocol];
+}
+
 - (id)forwardingTargetForSelector:(SEL)selector {
   if ([self isInterceptedSelector:selector]) {
     return self;

package/ios/EXUpdates/Update/EXUpdatesNewUpdate.m

@@ -39,6 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
   NSMutableArray<EXUpdatesAsset *> *processedAssets = [NSMutableArray new];
 
   NSString *bundleKey = launchAsset[@"key"];
+  // TODO-JJ save launch assets with no file extension to match android
   EXUpdatesAsset *jsBundleAsset = [[EXUpdatesAsset alloc] initWithKey:bundleKey type:EXUpdatesEmbeddedBundleFileType];
   jsBundleAsset.url = bundleUrl;
   jsBundleAsset.isLaunchAsset = YES;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.10.0",
+  "version": "0.10.4",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,8 +37,8 @@
     "@expo/config": "^5.0.9",
     "@expo/config-plugins": "^3.1.0",
     "@expo/metro-config": "~0.1.84",
-    "expo-manifests": "~0.2.0",
-    "expo-modules-core": "~0.4.0",
+    "expo-manifests": "~0.2.2",
+    "expo-modules-core": "~0.4.3",
     "expo-structured-headers": "~2.0.0",
     "expo-updates-interface": "~0.4.0",
     "fbemitter": "^2.1.1",
@@ -50,5 +50,5 @@
     "fs-extra": "^9.1.0",
     "memfs": "^3.2.0"
   },
-  "gitHead": "1fffde73411ee7a642b98f1506a8de921805d52b"
+  "gitHead": "d23e1ac491da96b51c25eb2533efcd56499ee287"
 }