Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ios][application] Migrate to Expo Modules API #24871

Merged
merged 8 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/expo-application/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

### 🎉 New features

- Migrate iOS module to Expo modules API. ([#24871](https://github.com/expo/expo/pull/24871) by [@reichhartd](https://github.com/reichhartd))
- Android module is now written using the Sweet API. ([#22395](https://github.com/expo/expo/pull/22585) by [@fobos531](https://github.com/fobos531))

### 🐛 Bug fixes
Expand Down
10 changes: 1 addition & 9 deletions packages/expo-application/build/Application.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/expo-application/build/Application.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions packages/expo-application/build/Application.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/expo-application/build/Application.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/expo-application/build/Application.types.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/expo-application/build/Application.types.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/expo-application/build/Application.types.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/expo-application/build/ExpoApplication.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/expo-application/build/ExpoApplication.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/expo-application/expo-module.config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"name": "expo-application",
"platforms": ["ios", "android"],
"ios": {
"modules": ["ApplicationModule"]
},
"android": {
"modules": ["expo.modules.application.ApplicationModule"]
}
Expand Down
19 changes: 19 additions & 0 deletions packages/expo-application/ios/ApplicationExceptions.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import ExpoModulesCore

internal class UrlDocumentDirectoryException: Exception {
override var reason: String {
"Unable to get url for document directory in user domain mask."
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}
}

internal class InstallationTimeException: Exception {
override var reason: String {
"Unable to get installation time of this application."
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}
}

internal class DateCastException: Exception {
override var reason: String {
"Unable to cast string as a date."
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}
}
45 changes: 45 additions & 0 deletions packages/expo-application/ios/ApplicationModule.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2018-present 650 Industries. All rights reserved.
import ExpoModulesCore

public class ApplicationModule: Module {
public func definition() -> ModuleDefinition {
Name("ExpoApplication")

Constants([
"applicationName": Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName"),
"applicationId": Bundle.main.object(forInfoDictionaryKey: "CFBundleIdentifier"),
"nativeApplicationVersion": Bundle.main.infoDictionary?["CFBundleShortVersionString"],
"nativeBuildVersion": Bundle.main.infoDictionary?["CFBundleVersion"]
])
reichhartd marked this conversation as resolved.
Show resolved Hide resolved

AsyncFunction("getIosIdForVendorAsync") { () -> String? in
return UIDevice.current.identifierForVendor?.uuidString
}

AsyncFunction("getInstallationTimeAsync") { () -> Double in
guard let urlToDocumentsFolder = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).last else {
throw UrlDocumentDirectoryException()
}

do {
let fileAttributes = try FileManager.default.attributesOfItem(atPath: urlToDocumentsFolder.path)
if let installDate = fileAttributes[FileAttributeKey.creationDate] as? Date {
return installDate.timeIntervalSince1970 * 1000
}
throw DateCastException()
} catch {
throw InstallationTimeException()
}
}

AsyncFunction("getApplicationReleaseTypeAsync") { () -> String in
let mainProvisioningProfile = ApplicationModuleProvisioningProfile.mainProvisioningProfile
return mainProvisioningProfile.appReleaseType()
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}

AsyncFunction("getPushNotificationServiceEnvironmentAsync") { () -> String? in
let mainProvisioningProfile = ApplicationModuleProvisioningProfile.mainProvisioningProfile
return mainProvisioningProfile.notificationServiceEnvironment()
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// Copyright 2015-present 650 Industries. All rights reserved.
import ExpoModulesCore

class ApplicationModuleProvisioningProfile {
private var plist: [String: Any]?
reichhartd marked this conversation as resolved.
Show resolved Hide resolved

static let mainProvisioningProfile: ApplicationModuleProvisioningProfile = {
let plist = readProvisioningProfilePlist()
return ApplicationModuleProvisioningProfile(plist: plist)
}()
reichhartd marked this conversation as resolved.
Show resolved Hide resolved

private init(plist: [String: Any]?) {
self.plist = plist
}
reichhartd marked this conversation as resolved.
Show resolved Hide resolved

func notificationServiceEnvironment() -> String? {
guard let plist = plist else {
return nil
}

let entitlements = plist["Entitlements"] as? [String: Any]
return entitlements?["aps-environment"] as? String
}

func appReleaseType() -> String {
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
guard let provisioningPath = Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") else {
#if targetEnvironment(simulator)
return AppReleaseType.simulator.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
#else
return AppReleaseType.appStore.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
#endif
}

guard let mobileProvision = plist else {
return AppReleaseType.unknown.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}

if let provisionsAllDevices = mobileProvision["ProvisionsAllDevices"] as? Bool, provisionsAllDevices {
return AppReleaseType.enterprise.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}
if let provisionedDevices = mobileProvision["ProvisionedDevices"] as? [String], !provisionedDevices.isEmpty {
let entitlements = mobileProvision["Entitlements"] as? [String: Any]
if let getTaskAllow = entitlements?["get-task-allow"] as? Bool, getTaskAllow {
return AppReleaseType.dev.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}
return AppReleaseType.adHoc.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}
return AppReleaseType.appStore.rawValue
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
}

private static func readProvisioningProfilePlist() -> [String: Any]? {
guard let profilePath = Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") else {
return nil
}

do {
let profileString = try String(contentsOfFile: profilePath, encoding: .ascii)
guard let plistStart = profileString.range(of: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"),
let plistEnd = profileString.range(of: "</plist>") else {
return nil
}

let plistString = String(profileString[plistStart.lowerBound..<plistEnd.upperBound])
if let plistData = plistString.data(using: .utf8) {
return try PropertyListSerialization.propertyList(from: plistData, options: [], format: nil) as? [String: Any]
}
print("Failed to convert plistString to UTF-8 encoded data object.")
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
return nil
} catch {
print("Error reading provisioning profile: \(error.localizedDescription)")
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
return nil
}
}
}

enum AppReleaseType: String, Enumerable {
case unknown
case simulator
case enterprise
case dev
case adHoc
case appStore
}
reichhartd marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 0 additions & 8 deletions packages/expo-application/ios/EXApplication/EXApplication.h

This file was deleted.

57 changes: 0 additions & 57 deletions packages/expo-application/ios/EXApplication/EXApplication.m

This file was deleted.

This file was deleted.