onesignal-expo-plugin 1.0.0-beta9 → 1.0.0

package/.eslintignore

@@ -0,0 +1,6 @@
+# don't ever lint node_modules
+node_modules
+# don't lint build output (make sure it's set to your correct build folder name)
+build
+# don't lint the examples projects
+examples

package/.eslintrc.js

@@ -0,0 +1,18 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+  ],
+  parserOptions: {
+    project: "tsconfig.json",
+},
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+  ],
+  rules: {
+    "@typescript-eslint/no-floating-promises": "error",
+    "no-extra-boolean-cast": "off"
+  }
+};

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## January 2022
+
+### `1.0.0-beta10` - 01/24/2022
+#### Added
+- ability to configure version numbers used in the NSE target's plist file.
+- `OneSignalLog` class for better console logging.
+- this changelog file.
+
+#### Fixed
+- re-running `expo prebuild` will no longer result in duplicate entitlements and dependencies added to native files.

package/EAS.md

@@ -0,0 +1,21 @@
+# Expo Application Services
+EAS is Expo's cloud-build service.
+
+## [EAS Homepage](https://expo.dev/eas)
+
+## EAS + OneSignal Setup
+To get OneSignal push notifications working in an EAS-built app, see our guide on how to configure your [iOS credentials](IOS_CREDENTIALS_EAS.md).
+
+## How to run an iOS EAS-built app
+### Run in a production environment
+For production builds, your generated ipa file should to be distributed to the App Store or Testflight.
+
+
+### Run in custom development client
+For development/internal distribution builds, you will need to install a [development client](https://docs.expo.dev/development/getting-started/) on your iOS device.
+
+1. Scan the QR code shown in the terminal after EAS build success and install the development client application to your device.
+2. In the terminal, run `expo start --dev-client` to be able to serve the application to the client.
+3. Scan the generated QR code to open the dev client and fetch the app bundle from the running Expo process.
+4. You may be prompted to allow the app to find local area network devices. Approve.
+5. Rescan the QR code & open the app. At this point, you should see the mero bundler working. As soon as the bundle is complete, your working app should open!

package/IOS_CREDENTIALS_EAS.md

@@ -0,0 +1,138 @@
+# iOS Credentials Guide: OneSignal + EAS
+## Overview
+To distribute your iOS application, you must set up all the credentials required by Apple. The 3 primary iOS credentials are:
+* Distribution certificate
+* Provisioning profiles
+* Push notification certificate
+
+If you are using EAS, you may be letting Expo handle all your credentials. This is fine for your distribution and provisioning credentials. However, the push notification certificate *must* be handled separately since you are using OneSignal.
+
+As of 3/22/2022, OneSignal does not support p8 files and EAS does not support p12 files which results in a particlar issue when cloud building through EAS while using the Expo managed credentials service. Since the EAS CLI only prompts for p8 files at the time of writing, the only way to complete the cloud build is to input "n" (no) when prompted for setting up push notifications through the CLI. However, this leads to the identifier not having the push capability required to set up push successfully. Until EAS adds more granular control over credentials or OneSignal adds p8 support or Expo adds p12 support, developers will have no option except to use local credentials only.
+
+If you have developed on iOS before, you may be used to XCode helping with syncing things like capabilities across app targets. In Expo/EAS, we are likely not using XCode at all. Thus, we need to make sure that we set up everything manually via the Apple Developers portal.
+
+### TLDR
+To set up push notifications with OneSignal + Expo, you *must* manage all credentials yourself and use local credentials when cloud building through EAS.
+
+---
+
+# Setup
+
+## 1. Credentials setup
+To build successfully, you will need to create and use local credentials (one for production and development). Add `"credentialsSource": "local"` to your `eas.json` file.
+
+**Example:**
+```json
+{
+  "build": {
+    "release": {
+      "android": {
+        "gradleCommand": ":app:bundleRelease"
+      },
+      "ios": {
+        "credentialsSource": "local",
+        "buildConfiguration": "Release"
+      }
+    },
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal",
+      "credentialsSource": "local"
+    }
+  },
+  "cli": {
+    "version": ">= 0.40.0"
+  }
+}
+```
+
+## 2. Identifiers
+In your [Apple developer console](https://developer.apple.com) create two identifiers with the following format:
+   - `com.example.app` <-- you likely already have this one
+   - `com.example.app.OneSignalNotificationServiceExtension`
+
+### When modifying your existing main app identifier:
+   - add the App Groups capability like so: `group.<identifier>.onesignal`
+   - keep / add the "Push Notifications" capability
+
+### When creating a new identifier for `OneSignalNotificationServiceExtension`:
+   - select AppId from the list of identifier types
+   - select App when choosing between App and App Clip
+   - add the App Groups capability like so: `group.<identifier>.onesignal`
+   - do not add the "Push Notifications" capability
+
+#### Note on App Groups at Build Time:
+Make sure to build with both identifiers containing the AppGroup simultaneously. To troubleshoot, remove them both and then rebuild with both identifiers' AppGroup capabilities enabled.
+
+## 3. Provisioning
+Create AdHoc (local development) and AppStore (production) provisioning profiles with both identifiers (four provisioning profiles total). Both provisioning profiles should use the same distribution certificate that is used by your app. Download the profiles.
+
+## 4. Add the profiles to your `credentials.json` file:
+Use the same distribution certificate for the `OneSignalNotificationServiceExtension` as is used for your app (no need to create a new cert).
+
+We recommend creating a `certs` directory in your project with subdirectories for each build type (e.g: `certs/adhoc` & `certs/appstore`). Doing so, you can more easily switch which provisioning profiles get used at build time.
+
+**Directory structure:**
+```
+/certs
+   - /adhoc
+   - /appstore
+```
+
+**Example `credentials.json`:**
+```json
+{
+    "ios": {
+        "<PROJECT>": {
+            "distributionCertificate": {
+                "path": "certs/ios_distribution_certificate.p12",
+                "password": "***"
+            },
+            "provisioningProfilePath": "certs/adhoc/***mobileappprofile.mobileprovision"
+        },
+        "OneSignalNotificationServiceExtension": {
+            "distributionCertificate": {
+                "path": "certs/ios_distribution_certificate.p12",
+                "password": "***"
+            },
+            "provisioningProfilePath": "certs/adhoc/***onesignalprofile.mobileprovision"
+        }
+    }
+}
+```
+
+**Note:** your push certificate (p12) file should not appear anywhere in the `credentials.json` file.
+
+---
+
+# Build
+### Release
+If you are ready for a production build, you should use the AppStore provisioning profiles you created. Make sure your `credentials.json` file is using the correct profiles.
+
+### Development
+The development build will use the AdHoc provisioning profiles you created. Make sure your `credentials.json` file is using the correct profiles.
+
+#### Expo development client
+If you haven't already, add the expo development client to your project:
+
+```sh
+expo install expo-dev-client
+```
+
+Make sure `"developmentClient": true,` is set in your `eas.json` development build profile.
+
+## All Builds
+
+### Run the EAS build command
+```sh
+eas build --profile <build profile> --platform ios
+```
+where `<build profile>` refers to the build profile in your `eas.json` file (e.g: "development" vs "release").
+
+### Build success
+At this point, your build should succeed. You can check its progress by opening the build link in the terminal.
+
+---
+
+# How to run on your device
+See our [EAS guide](EAS.md) for instructions.

package/README.md

@@ -1,6 +1,6 @@
 <h1 align="center">Welcome to onesignal-expo-plugin 👋</h1>
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-1.0.0--beta9-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-1.0.0-blue.svg?cacheSeconds=2592000" />
   <a href="https://github.com/OneSignal/onesignal-expo-plugin#readme" target="_blank">
     <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
   </a>
@@ -17,7 +17,6 @@
 * 🏠 [Homepage](https://github.com/OneSignal/onesignal-expo-plugin#readme)
 * 🖤 [npm](https://www.npmjs.com/package/onesignal-expo-plugin)
 
-## 🚧 In Beta 🚧
 ## Overview
 This plugin is an [Expo Config Plugin](https://docs.expo.dev/guides/config-plugins/). It extends the Expo config to allow customizing the prebuild phase of managed workflow builds (no need to eject to a bare workflow). For the purposes of OneSignal integration, the plugin facilitates automatically generating/configuring the necessary native code files needed to get the [OneSignal React-Native SDK](https://github.com/OneSignal/react-native-onesignal) to work. You can think of adding a plugin as adding custom native code.
 
@@ -32,6 +31,11 @@ This plugin is an [Expo Config Plugin](https://docs.expo.dev/guides/config-plugi
 
 ```sh
 expo install onesignal-expo-plugin
+
+# npm
+npm install react-native-onesignal
+
+# yarn
 yarn add react-native-onesignal
 ```
 
@@ -105,15 +109,44 @@ Alternatively, pass the app ID directly to the function:
 OneSignal.setAppId("YOUR-ONESIGNAL-APP-ID");
 ```
 
-## Run
+### Versioning
+In your configuration file, make sure you set:
+
+| Property             | Details                                                                                                                                                                      |
+|-------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `version`         | Your app version. Corresponds to `CFBundleShortVersionString` on iOS. This value will be used in your NSE* target's plist file.                                               |
+| `ios.buildNumber` | Build number for your iOS standalone app. Corresponds to `CFBundleVersion` and must match Apple's specified format. This value will be used in your NSE* target's plist file. |
+
+\* NSE = Notification Service Extension. Learn more about the NSE [here](https://documentation.onesignal.com/docs/service-extensions).
+
+## EAS (Expo Application Services)
+See our [EAS documentation](EAS.md) for help with EAS.
+
+### iOS Credentials: OneSignal + EAS
+To distribute your iOS application via EAS, you will need to ensure your credentials are set up correctly. See our [credentials setup guide for instructions](IOS_CREDENTIALS_EAS.md).
+
+## Prebuild
+Since we are using custom native code (via the OneSignal plugin), we need to generate the native runtime code for the project. By prebuilding, we automatically link and configure the native modules that have implemented CocoaPods, autolinking, and other config plugins. You can think of prebuild like a native code bundler.
+
+When you run `expo prebuild` we enter into a custom managed workflow which provides most of the benefits of bare workflows and managed workflows at the same time.
+
+```sh
+expo prebuild
+```
+
 ```sh
-$ expo prebuild --clean
+# nukes changes and rebuilds
+expo prebuild --clean
+```
 
-# Build your native iOS project
-$ expo run:ios
+## Run
+The following commands will prebuild *and* run your application. Note that for iOS, push notifications will **not** work in the Simulator.
+```sh
+# Build and run your native iOS project
+expo run:ios
 
-# Build your native Android project
-$ expo run:android
+# Build and run your native Android project
+expo run:android
 ```
 
 ---

package/build/onesignal/withOneSignalAndroid.js

@@ -6,26 +6,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withOneSignalAndroid = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-// ---------- ---------- ---------- ----------
-const oneSignalGradle = `
-buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
-    }
-}
-
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;
-// ---------- ---------- ---------- ----------
+const androidConstants_1 = require("../support/androidConstants");
+const OneSignalLog_1 = require("../support/OneSignalLog");
 const withGradleBuildConfig = (config) => {
     return (0, config_plugins_1.withAppBuildGradle)(config, (newConfig) => {
-        newConfig.modResults.contents = `${oneSignalGradle.trimStart()}\n\n${newConfig.modResults.contents}`;
+        let { contents } = newConfig.modResults;
+        // make sure we haven't previously added dependencies
+        if (!contents.includes(androidConstants_1.ONESIGNAL_GRADLE)) {
+            contents = `${androidConstants_1.ONESIGNAL_GRADLE}\n${contents}`;
+        }
+        else {
+            OneSignalLog_1.OneSignalLog.log("OneSignal dependencies already added to build.gradle. Skipping...");
+        }
+        newConfig.modResults.contents = contents;
         return newConfig;
     });
 };
-// ---------- ---------- ---------- ----------
 const withOneSignalAndroid = (config, props) => {
     withGradleBuildConfig(config, props);
     return config;

package/build/onesignal/withOneSignalIos.js

@@ -3,18 +3,38 @@
  * Expo config plugin for One Signal (iOS)
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.xcodeProjectAddNse = exports.withOneSignalIos = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-const fs_1 = __importDefault(require("fs"));
+const fs = __importStar(require("fs"));
 const xcode_1 = __importDefault(require("xcode"));
 const iosConstants_1 = require("../support/iosConstants");
 const updatePodfile_1 = require("../support/updatePodfile");
-const updateNSEEntitlements_1 = require("../support/updateNSEEntitlements");
-// ---------- ---------- ---------- ----------
+const NseUpdaterManager_1 = __importDefault(require("../support/NseUpdaterManager"));
+const OneSignalLog_1 = require("../support/OneSignalLog");
+const FileManager_1 = require("../support/FileManager");
 /**
  * Add 'app-environment' record with current environment to '<project-name>.entitlements' file
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
@@ -55,29 +75,35 @@ const withRemoteNotificationsPermissions = (config) => {
  */
 const withAppGroupPermissions = (config) => {
     const APP_GROUP_KEY = "com.apple.security.application-groups";
-    return (0, config_plugins_1.withEntitlementsPlist)(config, (newConfig) => {
+    return (0, config_plugins_1.withEntitlementsPlist)(config, newConfig => {
         var _a;
         if (!Array.isArray(newConfig.modResults[APP_GROUP_KEY])) {
             newConfig.modResults[APP_GROUP_KEY] = [];
         }
-        newConfig.modResults[APP_GROUP_KEY].push(`group.${((_a = newConfig === null || newConfig === void 0 ? void 0 : newConfig.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier) || ""}.onesignal`);
+        const modResultsArray = newConfig.modResults[APP_GROUP_KEY];
+        const entitlement = `group.${((_a = newConfig === null || newConfig === void 0 ? void 0 : newConfig.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier) || ""}.onesignal`;
+        if (modResultsArray.indexOf(entitlement) !== -1) {
+            return newConfig;
+        }
+        modResultsArray.push(entitlement);
         return newConfig;
     });
 };
 const withOneSignalNSE = (config, onesignalProps) => {
     return (0, config_plugins_1.withXcodeProject)(config, async (props) => {
-        var _a;
+        var _a, _b;
         const options = {
             iosPath: props.modRequest.platformProjectRoot,
             bundleIdentifier: (_a = props.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier,
             devTeam: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.devTeam,
+            bundleVersion: (_b = props.ios) === null || _b === void 0 ? void 0 : _b.buildNumber,
+            bundleShortVersion: props === null || props === void 0 ? void 0 : props.version,
             iPhoneDeploymentTarget: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.iPhoneDeploymentTarget
         };
         xcodeProjectAddNse(props.modRequest.projectName || "", options, "node_modules/onesignal-expo-plugin/build/support/serviceExtensionFiles/");
         return props;
     });
 };
-// ---------- ---------- ---------- ----------
 const withOneSignalIos = (config, props) => {
     withAppEnvironment(config, props);
     withRemoteNotificationsPermissions(config, props);
@@ -87,40 +113,39 @@ const withOneSignalIos = (config, props) => {
 };
 exports.withOneSignalIos = withOneSignalIos;
 function xcodeProjectAddNse(appName, options, sourceDir) {
-    const { iosPath, devTeam, bundleIdentifier, iPhoneDeploymentTarget } = options;
-    (0, updatePodfile_1.updatePodfile)(iosPath);
-    (0, updateNSEEntitlements_1.updateNSEEntitlements)(`group.${bundleIdentifier}.onesignal`);
+    const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget } = options;
+    // not awaiting in order to not block main thread
+    (0, updatePodfile_1.updatePodfile)(iosPath).catch(err => { OneSignalLog_1.OneSignalLog.error(err); });
     const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
-    const targetName = "OneSignalNotificationServiceExtension";
     const extFiles = [
         "NotificationService.h",
         "NotificationService.m",
-        `${targetName}.entitlements`,
-        `${targetName}-Info.plist`
+        `${iosConstants_1.NSE_TARGET_NAME}.entitlements`,
+        `${iosConstants_1.NSE_TARGET_NAME}-Info.plist`
     ];
     const xcodeProject = xcode_1.default.project(projPath);
-    xcodeProject.parse(function (err) {
+    xcodeProject.parse(async function (err) {
         if (err) {
-            console.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
+            OneSignalLog_1.OneSignalLog.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
             return;
         }
-        // Copy in the extension files
-        fs_1.default.mkdirSync(`${iosPath}/${targetName}`, { recursive: true });
-        extFiles.forEach(function (extFile) {
-            let targetFile = `${iosPath}/${targetName}/${extFile}`;
-            try {
-                fs_1.default.createReadStream(`${sourceDir}${extFile}`).pipe(fs_1.default.createWriteStream(targetFile));
-            }
-            catch (err) {
-                console.log(err);
-            }
-        });
-        const projObjects = xcodeProject.hash.project.objects;
+        /* COPY OVER EXTENSION FILES */
+        fs.mkdirSync(`${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`, { recursive: true });
+        for (let i = 0; i < extFiles.length; i++) {
+            const extFile = extFiles[i];
+            const targetFile = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}/${extFile}`;
+            await FileManager_1.FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
+        }
+        /* MODIFY COPIED EXTENSION FILES */
+        const nseUpdater = new NseUpdaterManager_1.default(iosPath);
+        await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`);
+        await nseUpdater.updateNSEBundleVersion(bundleVersion !== null && bundleVersion !== void 0 ? bundleVersion : iosConstants_1.DEFAULT_BUNDLE_VERSION);
+        await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion !== null && bundleShortVersion !== void 0 ? bundleShortVersion : iosConstants_1.DEFAULT_BUNDLE_SHORT_VERSION);
         // Create new PBXGroup for the extension
-        let extGroup = xcodeProject.addPbxGroup(extFiles, targetName, targetName);
+        const extGroup = xcodeProject.addPbxGroup(extFiles, iosConstants_1.NSE_TARGET_NAME, iosConstants_1.NSE_TARGET_NAME);
         // Add the new PBXGroup to the top level group. This makes the
         // files / folder appear in the file explorer in Xcode.
-        let groups = xcodeProject.hash.project.objects["PBXGroup"];
+        const groups = xcodeProject.hash.project.objects["PBXGroup"];
         Object.keys(groups).forEach(function (key) {
             if (groups[key].name === undefined) {
                 xcodeProject.addToPbxGroup(extGroup.uuid, key);
@@ -130,37 +155,38 @@ function xcodeProjectAddNse(appName, options, sourceDir) {
         // Xcode projects don't contain these if there is only one target
         // An upstream fix should be made to the code referenced in this link:
         //   - https://github.com/apache/cordova-node-xcode/blob/8b98cabc5978359db88dc9ff2d4c015cba40f150/lib/pbxProject.js#L860
+        const projObjects = xcodeProject.hash.project.objects;
         projObjects['PBXTargetDependency'] = projObjects['PBXTargetDependency'] || {};
         projObjects['PBXContainerItemProxy'] = projObjects['PBXTargetDependency'] || {};
-        if (!!xcodeProject.pbxTargetByName(targetName)) {
-            console.log(targetName, "already exists in project. Skipping...");
+        if (!!xcodeProject.pbxTargetByName(iosConstants_1.NSE_TARGET_NAME)) {
+            OneSignalLog_1.OneSignalLog.log(`${iosConstants_1.NSE_TARGET_NAME} already exists in project. Skipping...`);
             return;
         }
         // Add the NSE target
         // This adds PBXTargetDependency and PBXContainerItemProxy for you
-        const nseTarget = xcodeProject.addTarget(targetName, "app_extension", targetName, `${bundleIdentifier}.${targetName}`);
+        const nseTarget = xcodeProject.addTarget(iosConstants_1.NSE_TARGET_NAME, "app_extension", iosConstants_1.NSE_TARGET_NAME, `${bundleIdentifier}.${iosConstants_1.NSE_TARGET_NAME}`);
         // Add build phases to the new target
         xcodeProject.addBuildPhase(["NotificationService.m"], "PBXSourcesBuildPhase", "Sources", nseTarget.uuid);
         xcodeProject.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", nseTarget.uuid);
         xcodeProject.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", nseTarget.uuid);
         // Edit the Deployment info of the new Target, only IphoneOS and Targeted Device Family
         // However, can be more
-        let configurations = xcodeProject.pbxXCBuildConfigurationSection();
-        for (let key in configurations) {
+        const configurations = xcodeProject.pbxXCBuildConfigurationSection();
+        for (const key in configurations) {
             if (typeof configurations[key].buildSettings !== "undefined" &&
-                configurations[key].buildSettings.PRODUCT_NAME == `"${targetName}"`) {
-                let buildSettingsObj = configurations[key].buildSettings;
+                configurations[key].buildSettings.PRODUCT_NAME == `"${iosConstants_1.NSE_TARGET_NAME}"`) {
+                const buildSettingsObj = configurations[key].buildSettings;
                 buildSettingsObj.DEVELOPMENT_TEAM = devTeam;
                 buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = iPhoneDeploymentTarget !== null && iPhoneDeploymentTarget !== void 0 ? iPhoneDeploymentTarget : iosConstants_1.IPHONEOS_DEPLOYMENT_TARGET;
                 buildSettingsObj.TARGETED_DEVICE_FAMILY = iosConstants_1.TARGETED_DEVICE_FAMILY;
-                buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${targetName}/${targetName}.entitlements`;
+                buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${iosConstants_1.NSE_TARGET_NAME}/${iosConstants_1.NSE_TARGET_NAME}.entitlements`;
                 buildSettingsObj.CODE_SIGN_STYLE = "Automatic";
             }
         }
         // Add development teams to both your target and the original project
         xcodeProject.addTargetAttribute("DevelopmentTeam", devTeam, nseTarget);
         xcodeProject.addTargetAttribute("DevelopmentTeam", devTeam);
-        fs_1.default.writeFileSync(projPath, xcodeProject.writeSync());
+        fs.writeFileSync(projPath, xcodeProject.writeSync());
     });
 }
 exports.xcodeProjectAddNse = xcodeProjectAddNse;

package/build/support/{ReaderManager.js → FileManager.js}

@@ -19,22 +19,40 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReaderManager = void 0;
+exports.FileManager = void 0;
 const fs = __importStar(require("fs"));
-class ReaderManager {
-    static async readFile(path, replace) {
+const OneSignalLog_1 = require("./OneSignalLog");
+/**
+ * FileManager contains static *awaitable* file-system functions
+ */
+class FileManager {
+    static async readFile(path) {
         return new Promise((resolve, reject) => {
             fs.readFile(path, 'utf8', (err, data) => {
-                if (err) {
+                if (err || !data) {
+                    OneSignalLog_1.OneSignalLog.error("Couldn't read file:" + path);
                     reject(err);
-                }
-                if (!data) {
-                    console.error("Couldn't read file:", path);
                     return;
                 }
                 resolve(data);
             });
         });
     }
+    static async writeFile(path, contents) {
+        return new Promise((resolve, reject) => {
+            fs.writeFile(path, contents, 'utf8', (err) => {
+                if (err) {
+                    OneSignalLog_1.OneSignalLog.error("Couldn't write file:" + path);
+                    reject(err);
+                    return;
+                }
+                resolve();
+            });
+        });
+    }
+    static async copyFile(path1, path2) {
+        const fileContents = await FileManager.readFile(path1);
+        await FileManager.writeFile(path2, fileContents);
+    }
 }
-exports.ReaderManager = ReaderManager;
+exports.FileManager = FileManager;

package/build/support/NseUpdaterManager.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FileManager_1 = require("./FileManager");
+const iosConstants_1 = require("./iosConstants");
+// project `ios/OneSignalNotificationServiceExtension` directory
+const entitlementsFileName = `OneSignalNotificationServiceExtension.entitlements`;
+const plistFileName = `OneSignalNotificationServiceExtension-Info.plist`;
+class NseUpdaterManager {
+    constructor(iosPath) {
+        this.nsePath = '';
+        this.nsePath = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`;
+    }
+    async updateNSEEntitlements(groupIdentifier) {
+        const entitlementsFilePath = `${this.nsePath}/${entitlementsFileName}`;
+        let entitlementsFile = await FileManager_1.FileManager.readFile(entitlementsFilePath);
+        entitlementsFile = entitlementsFile.replace(iosConstants_1.GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
+        await FileManager_1.FileManager.writeFile(entitlementsFilePath, entitlementsFile);
+    }
+    async updateNSEBundleVersion(version) {
+        const plistFilePath = `${this.nsePath}/${plistFileName}`;
+        let plistFile = await FileManager_1.FileManager.readFile(plistFilePath);
+        plistFile = plistFile.replace(iosConstants_1.BUNDLE_VERSION_TEMPLATE_REGEX, version);
+        await FileManager_1.FileManager.writeFile(plistFilePath, plistFile);
+    }
+    async updateNSEBundleShortVersion(version) {
+        const plistFilePath = `${this.nsePath}/${plistFileName}`;
+        let plistFile = await FileManager_1.FileManager.readFile(plistFilePath);
+        plistFile = plistFile.replace(iosConstants_1.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX, version);
+        await FileManager_1.FileManager.writeFile(plistFilePath, plistFile);
+    }
+}
+exports.default = NseUpdaterManager;

package/build/support/OneSignalLog.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneSignalLog = void 0;
+class OneSignalLog {
+    static log(str) {
+        console.log(`\tonesignal-expo-plugin: ${str}`);
+    }
+    static error(str) {
+        console.error(`\tonesignal-expo-plugin: ${str}`);
+    }
+}
+exports.OneSignalLog = OneSignalLog;

package/build/support/androidConstants.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ONESIGNAL_GRADLE = void 0;
+exports.ONESIGNAL_GRADLE = `buildscript {
+    repositories {
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
+    }
+}
+
+apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;

package/build/support/iosConstants.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = exports.NSE_PODFILE_REGEX = exports.NSE_PODFILE_SNIPPET = exports.TARGETED_DEVICE_FAMILY = exports.IPHONEOS_DEPLOYMENT_TARGET = void 0;
+exports.NSE_TARGET_NAME = exports.DEFAULT_BUNDLE_SHORT_VERSION = exports.DEFAULT_BUNDLE_VERSION = exports.BUNDLE_VERSION_TEMPLATE_REGEX = exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = exports.NSE_PODFILE_REGEX = exports.NSE_PODFILE_SNIPPET = exports.TARGETED_DEVICE_FAMILY = exports.IPHONEOS_DEPLOYMENT_TARGET = void 0;
 exports.IPHONEOS_DEPLOYMENT_TARGET = "11.0";
-exports.TARGETED_DEVICE_FAMILY = `\"1,2\"`;
+exports.TARGETED_DEVICE_FAMILY = `"1,2"`;
 exports.NSE_PODFILE_SNIPPET = `
 target 'OneSignalNotificationServiceExtension' do
   pod 'OneSignalXCFramework', '>= 3.0', '< 4.0'
 end`;
 exports.NSE_PODFILE_REGEX = /target 'OneSignalNotificationServiceExtension'/;
 exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
+exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = /{{BUNDLE_SHORT_VERSION}}/gm;
+exports.BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
+exports.DEFAULT_BUNDLE_VERSION = '1';
+exports.DEFAULT_BUNDLE_SHORT_VERSION = '1.0';
+exports.NSE_TARGET_NAME = "OneSignalNotificationServiceExtension";

package/build/support/serviceExtensionFiles/OneSignalNotificationServiceExtension-Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>{{BUNDLE_SHORT_VERSION}}</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>{{BUNDLE_VERSION}}</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package/build/support/updatePodfile.js

@@ -6,17 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePodfile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const iosConstants_1 = require("./iosConstants");
-const ReaderManager_1 = require("./ReaderManager");
+const OneSignalLog_1 = require("./OneSignalLog");
+const FileManager_1 = require("./FileManager");
 async function updatePodfile(iosPath) {
-    const podfile = await ReaderManager_1.ReaderManager.readFile(`${iosPath}/Podfile`);
+    const podfile = await FileManager_1.FileManager.readFile(`${iosPath}/Podfile`);
     const matches = podfile.match(iosConstants_1.NSE_PODFILE_REGEX);
     if (matches) {
-        console.info("OneSignalNotificationServiceExtension target already added to Podfile. Skipping...");
+        OneSignalLog_1.OneSignalLog.log("OneSignalNotificationServiceExtension target already added to Podfile. Skipping...");
     }
     else {
         fs_1.default.appendFile(`${iosPath}/Podfile`, iosConstants_1.NSE_PODFILE_SNIPPET, (err) => {
             if (err) {
-                console.error("Error writing to Podfile");
+                OneSignalLog_1.OneSignalLog.error("Error writing to Podfile");
             }
         });
     }

package/onesignal/withOneSignalAndroid.ts

@@ -4,32 +4,26 @@
  */
 
 import { ConfigPlugin, withAppBuildGradle } from '@expo/config-plugins';
+import { ONESIGNAL_GRADLE } from '../support/androidConstants';
+import { OneSignalLog } from '../support/OneSignalLog';
 import { OneSignalPluginProps } from './withOneSignal';
 
-// ---------- ---------- ---------- ----------
-const oneSignalGradle = `
-buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
-    }
-}
-
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;
-
-// ---------- ---------- ---------- ----------
 const withGradleBuildConfig: ConfigPlugin<OneSignalPluginProps> = (config) => {
   return withAppBuildGradle(config, (newConfig) => {
-    newConfig.modResults.contents = `${oneSignalGradle.trimStart()}\n\n${
-      newConfig.modResults.contents
-    }`;
+    let { contents } = newConfig.modResults;
+
+    // make sure we haven't previously added dependencies
+    if (!contents.includes(ONESIGNAL_GRADLE)) {
+      contents = `${ONESIGNAL_GRADLE}\n${contents}`;
+    } else {
+      OneSignalLog.log("OneSignal dependencies already added to build.gradle. Skipping...");
+    }
+
+    newConfig.modResults.contents = contents;
     return newConfig;
   });
 };
 
-// ---------- ---------- ---------- ----------
 export const withOneSignalAndroid: ConfigPlugin<OneSignalPluginProps> = (
   config,
   props,

package/onesignal/withOneSignalIos.ts

@@ -10,22 +10,30 @@ import {
   withXcodeProject,
 } from "@expo/config-plugins";
 import { OneSignalPluginProps } from "./withOneSignal";
-import fs from 'fs';
+import * as fs from 'fs';
 import xcode from 'xcode';
-import { IPHONEOS_DEPLOYMENT_TARGET, TARGETED_DEVICE_FAMILY } from "../support/iosConstants";
+import {
+  DEFAULT_BUNDLE_SHORT_VERSION,
+  DEFAULT_BUNDLE_VERSION,
+  IPHONEOS_DEPLOYMENT_TARGET,
+  NSE_TARGET_NAME,
+  TARGETED_DEVICE_FAMILY
+} from "../support/iosConstants";
 import { updatePodfile } from "../support/updatePodfile";
-import { updateNSEEntitlements } from "../support/updateNSEEntitlements";
+import NseUpdaterManager from "../support/NseUpdaterManager";
+import { OneSignalLog } from "../support/OneSignalLog";
+import { FileManager } from "../support/FileManager";
 
 /* I N T E R F A C E S */
 interface PluginOptions {
-  iosPath: string,
-  devTeam?: string,
-  bundleIdentifier?: string,
-  iPhoneDeploymentTarget?: string
+  iosPath:                  string,
+  devTeam?:                 string,
+  bundleVersion?:           string,
+  bundleShortVersion?:      string,
+  bundleIdentifier?:        string,
+  iPhoneDeploymentTarget?:  string
 }
 
-// ---------- ---------- ---------- ----------
-
 /**
  * Add 'app-environment' record with current environment to '<project-name>.entitlements' file
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
@@ -77,13 +85,16 @@ const withAppGroupPermissions: ConfigPlugin<OneSignalPluginProps> = (
   config
 ) => {
   const APP_GROUP_KEY = "com.apple.security.application-groups";
-  return withEntitlementsPlist(config, (newConfig) => {
+  return withEntitlementsPlist(config, newConfig => {
     if (!Array.isArray(newConfig.modResults[APP_GROUP_KEY])) {
       newConfig.modResults[APP_GROUP_KEY] = [];
     }
-    (newConfig.modResults[APP_GROUP_KEY] as Array<any>).push(
-      `group.${newConfig?.ios?.bundleIdentifier || ""}.onesignal`
-    );
+    const modResultsArray = (newConfig.modResults[APP_GROUP_KEY] as Array<any>);
+    const entitlement = `group.${newConfig?.ios?.bundleIdentifier || ""}.onesignal`;
+    if (modResultsArray.indexOf(entitlement) !== -1) {
+      return newConfig;
+    }
+    modResultsArray.push(entitlement);
 
     return newConfig;
   });
@@ -95,6 +106,8 @@ const withOneSignalNSE: ConfigPlugin<OneSignalPluginProps> = (config, onesignalP
       iosPath: props.modRequest.platformProjectRoot,
       bundleIdentifier: props.ios?.bundleIdentifier,
       devTeam: onesignalProps?.devTeam,
+      bundleVersion: props.ios?.buildNumber,
+      bundleShortVersion: props?.version,
       iPhoneDeploymentTarget: onesignalProps?.iPhoneDeploymentTarget
     };
 
@@ -108,7 +121,6 @@ const withOneSignalNSE: ConfigPlugin<OneSignalPluginProps> = (config, onesignalP
   });
 }
 
-// ---------- ---------- ---------- ----------
 export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (
   config,
   props
@@ -120,57 +132,54 @@ export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (
   return config;
 };
 
-
 export function xcodeProjectAddNse(
   appName: string,
   options: PluginOptions,
   sourceDir: string
 ): void {
-  const { iosPath, devTeam, bundleIdentifier, iPhoneDeploymentTarget } = options;
+  const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget } = options;
 
-  updatePodfile(iosPath);
-  updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`)
+  // not awaiting in order to not block main thread
+  updatePodfile(iosPath).catch(err => { OneSignalLog.error(err) });
 
   const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
-  const targetName = "OneSignalNotificationServiceExtension";
 
   const extFiles = [
     "NotificationService.h",
     "NotificationService.m",
-    `${targetName}.entitlements`,
-    `${targetName}-Info.plist`
+    `${NSE_TARGET_NAME}.entitlements`,
+    `${NSE_TARGET_NAME}-Info.plist`
   ];
 
   const xcodeProject = xcode.project(projPath);
 
-  xcodeProject.parse(function(err: Error) {
+  xcodeProject.parse(async function(err: Error) {
     if (err) {
-      console.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
+      OneSignalLog.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
       return;
     }
 
-    // Copy in the extension files
-    fs.mkdirSync(`${iosPath}/${targetName}`, { recursive: true });
-    extFiles.forEach(function (extFile) {
-      let targetFile = `${iosPath}/${targetName}/${extFile}`;
-
-      try {
-        fs.createReadStream(`${sourceDir}${extFile}`).pipe(
-          fs.createWriteStream(targetFile)
-        );
-      } catch (err) {
-        console.log(err);
-      }
-    });
+    /* COPY OVER EXTENSION FILES */
+    fs.mkdirSync(`${iosPath}/${NSE_TARGET_NAME}`, { recursive: true });
 
-    const projObjects = xcodeProject.hash.project.objects;
+    for(let i = 0; i < extFiles.length; i++) {
+      const extFile = extFiles[i];
+      const targetFile = `${iosPath}/${NSE_TARGET_NAME}/${extFile}`;
+      await FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
+    }
+
+    /* MODIFY COPIED EXTENSION FILES */
+    const nseUpdater = new NseUpdaterManager(iosPath);
+    await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`)
+    await nseUpdater.updateNSEBundleVersion(bundleVersion ?? DEFAULT_BUNDLE_VERSION);
+    await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion ?? DEFAULT_BUNDLE_SHORT_VERSION);
 
     // Create new PBXGroup for the extension
-    let extGroup = xcodeProject.addPbxGroup(extFiles, targetName, targetName);
+    const extGroup = xcodeProject.addPbxGroup(extFiles, NSE_TARGET_NAME, NSE_TARGET_NAME);
 
     // Add the new PBXGroup to the top level group. This makes the
     // files / folder appear in the file explorer in Xcode.
-    let groups = xcodeProject.hash.project.objects["PBXGroup"];
+    const groups = xcodeProject.hash.project.objects["PBXGroup"];
     Object.keys(groups).forEach(function (key) {
       if (groups[key].name === undefined) {
         xcodeProject.addToPbxGroup(extGroup.uuid, key);
@@ -181,17 +190,18 @@ export function xcodeProjectAddNse(
     // Xcode projects don't contain these if there is only one target
     // An upstream fix should be made to the code referenced in this link:
     //   - https://github.com/apache/cordova-node-xcode/blob/8b98cabc5978359db88dc9ff2d4c015cba40f150/lib/pbxProject.js#L860
+    const projObjects = xcodeProject.hash.project.objects;
     projObjects['PBXTargetDependency'] = projObjects['PBXTargetDependency'] || {};
     projObjects['PBXContainerItemProxy'] = projObjects['PBXTargetDependency'] || {};
 
-    if (!!xcodeProject.pbxTargetByName(targetName)) {
-      console.log(targetName, "already exists in project. Skipping...");
+    if (!!xcodeProject.pbxTargetByName(NSE_TARGET_NAME)) {
+      OneSignalLog.log(`${NSE_TARGET_NAME} already exists in project. Skipping...`);
       return;
     }
 
     // Add the NSE target
     // This adds PBXTargetDependency and PBXContainerItemProxy for you
-    const nseTarget = xcodeProject.addTarget(targetName, "app_extension", targetName, `${bundleIdentifier}.${targetName}`);
+    const nseTarget = xcodeProject.addTarget(NSE_TARGET_NAME, "app_extension", NSE_TARGET_NAME, `${bundleIdentifier}.${NSE_TARGET_NAME}`);
 
     // Add build phases to the new target
     xcodeProject.addBuildPhase(
@@ -211,17 +221,17 @@ export function xcodeProjectAddNse(
 
     // Edit the Deployment info of the new Target, only IphoneOS and Targeted Device Family
     // However, can be more
-    let configurations = xcodeProject.pbxXCBuildConfigurationSection();
-    for (let key in configurations) {
+    const configurations = xcodeProject.pbxXCBuildConfigurationSection();
+    for (const key in configurations) {
       if (
         typeof configurations[key].buildSettings !== "undefined" &&
-        configurations[key].buildSettings.PRODUCT_NAME == `"${targetName}"`
+        configurations[key].buildSettings.PRODUCT_NAME == `"${NSE_TARGET_NAME}"`
       ) {
-        let buildSettingsObj = configurations[key].buildSettings;
+        const buildSettingsObj = configurations[key].buildSettings;
         buildSettingsObj.DEVELOPMENT_TEAM = devTeam;
         buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = iPhoneDeploymentTarget ?? IPHONEOS_DEPLOYMENT_TARGET;
         buildSettingsObj.TARGETED_DEVICE_FAMILY = TARGETED_DEVICE_FAMILY;
-        buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${targetName}/${targetName}.entitlements`;
+        buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${NSE_TARGET_NAME}/${NSE_TARGET_NAME}.entitlements`;
         buildSettingsObj.CODE_SIGN_STYLE = "Automatic";
       }
     }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "onesignal-expo-plugin",
-  "version": "1.0.0-beta9",
+  "version": "1.0.0",
   "description": "The OneSignal Expo plugin allows you to use OneSignal without leaving the managed workflow. Developed in collaboration with SweetGreen.",
   "main": "./app.plugin.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rm -rf build && tsc && cp -a support/serviceExtensionFiles build/support/",
+    "build": "yarn run lint && rm -rf build && tsc && cp -a support/serviceExtensionFiles build/support/",
+    "lint": "eslint . --ext .ts",
     "prepare": "yarn run build"
   },
   "repository": {
@@ -31,11 +32,14 @@
   },
   "homepage": "https://github.com/OneSignal/onesignal-expo-plugin#readme",
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
+    "eslint": "^8.8.0",
     "expo-module-scripts": "^2.0.0",
-    "readme-md-generator": "^1.0.0"
+    "readme-md-generator": "^1.0.0",
+    "typescript": "^4.5.5"
   },
   "dependencies": {
-    "react-native-onesignal": "^4.3.1",
     "xcode": "^3.0.1"
   }
 }

package/support/FileManager.ts

@@ -0,0 +1,38 @@
+import * as fs from 'fs';
+import { OneSignalLog } from './OneSignalLog';
+
+/**
+ * FileManager contains static *awaitable* file-system functions
+ */
+export class FileManager {
+  static async readFile(path: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+      fs.readFile(path, 'utf8', (err, data) => {
+        if (err || !data) {
+          OneSignalLog.error("Couldn't read file:" + path);
+          reject(err);
+          return;
+        }
+        resolve(data);
+      });
+    });
+  }
+
+  static async writeFile(path: string, contents: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      fs.writeFile(path, contents, 'utf8', (err) => {
+        if (err) {
+          OneSignalLog.error("Couldn't write file:" + path);
+          reject(err);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+
+  static async copyFile(path1: string, path2: string): Promise<void> {
+    const fileContents = await FileManager.readFile(path1);
+    await FileManager.writeFile(path2, fileContents);
+  }
+}

package/support/NseUpdaterManager.ts

@@ -0,0 +1,39 @@
+import { FileManager } from './FileManager';
+import {
+  BUNDLE_SHORT_VERSION_TEMPLATE_REGEX,
+  BUNDLE_VERSION_TEMPLATE_REGEX,
+  GROUP_IDENTIFIER_TEMPLATE_REGEX,
+  NSE_TARGET_NAME
+} from './iosConstants';
+
+// project `ios/OneSignalNotificationServiceExtension` directory
+const entitlementsFileName =`OneSignalNotificationServiceExtension.entitlements`;
+const plistFileName = `OneSignalNotificationServiceExtension-Info.plist`;
+
+export default class NseUpdaterManager {
+  private nsePath = '';
+  constructor(iosPath: string) {
+    this.nsePath = `${iosPath}/${NSE_TARGET_NAME}`;
+  }
+
+  async updateNSEEntitlements(groupIdentifier: string): Promise<void> {
+    const entitlementsFilePath = `${this.nsePath}/${entitlementsFileName}`;
+    let entitlementsFile = await FileManager.readFile(entitlementsFilePath);
+    entitlementsFile = entitlementsFile.replace(GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
+    await FileManager.writeFile(entitlementsFilePath, entitlementsFile);
+  }
+
+  async updateNSEBundleVersion(version: string): Promise<void> {
+    const plistFilePath = `${this.nsePath}/${plistFileName}`;
+    let plistFile = await FileManager.readFile(plistFilePath);
+    plistFile = plistFile.replace(BUNDLE_VERSION_TEMPLATE_REGEX, version);
+    await FileManager.writeFile(plistFilePath, plistFile);
+  }
+
+  async updateNSEBundleShortVersion(version: string): Promise<void> {
+    const plistFilePath = `${this.nsePath}/${plistFileName}`;
+    let plistFile = await FileManager.readFile(plistFilePath);
+    plistFile = plistFile.replace(BUNDLE_SHORT_VERSION_TEMPLATE_REGEX, version);
+    await FileManager.writeFile(plistFilePath, plistFile);
+  }
+}

package/support/OneSignalLog.ts

@@ -0,0 +1,9 @@
+export class OneSignalLog {
+  static log(str: string) {
+    console.log(`\tonesignal-expo-plugin: ${str}`)
+  }
+
+  static error(str: string) {
+    console.error(`\tonesignal-expo-plugin: ${str}`)
+  }
+}

package/support/androidConstants.ts

@@ -0,0 +1,11 @@
+export const ONESIGNAL_GRADLE =
+`buildscript {
+    repositories {
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
+    }
+}
+
+apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;

package/support/iosConstants.ts

@@ -1,5 +1,5 @@
 export const IPHONEOS_DEPLOYMENT_TARGET = "11.0";
-export const TARGETED_DEVICE_FAMILY = `\"1,2\"`;
+export const TARGETED_DEVICE_FAMILY = `"1,2"`;
 
 export const NSE_PODFILE_SNIPPET = `
 target 'OneSignalNotificationServiceExtension' do
@@ -9,3 +9,10 @@ end`;
 export const NSE_PODFILE_REGEX = /target 'OneSignalNotificationServiceExtension'/;
 
 export const GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
+export const BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = /{{BUNDLE_SHORT_VERSION}}/gm;
+export const BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
+
+export const DEFAULT_BUNDLE_VERSION = '1';
+export const DEFAULT_BUNDLE_SHORT_VERSION = '1.0';
+
+export const NSE_TARGET_NAME = "OneSignalNotificationServiceExtension";

package/support/serviceExtensionFiles/OneSignalNotificationServiceExtension-Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>{{BUNDLE_SHORT_VERSION}}</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>{{BUNDLE_VERSION}}</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package/support/updatePodfile.ts

@@ -1,17 +1,18 @@
 import fs from 'fs';
 import { NSE_PODFILE_REGEX, NSE_PODFILE_SNIPPET } from './iosConstants';
-import { ReaderManager } from './ReaderManager';
+import { OneSignalLog } from './OneSignalLog';
+import { FileManager } from './FileManager';
 
 export async function updatePodfile(iosPath: string) {
-  const podfile = await ReaderManager.readFile(`${iosPath}/Podfile`);
+  const podfile = await FileManager.readFile(`${iosPath}/Podfile`);
   const matches = podfile.match(NSE_PODFILE_REGEX);
 
   if (matches) {
-    console.info("OneSignalNotificationServiceExtension target already added to Podfile. Skipping...");
+    OneSignalLog.log("OneSignalNotificationServiceExtension target already added to Podfile. Skipping...");
   } else {
     fs.appendFile(`${iosPath}/Podfile`, NSE_PODFILE_SNIPPET, (err) => {
       if (err) {
-        console.error("Error writing to Podfile");
+        OneSignalLog.error("Error writing to Podfile");
       }
     })
   }

package/build/support/updateNSEEntitlements.js

@@ -1,20 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateNSEEntitlements = void 0;
-const fs_1 = __importDefault(require("fs"));
-const iosConstants_1 = require("./iosConstants");
-const ReaderManager_1 = require("./ReaderManager");
-const fileToEdit = `${__dirname}/serviceExtensionFiles/OneSignalNotificationServiceExtension.entitlements`;
-async function updateNSEEntitlements(groupIdentifier) {
-    let entitlementsFile = await ReaderManager_1.ReaderManager.readFile(fileToEdit);
-    entitlementsFile = entitlementsFile.replace(iosConstants_1.GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
-    fs_1.default.writeFile(fileToEdit, entitlementsFile, 'utf-8', (err) => {
-        if (err) {
-            console.error("Error updating OneSignal NSE Entitlement File.");
-        }
-    });
-}
-exports.updateNSEEntitlements = updateNSEEntitlements;

package/support/ReaderManager.ts

@@ -1,18 +0,0 @@
-import * as fs from 'fs';
-
-export class ReaderManager {
-  static async readFile(path: string, replace?: string): Promise<string> {
-    return new Promise<string>((resolve, reject) => {
-      fs.readFile(path, 'utf8', (err, data) => {
-        if (err) {
-          reject(err);
-        }
-        if (!data) {
-          console.error("Couldn't read file:", path);
-          return;
-        }
-        resolve(data);
-      });
-    });
-  }
-}

package/support/updateNSEEntitlements.ts

@@ -1,16 +0,0 @@
-import fs from 'fs';
-import { GROUP_IDENTIFIER_TEMPLATE_REGEX } from './iosConstants';
-import { ReaderManager } from './ReaderManager';
-
-const fileToEdit =`${__dirname}/serviceExtensionFiles/OneSignalNotificationServiceExtension.entitlements`;
-
-export async function updateNSEEntitlements(groupIdentifier: string) {
-  let entitlementsFile = await ReaderManager.readFile(fileToEdit);
-  entitlementsFile = entitlementsFile.replace(GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
-
-  fs.writeFile(fileToEdit, entitlementsFile, 'utf-8', (err) => {
-    if (err) {
-      console.error("Error updating OneSignal NSE Entitlement File.");
-    }
-  })
-}