expo-updates-interface 0.15.3 → 0.16.1

package/CHANGELOG.md

@@ -10,15 +10,28 @@
 
 ### 💡 Others
 
-## 0.15.3 — 2024-01-18
+## 0.16.1 — 2024-04-29
 
 _This version does not introduce any user-facing changes._
 
-## 0.15.2 — 2024-01-10
+## 0.16.0 — 2024-04-18
+
+### 💡 Others
+
+- Decouple from "bridge" in `expo-updates`. ([#27216](https://github.com/expo/expo/pull/27216) by [@kudo](https://github.com/kudo))
+- Migrated expo-updates-interface to Kotlin. ([#28033](https://github.com/expo/expo/pull/28033) by [@kudo](https://github.com/kudo))
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
+- Aligned `UpdatesControllerRegistry` with iOS for a better expo-updates and expo-dev-launcher interoperability. ([#27996](https://github.com/expo/expo/pull/27996) by [@kudo](https://github.com/kudo))
+
+## 0.15.3 - 2024-01-18
+
+_This version does not introduce any user-facing changes._
+
+## 0.15.2 - 2024-01-10
 
 _This version does not introduce any user-facing changes._
 
-## 0.15.1 — 2023-12-19
+## 0.15.1 - 2023-12-19
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -1,107 +1,19 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.15.3'
+version = '0.16.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-if (expoModulesCorePlugin.exists()) {
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-
-  // Remove this check, but keep the contents after SDK49 support is dropped
-  if (safeExtGet("expoProvidesDefaultConfig", false)) {
-    useExpoPublishing()
-  }
-}
-
-buildscript {
-  // Simple helper that allows the root project to override versions declared by this library.
-  ext.safeExtGet = { prop, fallback ->
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
-
-  // Ensures backward compatibility
-  ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-// Remove this if and it's contents, when support for SDK49 is dropped
-if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-  afterEvaluate {
-    publishing {
-      publications {
-        release(MavenPublication) {
-          from components.release
-        }
-      }
-      repositories {
-        maven {
-          url = mavenLocal().url
-        }
-      }
-    }
-  }
-}
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
+useExpoPublishing()
 
 android {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-
-    publishing {
-      singleVariant("release") {
-        withSourcesJar()
-      }
-    }
-
-    lintOptions {
-      abortOnError false
-    }
-  }
-
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.majorVersion
-    }
-  }
-
   namespace "expo.modules.updatesinterface"
   defaultConfig {
     versionCode 1
-    versionName '0.15.3'
+    versionName '0.16.1'
   }
 }
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-}

package/android/src/main/java/expo/modules/updatesinterface/UpdatesControllerRegistry.kt

@@ -0,0 +1,7 @@
+package expo.modules.updatesinterface
+
+import java.lang.ref.WeakReference
+
+object UpdatesControllerRegistry {
+  var controller: WeakReference<UpdatesInterface>? = null
+}

package/android/src/main/java/expo/modules/updatesinterface/UpdatesInterface.kt

@@ -0,0 +1,34 @@
+package expo.modules.updatesinterface
+
+import android.content.Context
+import org.json.JSONObject
+import java.lang.ref.WeakReference
+
+/**
+ * Interface 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 UpdatesController.
+ */
+interface UpdatesInterface {
+  interface UpdateCallback {
+    fun onFailure(e: Exception?)
+    fun onSuccess(update: Update?)
+    fun onProgress(successfulAssetCount: Int, failedAssetCount: Int, totalAssetCount: Int)
+
+    /**
+     * Called when a manifest has been downloaded. The return value indicates whether or not to
+     * continue downloading the update described by this manifest. Returning `false` will abort the
+     * load, and the `onSuccess` callback will be immediately called with a null `update`.
+     */
+    fun onManifestLoaded(manifest: JSONObject): Boolean
+  }
+
+  interface Update {
+    val manifest: JSONObject
+    val launchAssetPath: String
+  }
+
+  var updatesInterfaceCallbacks: WeakReference<UpdatesInterfaceCallbacks>?
+
+  fun reset()
+  fun fetchUpdateWithConfiguration(configuration: HashMap<String, Any>, context: Context, callback: UpdateCallback)
+}

package/android/src/main/java/expo/modules/updatesinterface/UpdatesInterfaceCallbacks.kt

@@ -0,0 +1,5 @@
+package expo.modules.updatesinterface
+
+interface UpdatesInterfaceCallbacks {
+  fun onRequestRelaunch()
+}

package/ios/EXUpdatesInterface/UpdatesExternalInterface.swift

@@ -1,6 +1,7 @@
 //  Copyright © 2021 650 Industries. All rights reserved.
 
 import Foundation
+import ExpoModulesCore
 
 public typealias UpdatesErrorBlock = (_ error: Error) -> Void
 public typealias UpdatesUpdateSuccessBlock = (_ manifest: [String: Any]?) -> Void
@@ -19,7 +20,7 @@ public typealias UpdatesManifestBlock = (_ manifest: [String: Any]) -> Bool
  */
 @objc(EXUpdatesExternalInterface)
 public protocol UpdatesExternalInterface {
-  @objc weak var bridge: AnyObject? { get set }
+  @objc weak var appContext: AppContext? { get set }
   @objc weak var updatesExternalInterfaceDelegate: (any UpdatesExternalInterfaceDelegate)? { get set }
   @objc var launchAssetURL: URL? { get }
 

package/ios/EXUpdatesInterface.podspec

@@ -26,4 +26,6 @@ Pod::Spec.new do |s|
   s.user_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdatesInterface/Swift Compatibility Header"',
   }
+
+  s.dependency 'ExpoModulesCore'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates-interface",
-  "version": "0.15.3",
+  "version": "0.16.1",
   "description": "Native interface for modules that optionally depend on expo-updates, e.g. expo-dev-launcher.",
   "main": "index.js",
   "keywords": [
@@ -18,10 +18,10 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
+  "homepage": "https://docs.expo.dev",
   "dependencies": {},
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "102899632731658eecba006c0d1c79b98ba8f5f7"
+  "gitHead": "4a7cf0d0baf6dfc595d93f604945d2142e705a36"
 }

package/android/src/main/java/expo/modules/updatesinterface/UpdatesInterface.java

@@ -1,38 +0,0 @@
-package expo.modules.updatesinterface;
-
-import android.content.Context;
-
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * Interface 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 UpdatesController.
- */
-public interface UpdatesInterface {
-
-  interface UpdateCallback {
-    void onFailure(Exception e);
-    void onSuccess(Update update);
-    void onProgress(int successfulAssetCount, int failedAssetCount, int 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 `false` will abort the
-     * load, and the `onSuccess` callback will be immediately called with a null `update`.
-     */
-    boolean onManifestLoaded(JSONObject manifest);
-  }
-  
-  interface Update {
-    JSONObject getManifest();
-    String getLaunchAssetPath();
-  }
-
-  void reset();
-
-  void fetchUpdateWithConfiguration(HashMap<String, Object> configuration, Context context, UpdateCallback callback);
-}

package/android/src/main/java/expo/modules/updatesinterface/UpdatesInterfaceCallbacks.java

@@ -1,5 +0,0 @@
-package expo.modules.updatesinterface;
-
-public interface UpdatesInterfaceCallbacks {
-    void onRequestRelaunch();
-}