@lynxship/expo 0.1.3 → 0.1.6

package/README.md

@@ -18,6 +18,11 @@ npx expo prebuild
 npx pod-install
 ```
 
+`@lynxship/expo` uses the `expo-modules-core` implementation supplied by the
+installed Expo SDK. The package keeps it as a development dependency for its
+own native-module build, so installing `@lynxship/expo` does not require a
+second manual native dependency in the application.
+
 When the project uses a static `app.json` or `app.config.json`, the Expo CLI
 automatically adds `@lynxship/expo` to `expo.plugins` during `npx expo install`.
 The plugin's defaults are safe for the first build, so no manual config edit
@@ -73,6 +78,10 @@ The endpoint must be HTTPS outside localhost. The public verification key is
 safe to ship in the application; private signing keys must remain in the
 LynxShip CLI or CI secret store.
 
+The Android Expo module reads its native Maven version from this package's
+`package.json`, so publishing a new package version cannot leave the Gradle
+module on an old or missing `versionName`.
+
 `lynxVersion` defaults to `auto`. Android resolves the current Lynx release
 through Gradle and iOS resolves the current CocoaPods release. Gradle and
 CocoaPods lockfiles retain the concrete versions selected by the first native

package/android/build.gradle

@@ -1,8 +1,23 @@
+import groovy.json.JsonSlurper
+
 plugins {
     id "com.android.library"
     id "expo-module-gradle-plugin"
 }
 
+def packageJsonFile = file("../package.json")
+if (!packageJsonFile.isFile()) {
+    throw new GradleException("@lynxship/expo package.json is missing")
+}
+def packageJson = new JsonSlurper().parseText(packageJsonFile.text)
+def moduleVersion = packageJson.version?.toString()
+if (!moduleVersion) {
+    throw new GradleException("@lynxship/expo package.json does not define a version")
+}
+
+group = "com.lynxship.expo"
+version = moduleVersion
+
 // `latest.release` is used only when the app does not provide an exact
 // version. Gradle dependency locking then records the resolved version for
 // reproducible subsequent builds.
@@ -13,6 +28,8 @@ android {
     compileSdk 35
 
     defaultConfig {
+        versionCode 1
+        versionName moduleVersion
         minSdk 24
         consumerProguardFiles "consumer-rules.pro"
     }

package/android/src/main/java/com/lynxship/expo/LynxShipExpoView.kt

@@ -1,5 +1,6 @@
 package com.lynxship.expo
 
+import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -19,7 +20,7 @@ import com.lynx.tasm.provider.AbsTemplateProvider
 import com.lynx.tasm.service.LynxServiceCenter
 import com.lynxship.sdk.android.LynxShipOtaClient
 import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.events.EventDispatcher
+import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -62,7 +63,7 @@ class LynxShipExpoView(context: Context, appContext: AppContext) : ExpoView(cont
                 } catch (error: IOException) {
                     onError(mapOf("message" to (error.message ?: "Could not record Lynx launch"), "recoverable" to true))
                 }
-                onReady(mapOf("bundle" to bundleName, "sequence" to (otaClient?.activeSequence ?: 0)))
+                onReady(mapOf("bundle" to bundleName, "sequence" to (otaClient?.activeSequence() ?: 0)))
             }
         })
         addView(lynxView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
@@ -98,7 +99,7 @@ class LynxShipExpoView(context: Context, appContext: AppContext) : ExpoView(cont
                 try {
                     otaClient.activateCandidate()
                     post {
-                        onUpdate(mapOf("sequence" to otaClient.activeSequence))
+                        onUpdate(mapOf("sequence" to otaClient.activeSequence()))
                         if (reloadOnUpdate) render()
                     }
                 } catch (error: Exception) {
@@ -168,6 +169,8 @@ class LynxShipExpoView(context: Context, appContext: AppContext) : ExpoView(cont
         synchronized(LynxShipExpoView::class.java) {
             if (!initialized) {
                 val applicationContext = context.applicationContext
+                val application = applicationContext as? Application
+                    ?: throw IllegalStateException("LynxShip requires an Android Application context")
                 // Lynx's official Android integration requires these services
                 // before a LynxView is created. Expo does not give this package
                 // an application subclass, so initialize them once at the
@@ -184,7 +187,7 @@ class LynxShipExpoView(context: Context, appContext: AppContext) : ExpoView(cont
                 LynxServiceCenter.inst().registerService(LynxImageService.getInstance())
                 LynxServiceCenter.inst().registerService(LynxLogService)
                 LynxServiceCenter.inst().registerService(LynxHttpService)
-                LynxEnv.inst().init(applicationContext, null, null, null)
+                LynxEnv.inst().init(application, null, null, null)
                 initialized = true
             }
         }

package/lynxship-expo.podspec

@@ -1,6 +1,14 @@
+require 'json'
+
+package_json_path = File.join(__dir__, 'package.json')
+raise 'LynxShip Expo package.json is missing' unless File.file?(package_json_path)
+
+package_version = JSON.parse(File.read(package_json_path))['version']
+raise 'LynxShip Expo package.json does not define a version' unless package_version
+
 Pod::Spec.new do |s|
   s.name = 'LynxShipExpo'
-  s.version = '0.1.0'
+  s.version = package_version
   s.summary = 'Expo native LynxView integration for LynxShip.'
   s.license = { :type => 'MIT' }
   s.author = { 'LynxShip' => 'opensource@lynxship.dev' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynxship/expo",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "Expo native LynxView with LynxShip OTA delivery and cache support.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -42,10 +42,12 @@
   "peerDependencies": {
     "@expo/config-plugins": ">=9",
     "expo": ">=52",
-    "expo-modules-core": ">=1",
     "react": ">=18",
     "react-native": ">=0.76"
   },
+  "devDependencies": {
+    "expo-modules-core": "57.0.13"
+  },
   "dependencies": {
     "@lynxship/sdk-ios": "0.1.0",
     "@lynxship/sdk-android": "0.1.0"