expo-dev-menu-interface 0.4.2 → 0.5.3

package/README.md

@@ -4,7 +4,7 @@ Interface for `expo-dev-menu`.
 
 # Installation in managed Expo projects
 
-For managed [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.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.
 
 # Installation in bare React Native projects
 

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.4.2'
+version = '0.5.3'
 
 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 6
-    versionName '0.4.2'
+    versionName '0.5.3'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/interfaces/devmenu/expoapi/DevMenuExpoApiClientInterface.kt

@@ -14,7 +14,7 @@ interface DevMenuExpoApiClientInterface {
   fun isLoggedIn(): Boolean
   fun setSessionSecret(newSessionSecret: String?)
   suspend fun queryMyProjects(options: DevMenuGraphQLOptions = DevMenuGraphQLOptions()): okhttp3.Response
-  suspend fun queryDevSessions(): okhttp3.Response
+  suspend fun queryDevSessions(deviceID: String?): okhttp3.Response
   suspend fun queryUpdateChannels(
     appId: String,
     options: DevMenuGraphQLOptions = DevMenuGraphQLOptions()

package/expo-module.config.json

@@ -0,0 +1,4 @@
+{
+  "name": "expo-dev-menu-interface",
+  "platforms": ["ios", "android"]
+}

package/ios/DevMenuBridgeProtocol.swift

@@ -11,5 +11,5 @@ public protocol DevMenuBridgeProtocol {
   optional func modulesConforming(toProtocol: Protocol) -> [AnyObject]
 
   @objc
-  optional func requestReload() -> Void
+  optional func requestReload()
 }

package/ios/DevMenuDelegateProtocol.swift

@@ -15,7 +15,7 @@ public protocol DevMenuDelegateProtocol {
    Returns a dictionary with the most important informations about the current app.
    */
   @objc
-  optional func appInfo(forDevMenuManager manager: DevMenuManagerProtocol) -> [String : Any]?
+  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)
@@ -42,7 +42,7 @@ public protocol DevMenuDelegateProtocol {
   @available(iOS 12.0, *)
   @objc
   optional func userInterfaceStyle(forDevMenuManager manager: DevMenuManagerProtocol) -> UIUserInterfaceStyle
-  
+
   @objc
   optional func supportsDevelopment() -> Bool
 }

package/ios/DevMenuExtensionProtocol.swift

@@ -17,7 +17,7 @@ public protocol DevMenuExtensionProtocol {
    This function is optional because otherwise we end up with linker warning:
    `method '+moduleName' in category from /.../expo-dev-menu/libexpo-dev-menu.a(DevMenuExtensions-....o)
    overrides method from class in /.../expo-dev-menu/libexpo-dev-menu.a(DevMenuExtensions-....o`
-   
+
    So we assume that this method will be implemented by `RCTBridgeModule`.
    In theory we can remove it. However, we leave it  to get easy access to the module name.
    */
@@ -30,11 +30,10 @@ public protocol DevMenuExtensionProtocol {
    */
   @objc
   optional func devMenuItems(_ settings: DevMenuExtensionSettingsProtocol) -> DevMenuItemsContainerProtocol?
-  
+
   @objc
   optional func devMenuScreens(_ settings: DevMenuExtensionSettingsProtocol) -> [DevMenuScreen]?
-  
+
   @objc
   optional func devMenuDataSources(_ settings: DevMenuExtensionSettingsProtocol) -> [DevMenuDataSourceProtocol]?
 }
- 

package/ios/DevMenuManagerProtocol.swift

@@ -9,42 +9,42 @@ public protocol DevMenuManagerProtocol {
    */
   @objc
   var isVisible: Bool { get }
-  
+
   @objc
   var delegate: DevMenuDelegateProtocol? { get set }
-  
+
   /**
    Opens up the dev menu.
    */
   @objc
   @discardableResult
   func openMenu(_ screen: String?) -> Bool
-  
+
   @objc
   @discardableResult
   func openMenu() -> Bool
-  
+
   /**
    Sends an event to JS to start collapsing the dev menu bottom sheet.
    */
   @objc
   @discardableResult
   func closeMenu() -> Bool
-  
+
   /**
    Forces the dev menu to hide. Called by JS once collapsing the bottom sheet finishes.
    */
   @objc
   @discardableResult
   func hideMenu() -> Bool
-  
+
   /**
    Toggles the visibility of the dev menu.
    */
   @objc
   @discardableResult
   func toggleMenu() -> Bool
-  
+
   @objc
   var expoApiClient: DevMenuExpoApiClientProtocol { get }
 }

package/ios/DevMenuManagerProviderProtocol.swift

@@ -4,8 +4,6 @@ import Foundation
 
 @objc
 public protocol DevMenuManagerProviderProtocol {
-  
   @objc
   func getDevMenuManager() -> DevMenuManagerProtocol
-
 }

package/ios/DevMenuUIResponderExtensionProtocol.swift

@@ -5,8 +5,6 @@ import UIKit
 
 @objc
 public protocol DevMenuUIResponderExtensionProtocol {
-  
   @objc
   func EXDevMenu_handleKeyCommand(_ key: UIKeyCommand)
-
 }

package/ios/ExpoApiClient/DevMenuEASUpdates.swift

@@ -5,18 +5,18 @@ import Foundation
 @objc
 public protocol DevMenuConstructibleFromDictionary {
   @objc
-  init(dictionary: [String : Any])
+  init(dictionary: [String: Any])
 }
 
 public struct DevMenuEASUpdates {
   @objc
-  public class Channel : NSObject, DevMenuConstructibleFromDictionary {
+  public class Channel: NSObject, DevMenuConstructibleFromDictionary {
     public let id: String
     public let name: String
     public let createdAt: String
     public let updatedAt: String
-    
-    required public init(dictionary: [String : Any]) {
+
+    required public init(dictionary: [String: Any]) {
       id = dictionary["id"] as! String
       name = dictionary["name"] as! String
       createdAt = dictionary["createdAt"] as! String
@@ -25,27 +25,27 @@ public struct DevMenuEASUpdates {
   }
 
   @objc
-  public class Branch : NSObject, DevMenuConstructibleFromDictionary {
+  public class Branch: NSObject, DevMenuConstructibleFromDictionary {
     public let id: String
     public let updates: [Update]
-    
-    required public init(dictionary: [String : Any]) {
+
+    required public init(dictionary: [String: Any]) {
       id = dictionary["id"] as! String
-      let updatesData = dictionary["updates"] as? [[String : Any]] ?? []
+      let updatesData = dictionary["updates"] as? [[String: Any]] ?? []
       updates = updatesData.map { Update(dictionary: $0) }
     }
   }
 
   @objc
-  public class Update : NSObject, DevMenuConstructibleFromDictionary {
+  public class Update: NSObject, DevMenuConstructibleFromDictionary {
     public let id: String
     public let message: String
     public let platform: String
     public let runtimeVersion: String
     public let createdAt: String
     public let updatedAt: String
-    
-    required public init(dictionary: [String : Any]) {
+
+    required public init(dictionary: [String: Any]) {
       id = dictionary["id"] as! String
       message = dictionary["message"] as! String
       platform = dictionary["platform"] as! String

package/ios/ExpoApiClient/DevMenuExpoApiClientProtocol.swift

@@ -10,13 +10,13 @@ public class DevMenuGraphQLOptions: NSObject {
   public let limit: Int
   @objc
   public let offset: Int
-  
+
   @objc
   public init(withLimit limit: Int = 10, withOffset offset: Int = 0) {
     self.limit = limit
     self.offset = offset
   }
-  
+
   @objc
   public convenience init(withOffset offset: Int) {
     self.init(withLimit: 10, withOffset: offset)
@@ -27,20 +27,20 @@ public class DevMenuGraphQLOptions: NSObject {
 public protocol DevMenuExpoApiClientProtocol {
   @objc
   func isLoggedIn() -> Bool
-  
+
   @objc
   func setSessionSecret(_ sessionSecret: String?)
-  
+
   @objc
-  func queryDevSessionsAsync(_ completionHandler: @escaping HTTPCompletionHandler)
-  
+  func queryDevSessionsAsync(_ installationID: String?, completionHandler: @escaping HTTPCompletionHandler)
+
   @objc
   func queryUpdateChannels(
     appId: String,
     completionHandler: @escaping ([DevMenuEASUpdates.Channel]?, URLResponse?, Error?) -> Void,
     options: DevMenuGraphQLOptions
   )
-  
+
   @objc
   func queryUpdateBranches(
     appId: String,
@@ -57,7 +57,7 @@ public extension DevMenuExpoApiClientProtocol {
   ) {
     queryUpdateChannels(appId: appId, completionHandler: completionHandler, options: DevMenuGraphQLOptions())
   }
-  
+
   func queryUpdateBranches(
     appId: String,
     completionHandler: @escaping ([DevMenuEASUpdates.Branch]?, URLResponse?, Error?) -> Void

package/ios/MenuItems/DevMenuAction.swift

@@ -7,13 +7,13 @@ import UIKit
 open class DevMenuAction: DevMenuScreenItem, DevMenuCallableProvider {
   @objc
   public var callable: DevMenuExportedAction
-  
+
   @objc
   public var action: () -> Void {
     get { return self.callable.action }
     set { self.callable.action = newValue }
   }
-  
+
   @objc
   open var isAvailable: () -> Bool {
     get {
@@ -23,7 +23,7 @@ open class DevMenuAction: DevMenuScreenItem, DevMenuCallableProvider {
       self.callable.isAvailable = newValue
     }
   }
-  
+
   @objc
   open var isEnabled: () -> Bool = { false }
 
@@ -43,16 +43,16 @@ open class DevMenuAction: DevMenuScreenItem, DevMenuCallableProvider {
   }
 
   @objc
-  public convenience init(withId id: String, action: @escaping () -> ()) {
+  public convenience init(withId id: String, action: @escaping () -> Void) {
     self.init(withId: id)
     self.callable.action = action
   }
-  
+
   @objc
-  public convenience init(withId id: String, _ action: @escaping () -> ()) {
+  public convenience init(withId id: String, _ action: @escaping () -> Void) {
     self.init(withId: id, action: action)
   }
-  
+
   public func registerCallable() -> DevMenuExportedCallable? {
     return self.callable
   }
@@ -61,16 +61,16 @@ open class DevMenuAction: DevMenuScreenItem, DevMenuCallableProvider {
   open func registerKeyCommand(input: String, modifiers: UIKeyModifierFlags) {
     self.callable.registerKeyCommand(input: input, modifiers: modifiers)
   }
-  
+
   @objc
-  open override func serialize() -> [String : Any] {
+  open override func serialize() -> [String: Any] {
     var dict = super.serialize()
     dict["actionId"] = self.callable.id
     dict["keyCommand"] = self.callable.keyCommand == nil ? nil : [
       "input": self.callable.keyCommand!.input!,
       "modifiers": exportKeyCommandModifiers()
     ]
-    
+
     dict["isAvailable"] = isAvailable()
     dict["isEnabled"] = isAvailable()
     dict["label"] = label()
@@ -79,27 +79,27 @@ open class DevMenuAction: DevMenuScreenItem, DevMenuCallableProvider {
 
     return dict
   }
-  
+
   private func exportKeyCommandModifiers() -> Int {
-    var exportedValue = 0;
+    var exportedValue = 0
     let keyCommand = self.callable.keyCommand!
-    
+
     if keyCommand.modifierFlags.contains(.control) {
-      exportedValue += 1 << 0;
+      exportedValue += 1 << 0
     }
-    
+
     if keyCommand.modifierFlags.contains(.alternate) {
-      exportedValue += 1 << 1;
+      exportedValue += 1 << 1
     }
-    
+
     if keyCommand.modifierFlags.contains(.command) {
-      exportedValue += 1 << 2;
+      exportedValue += 1 << 2
     }
-    
+
     if keyCommand.modifierFlags.contains(.shift) {
-      exportedValue += 1 << 3;
+      exportedValue += 1 << 3
     }
-  
+
     return exportedValue
   }
 }

package/ios/MenuItems/DevMenuDataSource.swift

@@ -5,7 +5,7 @@ import Foundation
 @objc
 public protocol DevMenuDataSourceItem {
   @objc
-  func serialize() -> [String : Any]
+  func serialize() -> [String: Any]
 }
 
 public typealias DevMenuDataSourceResolver = ([DevMenuDataSourceItem]) -> Void
@@ -13,7 +13,7 @@ public typealias DevMenuDataSourceResolver = ([DevMenuDataSourceItem]) -> Void
 @objc
 public protocol DevMenuDataSourceProtocol {
   var id: String { get }
-  
+
   func fetchData(resolve: @escaping DevMenuDataSourceResolver)
 }
 
@@ -21,12 +21,12 @@ public protocol DevMenuDataSourceProtocol {
 public class DevMenuListDataSource: NSObject, DevMenuDataSourceProtocol {
   public var id: String
   private var dataFetcher: (@escaping ([DevMenuSelectionList.Item]) -> Void) -> Void
-  
+
   public init(id: String, dataFetcher: @escaping (@escaping ([DevMenuSelectionList.Item]) -> Void) -> Void) {
     self.id = id
     self.dataFetcher = dataFetcher
   }
-  
+
   public func fetchData(resolve: @escaping ([DevMenuDataSourceItem]) -> Void) {
     dataFetcher(resolve)
   }

package/ios/MenuItems/DevMenuExportedCallable.swift

@@ -13,7 +13,7 @@ public protocol DevMenuCallableProvider {
 public class DevMenuExportedCallable: NSObject {
   @objc
   public let id: String
-  
+
   @objc
   init(withId id: String) {
     self.id = id
@@ -23,15 +23,15 @@ public class DevMenuExportedCallable: NSObject {
 @objc
 public class DevMenuExportedFunction: DevMenuExportedCallable {
   @objc
-  public var function: ([String : Any]?) -> Void
-  
+  public var function: ([String: Any]?) -> Void
+
   @objc
-  public init(withId id: String, withFunction function: @escaping ([String : Any]?) -> Void) {
+  public init(withId id: String, withFunction function: @escaping ([String: Any]?) -> Void) {
     self.function = function
     super.init(withId: id)
   }
-  
-  public func call(args: [String : Any]?) {
+
+  public func call(args: [String: Any]?) {
     function(args)
   }
 }
@@ -40,23 +40,23 @@ public class DevMenuExportedFunction: DevMenuExportedCallable {
 public class DevMenuExportedAction: DevMenuExportedCallable {
   @objc
   public var action: () -> Void
-  
+
   @objc
-  public private(set) var keyCommand: UIKeyCommand? = nil
-  
+  public private(set) var keyCommand: UIKeyCommand?
+
   @objc
   public var isAvailable: () -> Bool = { true }
-  
+
   @objc
   public init(withId id: String, withAction action: @escaping  () -> Void) {
     self.action = action
     super.init(withId: id)
   }
-  
+
   public func call() {
     action()
   }
-  
+
   @objc
   public func registerKeyCommand(input: String, modifiers: UIKeyModifierFlags) {
     keyCommand = UIKeyCommand(input: input, modifierFlags: modifiers, action: #selector(DevMenuUIResponderExtensionProtocol.EXDevMenu_handleKeyCommand(_:)))

package/ios/MenuItems/DevMenuGroup.swift

@@ -5,7 +5,7 @@ import Foundation
 @objc
 open class DevMenuGroup: DevMenuScreenItem, DevMenuItemsContainerProtocol {
   let container = DevMenuItemsContainer()
-  
+
   @objc
   public init() {
     super.init(type: .Group)
@@ -15,21 +15,21 @@ open class DevMenuGroup: DevMenuScreenItem, DevMenuItemsContainerProtocol {
   public func addItem(_ item: DevMenuScreenItem) {
     container.addItem(item)
   }
-  
+
   public func getRootItems() -> [DevMenuScreenItem] {
     return container.getRootItems()
   }
-  
+
   public func getAllItems() -> [DevMenuScreenItem] {
     return container.getAllItems()
   }
-  
-  public func serializeItems() -> [[String : Any]] {
+
+  public func serializeItems() -> [[String: Any]] {
     return container.serializeItems()
   }
 
   @objc
-  public override func serialize() -> [String : Any] {
+  public override func serialize() -> [String: Any] {
     var dict = super.serialize()
     dict["items"] = serializeItems()
     return dict

package/ios/MenuItems/DevMenuItem.swift

@@ -21,9 +21,9 @@ open class DevMenuItem: NSObject {
   }
 
   @objc
-  open func serialize() -> [String : Any] {
+  open func serialize() -> [String: Any] {
     return [
-      "type": type.rawValue,
+      "type": type.rawValue
     ]
   }
 }

package/ios/MenuItems/DevMenuItemsContainer.swift

@@ -5,11 +5,11 @@ import Foundation
 @objc
 public class DevMenuItemsContainer: NSObject, DevMenuItemsContainerProtocol {
   private var items: [DevMenuScreenItem] = []
-  
+
   public func getRootItems() -> [DevMenuScreenItem] {
     return items.sorted { $0.importance > $1.importance }
   }
-  
+
   public func getAllItems() -> [DevMenuScreenItem] {
     var result: [DevMenuScreenItem] = []
     for item in items {
@@ -20,13 +20,13 @@ public class DevMenuItemsContainer: NSObject, DevMenuItemsContainerProtocol {
     }
     return result.sorted { $0.importance > $1.importance }
   }
-  
+
   @objc
   public func addItem(_ item: DevMenuScreenItem) {
     items.append(item)
   }
-  
-  func serializeItems() -> [[String : Any]] {
+
+  func serializeItems() -> [[String: Any]] {
     return getRootItems().map({ $0.serialize() })
   }
 }

package/ios/MenuItems/DevMenuItemsContainerProtocol.swift

@@ -6,7 +6,7 @@ import Foundation
 public protocol DevMenuItemsContainerProtocol {
   @objc
   func getRootItems() -> [DevMenuScreenItem]
-  
+
   @objc
   func getAllItems() -> [DevMenuScreenItem]
 }

package/ios/MenuItems/DevMenuLink.swift

@@ -5,7 +5,7 @@ import Foundation
 @objc
 public class DevMenuLink: DevMenuScreenItem {
   var target: String
-  
+
   @objc
   open var label: () -> String = { "" }
 
@@ -16,9 +16,9 @@ public class DevMenuLink: DevMenuScreenItem {
     self.target = target
     super.init(type: .Link)
   }
-  
+
   @objc
-  open override func serialize() -> [String : Any] {
+  open override func serialize() -> [String: Any] {
     var dict = super.serialize()
     dict["target"] = target
     dict["label"] = label()

package/ios/MenuItems/DevMenuScreen.swift

@@ -3,32 +3,32 @@
 import Foundation
 
 @objc
-public class DevMenuScreen : DevMenuItem, DevMenuItemsContainerProtocol {
+public class DevMenuScreen: DevMenuItem, DevMenuItemsContainerProtocol {
   let container = DevMenuItemsContainer()
   public private(set) var screenName: String
-  
+
   public func getRootItems() -> [DevMenuScreenItem] {
     return container.getRootItems()
   }
-  
+
   public func getAllItems() -> [DevMenuScreenItem] {
     return container.getAllItems()
   }
-  
+
   public func addItem(_ item: DevMenuScreenItem) {
     container.addItem(item)
   }
-  
-  func serializeItems() -> [[String : Any]] {
+
+  func serializeItems() -> [[String: Any]] {
     return container.serializeItems()
   }
-  
+
   public init(_ screenName: String) {
     self.screenName = screenName
     super.init(type: .Screen)
   }
-  
-  public override func serialize() -> [String : Any] {
+
+  public override func serialize() -> [String: Any] {
     var dict = super.serialize()
     dict["screenName"] = screenName
     dict["items"] = serializeItems()

package/ios/MenuItems/DevMenuSelectionList.swift

@@ -7,37 +7,37 @@ public class DevMenuSelectionList: DevMenuScreenItem, DevMenuCallableProvider {
   @objc
   public class Item: NSObject, DevMenuDataSourceItem {
     @objc
-    public class Tag : NSObject {
+    public class Tag: NSObject {
       @objc
       public var text: () -> String = { "" }
 
       @objc
       public var glyphName: () -> String? = { nil }
-      
-      fileprivate func serialize() -> [String : Any] {
+
+      fileprivate func serialize() -> [String: Any] {
         return [
           "text": text(),
-          "glyphName": glyphName() ?? NSNull(),
+          "glyphName": glyphName() ?? NSNull()
         ]
       }
     }
-    
+
     @objc
-    public var onClickData: () -> [String : Any]? =  { nil }
-    
+    public var onClickData: () -> [String: Any]? = { nil }
+
     @objc
     public var title: () -> String = { "" }
 
     @objc
     public var warning: () -> String? = { nil }
-    
+
     @objc
     public var isChecked: () -> Bool = { false }
-    
+
     @objc
     public var tags: () -> [Tag] = { [] }
-    
-    public func serialize() -> [String : Any] {
+
+    public func serialize() -> [String: Any] {
       return [
         "title": title(),
         "warning": warning() ?? NSNull(),
@@ -47,22 +47,22 @@ public class DevMenuSelectionList: DevMenuScreenItem, DevMenuCallableProvider {
       ]
     }
   }
-  
+
   public static var ActionID = 1
   private let callable: DevMenuExportedFunction
   private var items: [Item] = []
   private let dataSourceId: String?
-  
+
   @objc
   public func addItem(_ item: Item) {
     items.append(item)
   }
-  
+
   @objc
   public convenience init() {
     self.init(dataSourceId: nil)
   }
-  
+
   @objc
   public init(dataSourceId: String?) {
     self.dataSourceId = dataSourceId
@@ -70,21 +70,21 @@ public class DevMenuSelectionList: DevMenuScreenItem, DevMenuCallableProvider {
     DevMenuSelectionList.ActionID += 1
     super.init(type: .SelectionList)
   }
-  
+
   @objc
-  public override func serialize() -> [String : Any] {
+  public override func serialize() -> [String: Any] {
     var dict = super.serialize()
     dict["items"] = items.map { $0.serialize() }
     dict["dataSourceId"] = dataSourceId ?? NSNull()
     dict["actionId"] = self.callable.id
     return dict
   }
-  
+
   @objc
   public func addOnClick(hander: @escaping ([String: Any]?) -> Void) {
     self.callable.function = hander
   }
-  
+
   public func registerCallable() -> DevMenuExportedCallable? {
     return self.callable
   }

package/ios/Tests/DevMenuActionTest.swift

@@ -13,9 +13,9 @@ class DevMenuActionTest: QuickSpec {
       action.detail = { "action-1-details" }
       action.glyphName = { "action-1-glyphname" }
       action.registerKeyCommand(input: "r", modifiers: .command)
-      
+
       let serilizedData = action.serialize()
-      
+
       expect(serilizedData["type"] as? Int).to(equal(ItemType.action.rawValue))
       expect(serilizedData["actionId"] as? String).to(equal("action-1"))
       expect(serilizedData["isAvailable"] as? Bool).to(beTrue())
@@ -23,19 +23,19 @@ class DevMenuActionTest: QuickSpec {
       expect(serilizedData["label"] as? String).to(equal("action-1-label"))
       expect(serilizedData["detail"] as? String).to(equal("action-1-details"))
       expect(serilizedData["glyphName"] as? String).to(equal("action-1-glyphname"))
-      
+
       let keyCommand = serilizedData["keyCommand"] as! [String: Any]
-      
+
       expect(keyCommand["input"] as? String).to(equal("r"))
       expect(keyCommand["modifiers"] as? Int).to(equal(1 << 2))
     }
-    
+
     it("Action callable should be contain passed action") {
       var wasCalled = false
       let action = DevMenuAction(withId: "action-1", { wasCalled = true })
-      
+
       action.callable.call()
-      
+
       expect(wasCalled).to(beTrue())
     }
   }

package/ios/Tests/DevMenuEASUpdatesTest.swift

@@ -12,15 +12,15 @@ class DevMenuEASUpdatesTest: QuickSpec {
         "createdAt": "1635508863",
         "updatedAt": "1635508873"
       ]
-      
+
       let channel = DevMenuEASUpdates.Channel(dictionary: seeder)
-      
+
       expect(channel.id).to(equal("1234"))
       expect(channel.name).to(equal("channel-1"))
       expect(channel.createdAt).to(equal("1635508863"))
       expect(channel.updatedAt).to(equal("1635508873"))
     }
-    
+
     it("Update constructor should populate all fields") {
       let seeder = [
         "id": "1234",
@@ -30,9 +30,9 @@ class DevMenuEASUpdatesTest: QuickSpec {
         "createdAt": "1635508863",
         "updatedAt": "1635508873"
       ]
-      
+
       let update = DevMenuEASUpdates.Update(dictionary: seeder)
-      
+
       expect(update.id).to(equal("1234"))
       expect(update.message).to(equal("update-1"))
       expect(update.platform).to(equal("ios"))
@@ -40,7 +40,7 @@ class DevMenuEASUpdatesTest: QuickSpec {
       expect(update.createdAt).to(equal("1635508863"))
       expect(update.updatedAt).to(equal("1635508873"))
     }
-    
+
     it("Branch constructor should populate all fields") {
       let seeder = [
         "id": "1",
@@ -62,12 +62,12 @@ class DevMenuEASUpdatesTest: QuickSpec {
             "updatedAt": "1635508873"
           ]
         ]
-      ] as [String : Any]
-      
+      ] as [String: Any]
+
       let branch = DevMenuEASUpdates.Branch(dictionary: seeder)
       let update1 = branch.updates[0]
       let update2 = branch.updates[1]
-      
+
       expect(branch.id).to(equal("1"))
       expect(update1.id).to(equal("1234"))
       expect(update1.message).to(equal("update-1"))

package/ios/Tests/DevMenuItemsContainerTest.swift

@@ -7,54 +7,54 @@ class DevMenuItemsContainerTest: QuickSpec {
   override func spec() {
     it("should respect importance") {
       let container = DevMenuItemsContainer()
-      
+
       let seeder = [("action-1", ItemImportance.lowest), ("action-2", ItemImportance.medium), ("action-3", ItemImportance.highest)]
-      
+
       seeder.forEach { actionDate in
         let action = DevMenuAction(withId: actionDate.0)
         action.label = { actionDate.0 }
         action.importance = actionDate.1.rawValue
-        
+
         container.addItem(action)
       }
       let items = container.getRootItems()
-      
+
       expect(items.count).to(equal(3))
       expect((items[0] as! DevMenuAction).label()).to(equal("action-3"))
       expect((items[1] as! DevMenuAction).label()).to(equal("action-2"))
       expect((items[2] as! DevMenuAction).label()).to(equal("action-1"))
     }
-   
+
     it("should unwrap other containers") {
       let container = DevMenuItemsContainer()
       container.addItem(DevMenuAction(withId: "action-1"))
       let innerContainer = DevMenuGroup()
       innerContainer.addItem(DevMenuAction(withId: "action-2"))
       container.addItem(innerContainer)
-      
+
       let items = container.getAllItems()
-      
+
       expect(items.count).to(equal(3))
       expect(items[0] as? DevMenuAction).toNot(beNil())
       expect(items[1] as? DevMenuGroup).toNot(beNil())
       expect(items[2] as? DevMenuAction).toNot(beNil())
     }
-    
+
     it("should serilize items") {
       let container = DevMenuItemsContainer()
       container.addItem(DevMenuAction(withId: "action-1"))
       let innerContainer = DevMenuGroup()
       innerContainer.addItem(DevMenuAction(withId: "action-2"))
       container.addItem(innerContainer)
-       
+
       let items = container.serializeItems()
-       
+
       expect(items.count).to(equal(2))
       expect(items[0]["type"] as? Int).to(equal(ItemType.action.rawValue))
       expect(items[0]["actionId"] as? String).to(equal("action-1"))
-      
+
       expect(items[1]["type"] as? Int).to(equal(ItemType.group.rawValue))
-      
+
       let innerItem = (items[1]["items"] as! [[String: Any]])[0]
       expect(innerItem["type"] as? Int).to(equal(ItemType.action.rawValue))
       expect(innerItem["actionId"] as? String).to(equal("action-2"))

package/ios/Tests/DevMenuLinkTest.swift

@@ -9,9 +9,9 @@ class DevMenuLinkTest: QuickSpec {
       let link = DevMenuLink(withTarget: "target-1")
       link.glyphName = { "link-1-glyph" }
       link.label = { "link-1-label" }
-      
+
       let serilizedData = link.serialize()
-      
+
       expect(serilizedData["type"] as? Int).to(equal(ItemType.link.rawValue))
       expect(serilizedData["label"] as? String).to(equal("link-1-label"))
       expect(serilizedData["glyphName"] as? String).to(equal("link-1-glyph"))

package/ios/Tests/DevMenuScreenTest.swift

@@ -7,9 +7,9 @@ class DevMenuScreenTest: QuickSpec {
   override func spec() {
     it("Screen should be serializable") {
       let screen = DevMenuScreen("screen-1")
-      
+
       let serilizedData = screen.serialize()
-      
+
       expect(serilizedData["type"] as? Int).to(equal(ItemType.screen.rawValue))
       expect(serilizedData["screenName"] as? String).to(equal("screen-1"))
     }

package/ios/Tests/DevMenuSelectionListTest.swift

@@ -7,9 +7,9 @@ class DevMenuSelectionListTest: QuickSpec {
   override func spec() {
     it("List should be serializable") {
       let list = DevMenuSelectionList()
-      
+
       let serilizedData = list.serialize()
-      
+
       expect(serilizedData["type"] as? Int).to(equal(ItemType.selectionList.rawValue))
       expect(serilizedData["actionId"] as? String).toNot(beNil())
     }

package/{expo-dev-menu-interface.podspec → ios/expo-dev-menu-interface.podspec}

@@ -1,6 +1,6 @@
 require 'json'
 
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
 
 Pod::Spec.new do |s|
   s.name           = 'expo-dev-menu-interface'
@@ -14,9 +14,9 @@ Pod::Spec.new do |s|
   s.swift_version  = '5.2'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
-  s.source_files   = 'ios/**/*.{h,m,swift}'
-  s.preserve_paths = 'ios/**/*.{h,m,swift}'
-  s.exclude_files  = ['ios/Tests/**/*.{h,m,swift}']
+  s.source_files   = '**/*.{h,m,swift}'
+  s.preserve_paths = '**/*.{h,m,swift}'
+  s.exclude_files  = 'Tests/**/*.{h,m,swift}'
   s.requires_arc   = true
   s.header_dir     = 'EXDevMenuInterface'
 
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
 
   s.test_spec 'Tests' do |test_spec|
     test_spec.platform     = :ios, '12.0'
-    test_spec.source_files = 'ios/Tests/**/*.{h,m,swift}'
+    test_spec.source_files = 'Tests/**/*.{h,m,swift}'
     test_spec.dependency 'Quick'
     test_spec.dependency 'Nimble'
   end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "0.4.2",
+  "version": "0.5.3",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -21,6 +21,9 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.io",
-  "gitHead": "7bb3c874946fd9b20e25601b155309080b08b5cb"
+  "homepage": "https://docs.expo.dev",
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "c689b0c8a14445397ca5f9febdd99b5949e03f9b"
 }

package/Info-generated.plist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>expo.dev.menu.interface</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>EXDevMenuInterface</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.3.2</string>
-	<key>CFBundleVersion</key>
-	<string>0</string>
-</dict>
-</plist>

package/react-native.config.js

@@ -1,13 +0,0 @@
-module.exports = {
-  dependency: {
-    platforms: {
-      ios: {
-        /**
-         * We need this property to trick `react-native-cli`. Normally, this tool looks for the XCode project.
-         * We can generate it using `XcodeGen` but we don't want to add the project file to this library.
-         */
-        project: 'ios/EXDevMenuInterface.xcodeproj/project.pbxproj',
-      },
-    },
-  },
-};