expo-dev-menu-interface 0.5.3 → 0.6.0

package/README.md

@@ -4,7 +4,7 @@ Interface for `expo-dev-menu`.
 
 # Installation in managed Expo projects
 
-For [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,20 +3,35 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.5.3'
+version = '0.6.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 6
-    versionName '0.5.3'
+    versionName '0.6.0'
   }
   lintOptions {
     abortOnError false
@@ -68,6 +87,6 @@ dependencies {
 
   implementation 'com.squareup.okhttp3:okhttp:3.14.9'
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
 }

package/android/src/main/java/expo/interfaces/devmenu/DevMenuManagerInterface.kt

@@ -34,12 +34,12 @@ interface DevMenuManagerInterface {
   fun toggleMenu(activity: Activity)
 
   /**
-   * Handles `onKeyEvent`. It's active only if [DevMenuSettingsInterface.keyCommandsEnabled] is true.
+   * Handles `onKeyEvent`. It's active only if [DevMenuPreferencesInterface.keyCommandsEnabled] is true.
    */
   fun onKeyEvent(keyCode: Int, event: KeyEvent): Boolean
 
   /**
-   * Handles `onTouchEvent`. It's active only if [DevMenuSettingsInterface.touchGestureEnabled] is true.
+   * Handles `onTouchEvent`. It's active only if [DevMenuPreferencesInterface.touchGestureEnabled] is true.
    */
   fun onTouchEvent(ev: MotionEvent?)
 
@@ -70,16 +70,10 @@ interface DevMenuManagerInterface {
   fun serializedScreens(): List<Bundle>
 
   /**
-   * @return a instance of [DevMenuSessionInterface] that keeps the details of the currently opened dev menu session,
-   * or `null` if menu isn't opened.
-   */
-  fun getSession(): DevMenuSessionInterface?
-
-  /**
-   * @return a instance of [DevMenuSettingsInterface] that keeps all settings for current dev menu delegate,
+   * @return a instance of [DevMenuPreferencesInterface] that keeps all settings for current dev menu delegate,
    * or `null` if delegate wasn't provided.
    */
-  fun getSettings(): DevMenuSettingsInterface?
+  fun getSettings(): DevMenuPreferencesInterface?
 
   /**
    * @return the dev menu application host.

package/android/src/main/java/expo/interfaces/devmenu/{DevMenuSettingsInterface.kt → DevMenuPreferencesInterface.kt}

@@ -1,8 +1,9 @@
 package expo.interfaces.devmenu
 
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 
-interface DevMenuSettingsInterface {
+interface DevMenuPreferencesInterface {
   /**
    * Whether to enable shake gesture.
    */
@@ -32,4 +33,9 @@ interface DevMenuSettingsInterface {
    * Serializes settings into a [WritableMap] so they can be passed through the bridge.
    */
   fun serialize(): WritableMap
+
+  /**
+   * Updates settings from [ReadableMap] - the map can be a partial of all the possible settings options
+   */
+  fun setPreferences(settings: ReadableMap)
 }

package/ios/DevMenuManagerProtocol.swift

@@ -10,9 +10,6 @@ public protocol DevMenuManagerProtocol {
   @objc
   var isVisible: Bool { get }
 
-  @objc
-  var delegate: DevMenuDelegateProtocol? { get set }
-
   /**
    Opens up the dev menu.
    */

package/ios/EXDevExtensions.swift

@@ -0,0 +1,10 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import Foundation
+
+// A protocol for determining if a given bridge module is a "DevExtension"
+// DevExtensions are passed through to the dev-menu and dev-launcher JS runtimes
+// This protocol has no fields on it as of yet but could be extended if additional functionality is needed in the future
+
+@objc
+public protocol EXDevExtensionProtocol {}

package/ios/ExpoApiClient/DevMenuExpoApiClientProtocol.swift

@@ -31,9 +31,6 @@ public protocol DevMenuExpoApiClientProtocol {
   @objc
   func setSessionSecret(_ sessionSecret: String?)
 
-  @objc
-  func queryDevSessionsAsync(_ installationID: String?, completionHandler: @escaping HTTPCompletionHandler)
-
   @objc
   func queryUpdateChannels(
     appId: String,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -25,5 +25,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "c689b0c8a14445397ca5f9febdd99b5949e03f9b"
+  "gitHead": "2b35d9008fef42cb53473331c37693ca12e9bf12"
 }

package/android/src/main/java/expo/interfaces/devmenu/DevMenuSessionInterface.kt

@@ -1,14 +0,0 @@
-package expo.interfaces.devmenu
-
-import android.os.Bundle
-import com.facebook.react.ReactInstanceManager
-
-/**
- * Interface that represents a "session".
- * A session represents lifecycle/state of the dev menu while it is opened (between opening it and closing it).
- */
-interface DevMenuSessionInterface {
-  val reactInstanceManager: ReactInstanceManager
-  val appInfo: Bundle
-  val openScreen: String?
-}

package/ios/DevMenuDelegateProtocol.swift

@@ -1,48 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-import Foundation
-import UIKit
-
-@objc
-public protocol DevMenuDelegateProtocol {
-  /**
-   Returns a pointer to the bridge of the currently shown app. It is a context of what the dev menu displays.
-   */
-  @objc
-  optional func appBridge(forDevMenuManager manager: DevMenuManagerProtocol) -> AnyObject?
-
-  /**
-   Returns a dictionary with the most important informations about the current app.
-   */
-  @objc
-  optional func appInfo(forDevMenuManager manager: DevMenuManagerProtocol) -> [String: Any]?
-
-  /**
-   Tells the manager whether it can change dev menu visibility. In some circumstances you may want not to show/close the dev menu. (Optional)
-   */
-  @objc
-  optional func devMenuManager(_ manager: DevMenuManagerProtocol, canChangeVisibility visible: Bool) -> Bool
-
-  /**
-   Called just before dispatching an action. The delegate can return `false` to prevent an action from being dispatched or `true` otherwise.
-   */
-  @objc
-  optional func devMenuManager(_ manager: DevMenuManagerProtocol, willDispatchAction action: DevMenuAction) -> Bool
-
-  /**
-   Returns bool value whether the dev menu should show the onboarding view when it opens up.
-   Default implementation returns true until the user gets it finished.
-   */
-  @objc
-  optional func shouldShowOnboarding(manager: DevMenuManagerProtocol) -> Bool
-
-  /**
-   Tells the manager which user interface style to use.
-   */
-  @available(iOS 12.0, *)
-  @objc
-  optional func userInterfaceStyle(forDevMenuManager manager: DevMenuManagerProtocol) -> UIUserInterfaceStyle
-
-  @objc
-  optional func supportsDevelopment() -> Bool
-}

package/ios/DevMenuManagerProviderProtocol.swift

@@ -1,9 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-import Foundation
-
-@objc
-public protocol DevMenuManagerProviderProtocol {
-  @objc
-  func getDevMenuManager() -> DevMenuManagerProtocol
-}