expo-manifests 0.13.2 → 0.14.1

package/CHANGELOG.md

@@ -10,11 +10,28 @@
 
 ### 💡 Others
 
-## 0.13.2 — 2024-01-18
+## 0.14.1 — 2024-04-29
 
 _This version does not introduce any user-facing changes._
 
-## 0.13.1 — 2024-01-10
+## 0.14.0 — 2024-04-18
+
+### 🛠 Breaking changes
+
+- Remove classic updates. ([#26036](https://github.com/expo/expo/pull/26036), [#26048](https://github.com/expo/expo/pull/26048) by [@wschurman](https://github.com/wschurman))
+
+### 💡 Others
+
+- [Android] Remove unsafe internal mutation capability. ([#26229](https://github.com/expo/expo/pull/26229) by [@wschurman](https://github.com/wschurman))
+- Rename manifest classes. ([#26234](https://github.com/expo/expo/pull/26234), [#26235](https://github.com/expo/expo/pull/26235), [#26257](https://github.com/expo/expo/pull/26257) by [@wschurman](https://github.com/wschurman))
+- Remove use of legacy sdkVersion runtimeVersion policy. ([#26957](https://github.com/expo/expo/pull/26957) by [@wschurman](https://github.com/wschurman))
+- Removed deprecated backward compatible Gradle settings. ([#28083](https://github.com/expo/expo/pull/28083) by [@kudo](https://github.com/kudo))
+
+## 0.13.2 - 2024-01-18
+
+_This version does not introduce any user-facing changes._
+
+## 0.13.1 - 2024-01-10
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -1,99 +1,20 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.13.2'
+version = '0.14.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.manifests"
   defaultConfig {
     versionCode 31
-    versionName '0.13.2'
+    versionName '0.14.1'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   testOptions {
@@ -113,9 +34,4 @@ dependencies {
   testImplementation 'io.mockk:mockk:1.13.5'
   testImplementation 'org.json:json:20230227'
   testImplementation "com.google.truth:truth:1.1.2"
-
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-}
-repositories {
-  mavenCentral()
 }

package/android/src/main/java/expo/modules/manifests/core/{BaseLegacyManifest.kt → EmbeddedManifest.kt}

@@ -6,7 +6,16 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-abstract class BaseLegacyManifest(json: JSONObject) : Manifest(json) {
+class EmbeddedManifest(json: JSONObject) : Manifest(json) {
+  /**
+   * A UUID for this manifest.
+   */
+  @Throws(JSONException::class)
+  fun getID(): String = json.require("id")
+
+  @Throws(JSONException::class)
+  fun getCommitTimeLong(): Long = json.require("commitTime")
+
   override fun getStableLegacyID(): String = json.getNullable("originalFullName") ?: getLegacyID()
 
   override fun getScopeKey(): String = json.getNullable("scopeKey") ?: getStableLegacyID()
@@ -20,17 +29,15 @@ abstract class BaseLegacyManifest(json: JSONObject) : Manifest(json) {
 
   override fun getExpoGoSDKVersion(): String? = json.getNullable("sdkVersion")
 
-  override fun getExpoGoConfigRootObject(): JSONObject? {
+  override fun getExpoGoConfigRootObject(): JSONObject {
     return json
   }
 
-  override fun getExpoClientConfigRootObject(): JSONObject? {
+  override fun getExpoClientConfigRootObject(): JSONObject {
     return json
   }
 
   override fun getSlug(): String? = json.getNullable("slug")
 
   override fun getAppKey(): String? = json.getNullable("appKey")
-
-  fun getCommitTime(): String? = json.getNullable("commitTime")
 }

package/android/src/main/java/expo/modules/manifests/core/{NewManifest.kt → ExpoUpdatesManifest.kt}

@@ -5,10 +5,8 @@ import expo.modules.jsonutils.require
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import java.util.regex.Matcher
-import java.util.regex.Pattern
 
-class NewManifest(json: JSONObject) : Manifest(json) {
+class ExpoUpdatesManifest(json: JSONObject) : Manifest(json) {
   /**
    * An ID representing this manifest, not the ID for the experience.
    */
@@ -33,23 +31,8 @@ class NewManifest(json: JSONObject) : Manifest(json) {
   @Throws(JSONException::class)
   override fun getBundleURL(): String = getLaunchAsset().require("url")
 
-  @Deprecated(message = "exposdk:... runtime version is deprecated")
-  private fun getSDKVersionFromRuntimeVersion(): String? {
-    val runtimeVersion = getRuntimeVersion()
-    if (runtimeVersion == "exposdk:UNVERSIONED") {
-      return "UNVERSIONED"
-    }
-
-    val expoSDKRuntimeVersionRegex: Pattern = Pattern.compile("^exposdk:(\\d+\\.\\d+\\.\\d+)$")
-    val expoSDKRuntimeVersionMatch: Matcher = expoSDKRuntimeVersionRegex.matcher(runtimeVersion)
-    if (expoSDKRuntimeVersionMatch.find()) {
-      return expoSDKRuntimeVersionMatch.group(1)!!
-    }
-    return null
-  }
-
   override fun getExpoGoSDKVersion(): String? {
-    return getExpoClientConfigRootObject()?.getString("sdkVersion") ?: getSDKVersionFromRuntimeVersion()
+    return getExpoClientConfigRootObject()?.getString("sdkVersion")
   }
 
   @Throws(JSONException::class)

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

@@ -6,20 +6,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-interface InternalJSONMutator {
-  @Throws(JSONException::class)
-  fun updateJSON(json: JSONObject)
-}
-
 abstract class Manifest(protected val json: JSONObject) {
-  @Deprecated(message = "Strive for manifests to be immutable")
-  @Throws(JSONException::class)
-  fun mutateInternalJSONInPlace(internalJSONMutator: InternalJSONMutator) {
-    json.apply {
-      internalJSONMutator.updateJSON(this)
-    }
-  }
-
   @Deprecated(message = "Prefer to use specific field getters")
   fun getRawJson(): JSONObject = json
 
@@ -244,14 +231,16 @@ abstract class Manifest(protected val json: JSONObject) {
   companion object {
     @JvmStatic fun fromManifestJson(manifestJson: JSONObject): Manifest {
       return when {
+        // TODO(wschurman): remove error in a few major releases after SDK 51 when it's unlikely classic updates
+        // may erroneously be served
         manifestJson.has("releaseId") -> {
-          LegacyManifest(manifestJson)
+          throw Exception("Legacy manifests are no longer supported")
         }
         manifestJson.has("metadata") -> {
-          NewManifest(manifestJson)
+          ExpoUpdatesManifest(manifestJson)
         }
         else -> {
-          BareManifest(manifestJson)
+          EmbeddedManifest(manifestJson)
         }
       }
     }

package/build/Manifests.d.ts

@@ -46,9 +46,9 @@ export type ExpoGoPackagerOpts = {
     [key: string]: any;
 };
 /**
- * A modern manifest.
+ * A expo-updates manifest.
  */
-export type NewManifest = {
+export type ExpoUpdatesManifest = {
     id: string;
     createdAt: string;
     runtimeVersion: string;
@@ -58,13 +58,23 @@ export type NewManifest = {
     extra?: ManifestExtra;
 };
 /**
- * An embedded bare manifest.
+ * @deprecated renamed to ExpoUpdatesManifest, will be removed in a few versions
+ * @see ExpoUpdatesManifest
+ */
+export type NewManifest = ExpoUpdatesManifest;
+/**
+ * An embedded manifest.
  *
  * Generated during build in createManifest.js build step script.
  */
-export type BareManifest = {
+export type EmbeddedManifest = {
     id: string;
     commitTime: number;
     assets: any[];
 };
+/**
+ * @deprecated renamed to EmbeddedManifest, will be removed in a few versions
+ * @see EmbeddedManifest
+ */
+export type BareManifest = EmbeddedManifest;
 //# sourceMappingURL=Manifests.d.ts.map

package/build/Manifests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Manifests.d.ts","sourceRoot":"","sources":["../src/Manifests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAChD,UAAU,CAAC,EAAE,UAAU,GAAG;QACxB;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,SAAS,CAAC;CACjB,CAAC;AAGF,MAAM,MAAM,SAAS,GAAG;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAGF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC,CAAC;AAGF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,CAAC;CACf,CAAC"}
+{"version":3,"file":"Manifests.d.ts","sourceRoot":"","sources":["../src/Manifests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAChD,UAAU,CAAC,EAAE,UAAU,GAAG;QACxB;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,SAAS,CAAC;CACjB,CAAC;AAGF,MAAM,MAAM,SAAS,GAAG;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAGF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC,CAAC;AAGF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAE9C;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,CAAC;CACf,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,gBAAgB,CAAC"}

package/build/Manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"Manifests.js","sourceRoot":"","sources":["../src/Manifests.ts"],"names":[],"mappings":"","sourcesContent":["import { ExpoConfig } from '@expo/config-types';\n\n// @docsMissing\nexport interface ManifestAsset {\n  url: string;\n}\n// @docsMissing\nexport type ManifestExtra = ClientScopingConfig & {\n  expoClient?: ExpoConfig & {\n    /**\n     * Only present during development using @expo/cli.\n     */\n    hostUri?: string;\n  };\n  expoGo?: ExpoGoConfig;\n  eas?: EASConfig;\n};\n\n// @needsAudit\nexport type EASConfig = {\n  /**\n   * The ID for this project if it's using EAS. UUID. This value will not change when a project is\n   * transferred between accounts or renamed.\n   */\n  projectId?: string;\n};\n\n// @needsAudit\nexport type ClientScopingConfig = {\n  /**\n   * An opaque unique string for scoping client-side data to this project. This value\n   * will not change when a project is transferred between accounts or renamed.\n   */\n  scopeKey?: string;\n};\n\n// @docsMissing\nexport type ExpoGoConfig = {\n  mainModuleName?: string;\n  debuggerHost?: string;\n  developer?: {\n    tool?: string;\n    [key: string]: any;\n  };\n  packagerOpts?: ExpoGoPackagerOpts;\n};\n\n// @docsMissing\nexport type ExpoGoPackagerOpts = {\n  hostType?: string;\n  dev?: boolean;\n  strict?: boolean;\n  minify?: boolean;\n  urlType?: string;\n  urlRandomness?: string;\n  lanType?: string;\n  [key: string]: any;\n};\n\n/**\n * A modern manifest.\n */\nexport type NewManifest = {\n  id: string;\n  createdAt: string;\n  runtimeVersion: string;\n  launchAsset: ManifestAsset;\n  assets: ManifestAsset[];\n  metadata: object;\n  extra?: ManifestExtra;\n};\n\n/**\n * An embedded bare manifest.\n *\n * Generated during build in createManifest.js build step script.\n */\nexport type BareManifest = {\n  id: string;\n  commitTime: number;\n  assets: any[]; // intentionally underspecified for now since there are no uses in JS\n};\n"]}
+{"version":3,"file":"Manifests.js","sourceRoot":"","sources":["../src/Manifests.ts"],"names":[],"mappings":"","sourcesContent":["import { ExpoConfig } from '@expo/config-types';\n\n// @docsMissing\nexport interface ManifestAsset {\n  url: string;\n}\n// @docsMissing\nexport type ManifestExtra = ClientScopingConfig & {\n  expoClient?: ExpoConfig & {\n    /**\n     * Only present during development using @expo/cli.\n     */\n    hostUri?: string;\n  };\n  expoGo?: ExpoGoConfig;\n  eas?: EASConfig;\n};\n\n// @needsAudit\nexport type EASConfig = {\n  /**\n   * The ID for this project if it's using EAS. UUID. This value will not change when a project is\n   * transferred between accounts or renamed.\n   */\n  projectId?: string;\n};\n\n// @needsAudit\nexport type ClientScopingConfig = {\n  /**\n   * An opaque unique string for scoping client-side data to this project. This value\n   * will not change when a project is transferred between accounts or renamed.\n   */\n  scopeKey?: string;\n};\n\n// @docsMissing\nexport type ExpoGoConfig = {\n  mainModuleName?: string;\n  debuggerHost?: string;\n  developer?: {\n    tool?: string;\n    [key: string]: any;\n  };\n  packagerOpts?: ExpoGoPackagerOpts;\n};\n\n// @docsMissing\nexport type ExpoGoPackagerOpts = {\n  hostType?: string;\n  dev?: boolean;\n  strict?: boolean;\n  minify?: boolean;\n  urlType?: string;\n  urlRandomness?: string;\n  lanType?: string;\n  [key: string]: any;\n};\n\n/**\n * A expo-updates manifest.\n */\nexport type ExpoUpdatesManifest = {\n  id: string;\n  createdAt: string;\n  runtimeVersion: string;\n  launchAsset: ManifestAsset;\n  assets: ManifestAsset[];\n  metadata: object;\n  extra?: ManifestExtra;\n};\n\n/**\n * @deprecated renamed to ExpoUpdatesManifest, will be removed in a few versions\n * @see ExpoUpdatesManifest\n */\nexport type NewManifest = ExpoUpdatesManifest;\n\n/**\n * An embedded manifest.\n *\n * Generated during build in createManifest.js build step script.\n */\nexport type EmbeddedManifest = {\n  id: string;\n  commitTime: number;\n  assets: any[]; // intentionally underspecified for now since there are no uses in JS\n};\n\n/**\n * @deprecated renamed to EmbeddedManifest, will be removed in a few versions\n * @see EmbeddedManifest\n */\nexport type BareManifest = EmbeddedManifest;\n"]}

package/ios/EXManifests/{BaseLegacyManifest.swift → EmbeddedManifest.swift}

@@ -2,9 +2,21 @@
 
 import Foundation
 
-@objc(EXManifestBaseLegacyManifest)
+@objc(EXManifestsEmbeddedManifest)
 @objcMembers
-public class BaseLegacyManifest: Manifest {
+public class EmbeddedManifest: Manifest {
+  public func rawId() -> String {
+    return rawManifestJSON().requiredValue(forKey: "id")
+  }
+
+  public func commitTimeNumber() -> Int {
+    return rawManifestJSON().requiredValue(forKey: "commitTime")
+  }
+
+  public func metadata() -> [String: Any]? {
+    return rawManifestJSON().optionalValue(forKey: "metadata")
+  }
+
   public override func expoClientConfigRootObject() -> [String: Any]? {
     return rawManifestJSON()
   }

package/ios/EXManifests/{NewManifest.swift → ExpoUpdatesManifest.swift}

@@ -2,9 +2,9 @@
 
 import Foundation
 
-@objc(EXManifestsNewManifest)
+@objc(EXManifestsExpoUpdatesManifest)
 @objcMembers
-public class NewManifest: Manifest {
+public class ExpoUpdatesManifest: Manifest {
   public func rawId() -> String {
     return rawManifestJSON().requiredValue(forKey: "id")
   }
@@ -37,28 +37,8 @@ public class NewManifest: Manifest {
     return rawManifestJSON().requiredValue(forKey: "runtimeVersion")
   }
 
-  private func getSDKVersionFromRuntimeVersion() -> String? {
-    let runtimeVersion = runtimeVersion()
-    if runtimeVersion == "exposdk:UNVERSIONED" {
-      return "UNVERSIONED"
-    }
-
-    // The pattern is valid, so it'll never throw
-    // swiftlint:disable:next force_try
-    let regex = try! NSRegularExpression(pattern: "^exposdk:(\\d+\\.\\d+\\.\\d+)$", options: [])
-    guard let match = regex.firstMatch(
-      in: runtimeVersion,
-      options: [],
-      range: NSRange(runtimeVersion.startIndex..<runtimeVersion.endIndex, in: runtimeVersion)
-    ),
-    let range = Range(match.range(at: 1), in: runtimeVersion) else {
-      return nil
-    }
-    return String(runtimeVersion[range])
-  }
-
   public override func expoGoSDKVersion() -> String? {
-    return expoClientConfigRootObject()?.optionalValue(forKey: "sdkVersion") ?? getSDKVersionFromRuntimeVersion()
+    return expoClientConfigRootObject()?.optionalValue(forKey: "sdkVersion")
   }
 
   public func launchAsset() -> [String: Any] {

package/ios/EXManifests/ManifestFactory.swift

@@ -6,12 +6,10 @@ import Foundation
 @objcMembers
 public class ManifestFactory: NSObject {
   public static func manifest(forManifestJSON: [String: Any]) -> Manifest {
-    if forManifestJSON["releaseId"] != nil {
-      return LegacyManifest(rawManifestJSON: forManifestJSON)
-    } else if forManifestJSON["metadata"] != nil {
-      return NewManifest(rawManifestJSON: forManifestJSON)
-    } else {
-      return BareManifest(rawManifestJSON: forManifestJSON)
+    if forManifestJSON["metadata"] != nil {
+      return ExpoUpdatesManifest(rawManifestJSON: forManifestJSON)
     }
+
+    return EmbeddedManifest(rawManifestJSON: forManifestJSON)
   }
 }

package/ios/Tests/{BareManifestSpec.swift → EmbeddedManifestSpec.swift}

@@ -8,7 +8,7 @@ enum ManifestTestError: Error {
     case testError
 }
 
-class BareManifestSpec : ExpoSpec {
+class EmbeddedManifestSpec : ExpoSpec {
   override class func spec() {
     describe("instantiation") {
       it("instantiates and reads properties") {
@@ -22,7 +22,7 @@ class BareManifestSpec : ExpoSpec {
           throw ManifestTestError.testError
         }
 
-        let manifest = BareManifest(rawManifestJSON: manifestJsonObject)
+        let manifest = EmbeddedManifest(rawManifestJSON: manifestJsonObject)
 
         expect(manifest.rawId()) == "0eef8214-4833-4089-9dff-b4138a14f196"
         expect(manifest.commitTimeNumber()) == 1609975977832

package/ios/Tests/{NewManifestSpec.swift → ExpoUpdatesManifestSpec.swift}

@@ -4,7 +4,7 @@ import ExpoModulesTestCore
 
 @testable import EXManifests
 
-class NewManifestSpec : ExpoSpec {
+class ExpoUpdatesManifestSpec : ExpoSpec {
   override class func spec() {
     describe("instantiation") {
       it("instantiates and reads properties") {
@@ -18,7 +18,7 @@ class NewManifestSpec : ExpoSpec {
           throw ManifestTestError.testError
         }
 
-        let manifest = NewManifest(rawManifestJSON: manifestJsonObject)
+        let manifest = ExpoUpdatesManifest(rawManifestJSON: manifestJsonObject)
 
         expect(manifest.rawId()) == "0eef8214-4833-4089-9dff-b4138a14f196"
         expect(manifest.createdAt()) == "2020-11-11T00:17:54.797Z"
@@ -62,34 +62,27 @@ class NewManifestSpec : ExpoSpec {
 
     describe("SDK Version") {
       it("is correct with valid numeric case") {
-        let runtimeVersion = "exposdk:39.0.0"
-        let manifestJson = ["runtimeVersion": runtimeVersion]
-        let manifest = NewManifest(rawManifestJSON: manifestJson)
+        let manifestJson = [
+          "extra": [
+            "expoClient": [
+              "sdkVersion": "39.0.0"
+            ]
+          ]
+        ]
+        let manifest = ExpoUpdatesManifest(rawManifestJSON: manifestJson)
         expect(manifest.expoGoSDKVersion()) == "39.0.0"
       }
 
       it("is UNVERSIONED with valid unversioned case") {
-        let runtimeVersion = "exposdk:UNVERSIONED"
-        let manifestJson = ["runtimeVersion": runtimeVersion]
-        let manifest = NewManifest(rawManifestJSON: manifestJson)
-        expect(manifest.expoGoSDKVersion()) == "UNVERSIONED"
-      }
-
-      it("is nil with non-sdk runtime version cases") {
-        let runtimeVersions = [
-          "exposdk:123",
-          "exposdkd:39.0.0",
-          "exposdk:hello",
-          "bexposdk:39.0.0",
-          "exposdk:39.0.0-beta.0",
-          "exposdk:39.0.0-alpha.256"
+        let manifestJson = [
+          "extra": [
+            "expoClient": [
+              "sdkVersion": "UNVERSIONED"
+            ]
+          ]
         ]
-
-        for runtimeVersion in runtimeVersions {
-          let manifestJson = ["runtimeVersion": runtimeVersion]
-          let manifest = NewManifest(rawManifestJSON: manifestJson)
-          expect(manifest.expoGoSDKVersion()).to(beNil())
-        }
+        let manifest = ExpoUpdatesManifest(rawManifestJSON: manifestJson)
+        expect(manifest.expoGoSDKVersion()) == "UNVERSIONED"
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-manifests",
-  "version": "0.13.2",
+  "version": "0.14.1",
   "description": "Code to parse and use Expo and Expo Updates manifests.",
   "main": "build/Manifests.js",
   "types": "build/Manifests.d.ts",
@@ -29,13 +29,13 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
+  "homepage": "https://docs.expo.dev/versions/latest/sdk/manifests/",
   "jest": {
     "preset": "expo-module-scripts"
   },
   "dependencies": {
-    "expo-json-utils": "~0.12.0",
-    "@expo/config": "~8.5.0"
+    "@expo/config": "~9.0.0-beta.0",
+    "expo-json-utils": "~0.13.0"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -43,5 +43,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "102899632731658eecba006c0d1c79b98ba8f5f7"
+  "gitHead": "4a7cf0d0baf6dfc595d93f604945d2142e705a36"
 }

package/src/Manifests.ts

@@ -58,9 +58,9 @@ export type ExpoGoPackagerOpts = {
 };
 
 /**
- * A modern manifest.
+ * A expo-updates manifest.
  */
-export type NewManifest = {
+export type ExpoUpdatesManifest = {
   id: string;
   createdAt: string;
   runtimeVersion: string;
@@ -71,12 +71,24 @@ export type NewManifest = {
 };
 
 /**
- * An embedded bare manifest.
+ * @deprecated renamed to ExpoUpdatesManifest, will be removed in a few versions
+ * @see ExpoUpdatesManifest
+ */
+export type NewManifest = ExpoUpdatesManifest;
+
+/**
+ * An embedded manifest.
  *
  * Generated during build in createManifest.js build step script.
  */
-export type BareManifest = {
+export type EmbeddedManifest = {
   id: string;
   commitTime: number;
   assets: any[]; // intentionally underspecified for now since there are no uses in JS
 };
+
+/**
+ * @deprecated renamed to EmbeddedManifest, will be removed in a few versions
+ * @see EmbeddedManifest
+ */
+export type BareManifest = EmbeddedManifest;

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

@@ -1,16 +0,0 @@
-package expo.modules.manifests.core
-
-import expo.modules.jsonutils.require
-import org.json.JSONException
-import org.json.JSONObject
-
-class BareManifest(json: JSONObject) : BaseLegacyManifest(json) {
-  /**
-   * A UUID for this manifest.
-   */
-  @Throws(JSONException::class)
-  fun getID(): String = json.require("id")
-
-  @Throws(JSONException::class)
-  fun getCommitTimeLong(): Long = json.require("commitTime")
-}

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

@@ -1,22 +0,0 @@
-package expo.modules.manifests.core
-
-import expo.modules.jsonutils.getNullable
-import expo.modules.jsonutils.require
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-
-open class LegacyManifest(json: JSONObject) : BaseLegacyManifest(json) {
-  @Throws(JSONException::class)
-  fun getBundleKey(): String? = json.getNullable("bundleKey")
-
-  @Throws(JSONException::class)
-  fun getReleaseId(): String = json.require("releaseId")
-
-  fun getRuntimeVersion(): String? = json.getNullable("runtimeVersion")
-
-  @Throws(JSONException::class)
-  fun getBundledAssets(): JSONArray? = json.getNullable("bundledAssets")
-
-  open fun getAssetUrlOverride(): String? = json.getNullable("assetUrlOverride")
-}

package/ios/EXManifests/BareManifest.swift

@@ -1,19 +0,0 @@
-//  Copyright © 2021 650 Industries. All rights reserved.
-
-import Foundation
-
-@objc(EXManifestsBareManifest)
-@objcMembers
-public class BareManifest: BaseLegacyManifest {
-  public func rawId() -> String {
-    return rawManifestJSON().requiredValue(forKey: "id")
-  }
-
-  public func commitTimeNumber() -> Int {
-    return rawManifestJSON().requiredValue(forKey: "commitTime")
-  }
-
-  public func metadata() -> [String: Any]? {
-    return rawManifestJSON().optionalValue(forKey: "metadata")
-  }
-}

package/ios/EXManifests/LegacyManifest.swift

@@ -1,30 +0,0 @@
-//  Copyright © 2021 650 Industries. All rights reserved.
-import Foundation
-
-@objc(EXManifestsLegacyManifest)
-@objcMembers
-public class LegacyManifest: BaseLegacyManifest {
-  public func releaseID() -> String {
-    return rawManifestJSON().requiredValue(forKey: "releaseId")
-  }
-
-  public func commitTime() -> String {
-    return rawManifestJSON().requiredValue(forKey: "commitTime")
-  }
-
-  public func bundledAssets() -> [Any]? {
-    return rawManifestJSON().optionalValue(forKey: "bundledAssets")
-  }
-
-  public func runtimeVersion() -> Any? {
-    return rawManifestJSON().optionalValue(forKey: "runtimeVersion")
-  }
-
-  public func bundleKey() -> String? {
-    return rawManifestJSON().optionalValue(forKey: "bundleKey")
-  }
-
-  public func assetUrlOverride() -> String? {
-    return rawManifestJSON().optionalValue(forKey: "assetUrlOverride")
-  }
-}

package/ios/Tests/LegacyManifestSpec.swift

@@ -1,68 +0,0 @@
-//  Copyright (c) 2020 650 Industries, Inc. All rights reserved.
-
-import ExpoModulesTestCore
-
-@testable import EXManifests
-
-class LegacyManifestSpec : ExpoSpec {
-  override class func spec() {
-    describe("instantiation") {
-      it("instantiates and reads properties") {
-        let manifestJson = "{\"sdkVersion\":\"39.0.0\",\"id\":\"@esamelson/native-component-list\",\"releaseId\":\"0eef8214-4833-4089-9dff-b4138a14f196\",\"commitTime\":\"2020-11-11T00:17:54.797Z\",\"bundleUrl\":\"https://classic-assets.eascdn.net/%40esamelson%2Fnative-component-list%2F39.0.0%2F01c86fd863cfee878068eebd40f165df-39.0.0-ios.js\"}"
-        let manifestData = manifestJson.data(using: .utf8)
-        guard let manifestData = manifestData else {
-          throw ManifestTestError.testError
-        }
-        let manifestJsonObject = try JSONSerialization.jsonObject(with: manifestData)
-        guard let manifestJsonObject = manifestJsonObject as? [String: Any] else {
-          throw ManifestTestError.testError
-        }
-
-        let manifest = LegacyManifest(rawManifestJSON: manifestJsonObject)
-
-        expect(manifest.releaseID()) == "0eef8214-4833-4089-9dff-b4138a14f196"
-        expect(manifest.commitTime()) == "2020-11-11T00:17:54.797Z"
-        expect(manifest.bundledAssets()).to(beNil())
-        expect(manifest.runtimeVersion()).to(beNil())
-        expect(manifest.bundleKey()).to(beNil())
-        expect(manifest.assetUrlOverride()).to(beNil())
-
-        // from base class
-        expect(manifest.stableLegacyId()) == "@esamelson/native-component-list"
-        expect(manifest.scopeKey()) == "@esamelson/native-component-list"
-        expect(manifest.easProjectId()).to(beNil())
-        expect(manifest.bundleUrl()) == "https://classic-assets.eascdn.net/%40esamelson%2Fnative-component-list%2F39.0.0%2F01c86fd863cfee878068eebd40f165df-39.0.0-ios.js"
-        expect(manifest.expoGoSDKVersion()) == "39.0.0"
-
-        // from base base class
-        expect(manifest.legacyId()) == "@esamelson/native-component-list"
-        expect(manifest.revisionId()).to(beNil())
-        expect(manifest.slug()).to(beNil())
-        expect(manifest.appKey()).to(beNil())
-        expect(manifest.name()).to(beNil())
-        expect(manifest.version()).to(beNil())
-        expect(manifest.notificationPreferences()).to(beNil())
-        expect(manifest.updatesInfo()).to(beNil())
-        expect(manifest.iosConfig()).to(beNil())
-        expect(manifest.hostUri()).to(beNil())
-        expect(manifest.orientation()).to(beNil())
-        expect(manifest.experiments()).to(beNil())
-        expect(manifest.developer()).to(beNil())
-        expect(manifest.facebookAppId()).to(beNil())
-        expect(manifest.facebookApplicationName()).to(beNil())
-        expect(manifest.facebookAutoInitEnabled()) == false
-        expect(manifest.isDevelopmentMode()) == false
-        expect(manifest.isDevelopmentSilentLaunch()) == false
-        expect(manifest.isUsingDeveloperTool()) == false
-        expect(manifest.userInterfaceStyle()).to(beNil())
-        expect(manifest.iosOrRootBackgroundColor()).to(beNil())
-        expect(manifest.iosSplashBackgroundColor()).to(beNil())
-        expect(manifest.iosSplashImageUrl()).to(beNil())
-        expect(manifest.iosSplashImageResizeMode()).to(beNil())
-        expect(manifest.iosGoogleServicesFile()).to(beNil())
-        expect(manifest.supportsRTL()) == false
-        expect(manifest.jsEngine()) == "jsc"
-      }
-    }
-  }
-}