mindbox-expo-plugin 1.0.7-rc → 1.0.9-rc

package/build/android/withMindboxDependencies.js

@@ -16,18 +16,12 @@ const addMindboxDependencies = (config, props = {}) => {
     const providersToAdd = shouldRemoveFirebaseStarter
         ? props.androidPushProviders.filter(provider => provider !== "firebase")
         : props.androidPushProviders;
-    const shouldAddWorkaround = props.workRuntimeWorkaround === true;
-    if (providersToAdd.length === 0 && !shouldAddWorkaround) {
+    if (providersToAdd.length === 0) {
         return config;
     }
     return (0, config_plugins_1.withAppBuildGradle)(config, (buildGradle) => {
         const contents = buildGradle.modResults.contents;
-        const extraDependencies = [];
-        if (props.workRuntimeWorkaround === true) {
-            extraDependencies.push(`    ${androidConstants_1.ANDROID_CONSTANTS.IMPLEMENTATION} 'androidx.work:work-runtime-ktx:${androidConstants_1.ANDROID_CONSTANTS.WORK_RUNTIME_KTX_VERSION}'`);
-        }
-        const mindboxDependencies = providersToAdd.map(provider => `    ${androidConstants_1.ANDROID_CONSTANTS.IMPLEMENTATION} '${libraryMap[provider]}'`);
-        const dependencies = [...extraDependencies, ...mindboxDependencies].join('\n');
+        const dependencies = providersToAdd.map(provider => `    ${androidConstants_1.ANDROID_CONSTANTS.IMPLEMENTATION} '${libraryMap[provider]}'`).join('\n');
         buildGradle.modResults.contents = buildGradle.modResults.contents.replace(/(\s*)dependencies\s*\{/, `$1dependencies {\n${dependencies}`);
         return buildGradle;
     });

package/build/helpers/androidConstants.d.ts

@@ -14,7 +14,6 @@ export declare const ANDROID_CONSTANTS: {
     readonly RUSTORE_MAVEN_URL: "https://artifactory-external.vkpartner.ru/artifactory/maven";
     readonly RUSTORE_MAVEN_REPO: "    maven { url = uri(\"https://artifactory-external.vkpartner.ru/artifactory/maven\") }";
     readonly RUSTORE_PROJECT_ID_META_DATA_NAME: "ru.rustore.sdk.pushclient.project_id";
-    readonly WORK_RUNTIME_KTX_VERSION: "2.8.1";
 };
 export declare const REGEX_CAPTURE_GROUPS: {
     readonly FIRST: 1;

package/build/helpers/androidConstants.js

@@ -5,7 +5,6 @@ const VERSIONS = {
     GOOGLE_SERVICES: "4.4.0",
     HUAWEI_AGCP: "1.9.1.300",
     HUAWEI_PUSH: "6.11.0.300",
-    WORK_RUNTIME_KTX: "2.8.1",
 };
 exports.ANDROID_CONSTANTS = {
     IMPLEMENTATION: "implementation",
@@ -23,7 +22,6 @@ exports.ANDROID_CONSTANTS = {
     RUSTORE_MAVEN_URL: "https://artifactory-external.vkpartner.ru/artifactory/maven",
     RUSTORE_MAVEN_REPO: "    maven { url = uri(\"https://artifactory-external.vkpartner.ru/artifactory/maven\") }",
     RUSTORE_PROJECT_ID_META_DATA_NAME: "ru.rustore.sdk.pushclient.project_id",
-    WORK_RUNTIME_KTX_VERSION: VERSIONS.WORK_RUNTIME_KTX,
 };
 exports.REGEX_CAPTURE_GROUPS = {
     FIRST: 1,

package/build/ios/withPodfile.js

@@ -40,7 +40,16 @@ const iosConstants_1 = require("../helpers/iosConstants");
 const errorUtils_1 = require("../utils/errorUtils");
 const TARGET_REGEX = /^target\s+'[^']+'\s+do\s*\n/m;
 const USE_EXPO_MODULES_REGEX = /^\s*use_expo_modules!\s*$/m;
-const withMindboxPodfile = (config) => {
+const USE_FRAMEWORKS_REGEX = /^\s*use_frameworks!.*$/m;
+const RESOURCE_BUNDLE_SIGNING_FIX = `
+    installer.pods_project.targets.each do |target|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+            config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end`;
+const withMindboxPodfile = (config, props = {}) => {
     return (0, config_plugins_1.withDangerousMod)(config, [
         "ios",
         async (c) => {
@@ -48,7 +57,7 @@ const withMindboxPodfile = (config) => {
             if (!fs.existsSync(podfilePath))
                 return c;
             const source = fs.readFileSync(podfilePath, "utf8");
-            const updated = applyPodfileTransformations(source);
+            const updated = applyPodfileTransformations(source, props);
             if (updated !== source) {
                 fs.writeFileSync(podfilePath, updated, "utf8");
                 (0, errorUtils_1.logSuccess)("configure Podfile for Mindbox");
@@ -58,12 +67,16 @@ const withMindboxPodfile = (config) => {
     ]);
 };
 exports.default = withMindboxPodfile;
-function applyPodfileTransformations(podfile) {
-    return [
+function applyPodfileTransformations(podfile, props) {
+    const transformations = [
         insertMindboxNotificationsTarget,
         insertMindboxContentTarget,
-        insertMindboxPods
-    ].reduce((content, transform) => transform(content), podfile);
+        insertMindboxPods,
+    ];
+    if (!props.iosSkipResourceSigning) {
+        transformations.push(insertResourceBundleSigningFix);
+    }
+    return transformations.reduce((content, transform) => transform(content), podfile);
 }
 function insertTargetIfMissing(podfile, targetName, podLine, logMessage) {
     const targetHeader = `target '${targetName}' do`;
@@ -78,7 +91,9 @@ function insertTargetIfMissing(podfile, targetName, podLine, logMessage) {
     if (headerIdx === -1) {
         return podfile;
     }
-    const insertion = `target '${targetName}' do\n  ${podLine}\nend\n\n`;
+    const frameworksMatch = podfile.match(USE_FRAMEWORKS_REGEX);
+    const frameworksLine = frameworksMatch ? `  ${frameworksMatch[0].trim()}\n` : "";
+    const insertion = `target '${targetName}' do\n${frameworksLine}  ${podLine}\nend\n\n`;
     (0, errorUtils_1.logSuccess)(logMessage);
     return podfile.slice(0, headerIdx) + insertion + podfile.slice(headerIdx);
 }
@@ -121,3 +136,15 @@ function insertMindboxNotificationsTarget(podfile) {
 function insertMindboxContentTarget(podfile) {
     return insertTargetIfMissing(podfile, iosConstants_1.IOS_TARGET_NCE_NAME, iosConstants_1.POD_MINDBOX_NOTIFICATIONS_LINE, "add NCE target to Podfile as separate target");
 }
+function insertResourceBundleSigningFix(podfile) {
+    if (podfile.includes("CODE_SIGNING_ALLOWED'] = 'NO'")) {
+        return podfile;
+    }
+    const postInstallRegex = /post_install\s+do\s+\|installer\|/;
+    if (postInstallRegex.test(podfile)) {
+        (0, errorUtils_1.logSuccess)("add resource bundle signing fix to existing post_install");
+        return podfile.replace(postInstallRegex, `post_install do |installer|\n${RESOURCE_BUNDLE_SIGNING_FIX}`);
+    }
+    (0, errorUtils_1.logSuccess)("add resource bundle signing fix to new post_install");
+    return `${podfile}\n\npost_install do |installer|\n${RESOURCE_BUNDLE_SIGNING_FIX}\nend`;
+}

package/build/mindboxTypes.d.ts

@@ -22,5 +22,5 @@ export type MindboxPluginProps = {
     iosAppGroupId?: string;
     nativeRequestPermission?: boolean;
     usedExpoNotification?: boolean;
-    workRuntimeWorkaround?: boolean;
+    iosSkipResourceSigning?: boolean;
 };

package/build/utils/validation.js

@@ -19,7 +19,6 @@ const MINDBOX_PLUGIN_PROPS = [
     "iosDeploymentTarget",
     "iosDevTeam",
     "usedExpoNotification",
-    "workRuntimeWorkaround",
 ];
 const VALID_ANDROID_PROVIDERS = ["firebase", "huawei", "rustore"];
 const VALID_IOS_MODES = ["development", "production"];
@@ -80,7 +79,6 @@ function validatePluginProps(props) {
     validateStringProp(props.smallIconAccentColor, "smallIconAccentColor");
     validateBooleanProp(props.nativeRequestPermission, "nativeRequestPermission");
     validateBooleanProp(props.usedExpoNotification, "usedExpoNotification");
-    validateBooleanProp(props.workRuntimeWorkaround, "workRuntimeWorkaround");
     validateStringProp(props.iosNseFilePath, "iosNseFilePath");
     validateStringProp(props.iosNceFilePath, "iosNceFilePath");
     validateStringProp(props.iosAppGroupId, "iosAppGroupId");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mindbox-expo-plugin",
-  "version": "1.0.7-rc",
-  "target-version": "1.0.7-rc",
+  "version": "1.0.9-rc",
+  "target-version": "1.0.9-rc",
   "main": "app.plugin.js",
   "react-native": "build/runtime/index.js",
   "types": "build/index.d.ts",