expo-manifests 0.2.0 → 0.2.4

package/CHANGELOG.md

@@ -10,6 +10,26 @@
 
 ### 💡 Others
 
+## 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
+
+_This version does not introduce any user-facing changes._
+
+## 0.2.2 — 2021-10-15
+
+_This version does not introduce any user-facing changes._
+
+## 0.2.1 — 2021-10-06
+
+### 🐛 Bug fixes
+
+- Support platform shared jsEngine schema. ([#14654](https://github.com/expo/expo/pull/14654) by [@kudo](https://github.com/kudo))
+
 ## 0.2.0 — 2021-09-28
 
 ### 🎉 New features

package/android/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.2.0'
+version = '0.2.4'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -20,27 +20,25 @@ buildscript {
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
@@ -57,7 +55,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 31
-    versionName '0.2.0'
+    versionName '0.2.4'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   lintOptions {

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

@@ -168,8 +168,10 @@ abstract class Manifest(protected val json: JSONObject) {
 
   fun getAndroidJsEngine(): String? {
     val expoClientConfig = getExpoClientConfigRootObject() ?: return null
-    val android = expoClientConfig.getNullable<JSONObject>("android") ?: return null
-    return android.getNullable("jsEngine")
+    val sharedJsEngine = expoClientConfig.getNullable<String>("jsEngine")
+    val androidJsEngine = expoClientConfig
+      .getNullable<JSONObject>("android")?.getNullable<String>("jsEngine")
+    return androidJsEngine ?: sharedJsEngine ?: null
   }
 
   fun getIconUrl(): String? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-manifests",
-  "version": "0.2.0",
+  "version": "0.2.4",
   "description": "Code to parse and use Expo and Expo Updates manifests.",
   "main": "index.js",
   "keywords": [
@@ -22,5 +22,5 @@
   "dependencies": {
     "expo-json-utils": "~0.2.0"
   },
-  "gitHead": "1fffde73411ee7a642b98f1506a8de921805d52b"
+  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
 }