expo-manifests 0.2.4 → 0.3.0

package/CHANGELOG.md

@@ -10,13 +10,27 @@
 
 ### 💡 Others
 
-## 0.2.4 — 2022-02-01
+## 0.3.0 — 2022-04-18
+
+### 🎉 New features
+
+- Add `logUrl` getter to both platforms. ([#16709](https://github.com/expo/expo/pull/16709) by [@esamelson](https://github.com/esamelson))
+
+### 🐛 Bug fixes
+
+- Add support for expo project information certificate extension. ([#16607](https://github.com/expo/expo/pull/16607) by [@wschurman](https://github.com/wschurman))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 0.2.4 - 2022-02-01
 
 ### 🐛 Bug fixes
 
 - Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
 
-## 0.2.3 — 2022-01-18
+## 0.2.3 - 2022-01-18
 
 _This version does not introduce any user-facing changes._
 

package/android/build.gradle

@@ -3,20 +3,35 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.2.4'
+version = '0.3.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // 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.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
@@ -44,18 +59,22 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 31
-    versionName '0.2.4'
+    versionName '0.3.0'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {
@@ -73,17 +92,17 @@ dependencies {
   implementation project(':expo-json-utils')
 
   testImplementation 'junit:junit:4.12'
-  testImplementation 'androidx.test:core:1.0.0'
+  testImplementation 'androidx.test:core:1.4.0'
   testImplementation 'org.mockito:mockito-core:1.10.19'
-  testImplementation 'io.mockk:mockk:1.10.6'
+  testImplementation 'io.mockk:mockk:1.12.3'
 
-  androidTestImplementation 'androidx.test:runner:1.1.0'
-  androidTestImplementation 'androidx.test:core:1.0.0'
-  androidTestImplementation 'androidx.test:rules:1.1.0'
+  androidTestImplementation 'androidx.test:runner:1.4.0'
+  androidTestImplementation 'androidx.test:core:1.4.0'
+  androidTestImplementation 'androidx.test:rules:1.4.0'
   androidTestImplementation 'org.mockito:mockito-android:3.7.7'
-  androidTestImplementation 'io.mockk:mockk-android:1.10.6'
+  androidTestImplementation 'io.mockk:mockk-android:1.12.3'
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }
 repositories {
   mavenCentral()

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

@@ -13,8 +13,6 @@ abstract class BaseLegacyManifest(json: JSONObject) : Manifest(json) {
 
   override fun getEASProjectID(): String? = json.getNullable("projectId")
 
-  fun getMetadata(): JSONObject? = json.getNullable("metadata")
-
   override fun getAssets(): JSONArray? = json.getNullable("assets")
 
   @Throws(JSONException::class)
@@ -35,14 +33,4 @@ abstract class BaseLegacyManifest(json: JSONObject) : Manifest(json) {
   override fun getAppKey(): String? = json.getNullable("appKey")
 
   fun getCommitTime(): String? = json.getNullable("commitTime")
-
-  @Throws(JSONException::class)
-  private fun getPublishedTime(): String = json.require("publishedTime")
-
-  override fun getSortTime(): String? {
-    // use commitTime instead of publishedTime as it is more accurate;
-    // however, fall back to publishedTime in case older cached manifests do not contain
-    // the commitTime key (we have not always served it)
-    return getCommitTime() ?: getPublishedTime()
-  }
 }

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

@@ -68,6 +68,8 @@ abstract class Manifest(protected val json: JSONObject) {
   @Throws(JSONException::class)
   fun getRevisionId(): String = getExpoClientConfigRootObject()!!.require("revisionId")
 
+  fun getMetadata(): JSONObject? = json.getNullable("metadata")
+
   abstract fun getSDKVersion(): String?
 
   abstract fun getAssets(): JSONArray?
@@ -99,9 +101,10 @@ abstract class Manifest(protected val json: JSONObject) {
 
   fun getDebuggerHost(): String = getExpoGoConfigRootObject()!!.require("debuggerHost")
   fun getMainModuleName(): String = getExpoGoConfigRootObject()!!.require("mainModuleName")
+  fun getLogUrl(): String? = getExpoGoConfigRootObject()?.getNullable("logUrl")
   fun getHostUri(): String? = getExpoGoConfigRootObject()?.getNullable("hostUri")
 
-  fun isVerified(): Boolean = json.require("isVerified")
+  fun isVerified(): Boolean = json.getNullable("isVerified") ?: false
 
   abstract fun getAppKey(): String?
 
@@ -120,8 +123,6 @@ abstract class Manifest(protected val json: JSONObject) {
     return expoClientConfig.getNullable("updates")
   }
 
-  abstract fun getSortTime(): String?
-
   fun getPrimaryColor(): String? {
     val expoClientConfig = getExpoClientConfigRootObject() ?: return null
     return expoClientConfig.getNullable("primaryColor")
@@ -171,7 +172,7 @@ abstract class Manifest(protected val json: JSONObject) {
     val sharedJsEngine = expoClientConfig.getNullable<String>("jsEngine")
     val androidJsEngine = expoClientConfig
       .getNullable<JSONObject>("android")?.getNullable<String>("jsEngine")
-    return androidJsEngine ?: sharedJsEngine ?: null
+    return androidJsEngine ?: sharedJsEngine
   }
 
   fun getIconUrl(): String? {

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

@@ -67,10 +67,6 @@ class NewManifest(json: JSONObject) : Manifest(json) {
 
   override fun getAppKey(): String? = null
 
-  override fun getSortTime(): String {
-    return getCreatedAt()
-  }
-
   private fun getExtra(): JSONObject? {
     return json.getNullable("extra")
   }

package/ios/EXManifests/EXManifestsBaseManifest.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSString *)orientation;
 - (nullable NSDictionary *)experiments;
 - (nullable NSDictionary *)developer;
+- (nullable NSString *)logUrl;
 - (nullable NSString *)facebookAppId;
 - (nullable NSString *)facebookApplicationName;
 - (BOOL)facebookAutoInitEnabled;

package/ios/EXManifests/EXManifestsBaseManifest.m

@@ -119,6 +119,14 @@
   return [expoGoConfig nullableDictionaryForKey:@"developer"];
 }
 
+- (nullable NSString *)logUrl {
+  NSDictionary *expoGoConfig = self.expoGoConfigRootObject;
+  if (!expoGoConfig) {
+    return nil;
+  }
+  return [expoGoConfig nullableStringForKey:@"logUrl"];
+}
+
 - (nullable NSString *)facebookAppId {
   NSDictionary *expoClientConfig = self.expoClientConfigRootObject;
   if (!expoClientConfig) {

package/ios/EXManifests/EXManifestsManifest.h

@@ -56,6 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSString *)orientation;
 - (nullable NSDictionary *)experiments;
 - (nullable NSDictionary *)developer;
+- (nullable NSString *)logUrl;
 - (nullable NSString *)facebookAppId;
 - (nullable NSString *)facebookApplicationName;
 - (BOOL)facebookAutoInitEnabled;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-manifests",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "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.2.0"
+    "expo-json-utils": "~0.3.0"
   },
-  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }