react-native-legal 1.6.5 → 1.8.0

package/ios/ReactNativeLegalModule.mm

@@ -1,11 +1,19 @@
 #import "ReactNativeLegalModule.h"
 
+#import <React/RCTUtils.h>
+
+#ifdef REACT_NATIVE_LEGAL_USING_SPM
+@import ReactNativeLegalSwift;
+#else
+
 #if __has_include(<ReactNativeLegal/ReactNativeLegal-Swift.h>)
 #import <ReactNativeLegal/ReactNativeLegal-Swift.h>
 #else
 #import "ReactNativeLegal-Swift.h"
 #endif
 
+#endif
+
 #if RCT_NEW_ARCH_ENABLED
 #import "ReactNativeLegal.h"
 
@@ -19,7 +27,10 @@ RCT_EXPORT_MODULE(ReactNativeLegalModule)
 
 RCT_EXPORT_METHOD(launchLicenseListScreen : (NSString *)licenseHeaderText)
 {
-  [ReactNativeLegalModuleImpl launchLicenseListScreenWithLicenseHeaderText:licenseHeaderText];
+  [ReactNativeLegalModuleImpl launchLicenseListScreenWithLicenseHeaderText:licenseHeaderText
+                                                getPresentedViewController:^{
+                                                  return RCTPresentedViewController();
+                                                }];
 }
 
 RCT_EXPORT_METHOD(getLibrariesAsync : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)

package/ios/ReactNativeLegalModuleImpl.swift

@@ -2,7 +2,10 @@ import UIKit
 
 @objc(ReactNativeLegalModuleImpl)
 public class ReactNativeLegalModuleImpl: NSObject {
-  @objc public static func launchLicenseListScreen(licenseHeaderText: String) {
+  @objc public static func launchLicenseListScreen(
+    licenseHeaderText: String,
+    getPresentedViewController: @Sendable @escaping () -> UIViewController?
+  ) {
     guard
       let settingsBundleUrl = Bundle.main.url(forResource: "Settings", withExtension: "bundle"),
       let settingsBundle = Bundle(url: settingsBundleUrl),
@@ -19,7 +22,7 @@ public class ReactNativeLegalModuleImpl: NSObject {
     )
 
     DispatchQueue.main.async {
-      guard let presentedViewController = RCTPresentedViewController() else {
+      guard let presentedViewController = getPresentedViewController() else {
         return
       }
 

package/ios/ReactNativeLegalTableViewController.swift

@@ -1,3 +1,5 @@
+import UIKit
+
 class ReactNativeLegalTableViewController: UITableViewController {
   private let cellIdentifier = "ReactNativeLegalCell"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-legal",
-  "version": "1.6.5",
+  "version": "1.8.0",
   "description": "Acknowledge OSS libraries used in your React Native app",
   "keywords": [
     "react-native",
@@ -37,8 +37,11 @@
     "plugin",
     "plugin-utils",
     "src",
+    "swift-tools/Package.resolved",
+    "swift-tools/Package.swift",
     "LICENSE",
     "app.plugin.js",
+    "Package.swift",
     "react-native.config.js",
     "ReactNativeLegal.podspec"
   ],

package/plugin/build/android/addResourceKeepFile.d.ts

@@ -0,0 +1,5 @@
+import type { ExpoConfig } from 'expo/config';
+/**
+ * Adds a file that will keep the About Libraries json resource when resource shrinking is enabled
+ */
+export declare function addResourceKeepFile(config: ExpoConfig): ExpoConfig;

package/plugin/build/android/addResourceKeepFile.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addResourceKeepFile = addResourceKeepFile;
+const config_plugins_1 = require("expo/config-plugins");
+const android_1 = require("../../../plugin-utils/build/android");
+/**
+ * Adds a file that will keep the About Libraries json resource when resource shrinking is enabled
+ */
+function addResourceKeepFile(config) {
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        'android',
+        (exportedConfig) => {
+            (0, android_1.addResourceKeepFileUtil)(exportedConfig.modRequest.platformProjectRoot);
+            return exportedConfig;
+        },
+    ]);
+}

package/plugin/build/android/withAndroidLegal.js

@@ -8,6 +8,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const licenses_1 = require("@callstack/licenses");
 const config_plugins_1 = require("expo/config-plugins");
 const addListActivity_1 = require("./addListActivity");
+const addResourceKeepFile_1 = require("./addResourceKeepFile");
 const applyAndConfigureAboutLibrariesPlugin_1 = require("./applyAndConfigureAboutLibrariesPlugin");
 const declareAboutLibrariesPlugin_1 = require("./declareAboutLibrariesPlugin");
 /**
@@ -25,6 +26,7 @@ const withAndroidLegal = (config, { scanOptionsFactory }) => {
     config = (0, declareAboutLibrariesPlugin_1.declareAboutLibrariesPlugin)(config);
     config = (0, applyAndConfigureAboutLibrariesPlugin_1.applyAndConfigureAboutLibrariesPlugin)(config);
     config = (0, addListActivity_1.addListActivity)(config);
+    config = (0, addResourceKeepFile_1.addResourceKeepFile)(config);
     return config;
 };
 exports.withAndroidLegal = withAndroidLegal;

package/plugin/src/android/addResourceKeepFile.ts

@@ -0,0 +1,17 @@
+import type { ExpoConfig } from 'expo/config';
+import { withDangerousMod } from 'expo/config-plugins';
+
+import { addResourceKeepFileUtil } from '../../../plugin-utils/build/android';
+
+/**
+ * Adds a file that will keep the About Libraries json resource when resource shrinking is enabled
+ */
+export function addResourceKeepFile(config: ExpoConfig): ExpoConfig {
+  return withDangerousMod(config, [
+    'android',
+    (exportedConfig) => {
+      addResourceKeepFileUtil(exportedConfig.modRequest.platformProjectRoot);
+      return exportedConfig;
+    },
+  ]);
+}

package/plugin/src/android/withAndroidLegal.ts

@@ -6,6 +6,7 @@ import { type ConfigPlugin, withAndroidManifest } from 'expo/config-plugins';
 import type { PlatformPluginOptions } from '../types';
 
 import { addListActivity } from './addListActivity';
+import { addResourceKeepFile } from './addResourceKeepFile';
 import { applyAndConfigureAboutLibrariesPlugin } from './applyAndConfigureAboutLibrariesPlugin';
 import { declareAboutLibrariesPlugin } from './declareAboutLibrariesPlugin';
 
@@ -28,5 +29,6 @@ export const withAndroidLegal: ConfigPlugin<PlatformPluginOptions> = (config, {
   config = declareAboutLibrariesPlugin(config);
   config = applyAndConfigureAboutLibrariesPlugin(config);
   config = addListActivity(config);
+  config = addResourceKeepFile(config);
   return config;
 };

package/plugin-utils/build/android.d.ts

@@ -10,3 +10,7 @@ export declare function applyAndConfigureAboutLibrariesPluginUtil(androidAppBuil
  * adds a list activity to the list of application's activities
  */
 export declare function addListActivityUtil<T>(activities: T[]): T[];
+/**
+ * adds a file that will keep the About Libraries json resource when resource shrinking is enabled
+ */
+export declare function addResourceKeepFileUtil(androidProjectRootDir: string): void;

package/plugin-utils/build/android.js

@@ -1,53 +1,95 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.declareAboutLibrariesPluginUtil = declareAboutLibrariesPluginUtil;
 exports.applyAndConfigureAboutLibrariesPluginUtil = applyAndConfigureAboutLibrariesPluginUtil;
 exports.addListActivityUtil = addListActivityUtil;
+exports.addResourceKeepFileUtil = addResourceKeepFileUtil;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const licenses_1 = require("@callstack/licenses");
+const ANDROID_PLUGIN_APPLY_BLOCK_IDENTIFIER = 'com.mikepenz.aboutlibraries.plugin.android';
+const ANDROID_PLUGIN_APPLY_BLOCK = `apply plugin: "${ANDROID_PLUGIN_APPLY_BLOCK_IDENTIFIER}"`;
+const ANDROID_PLUGIN_CLASSPATH = 'com.mikepenz.aboutlibraries.plugin.android:com.mikepenz.aboutlibraries.plugin.android.gradle.plugin';
+const ANDROID_PLUGIN_DEFAULT_VERSION = '13.1.0';
+const GRADLE_PLUGIN_PORTAL = 'gradlePluginPortal()';
+const PLUGIN_APPLY_BLOCK_IDENTIFIER = 'com.mikepenz.aboutlibraries.plugin';
+const OLD_PLUGIN_CLASSPATH = 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin';
+const OLD_PLUGIN_CLASSPATH_REGEX = new RegExp(`\\s+classpath\\(['"]${OLD_PLUGIN_CLASSPATH}:\\d+\\.\\d+\\.\\d+['"]\\)\\n`);
+const DEPENDENCIES_BLOCK_DECLARATION_REGEX = new RegExp('dependencies\\s*{');
+const REPOSITORIES_BLOCK_DECLARATION_REGEX = new RegExp('repositories\\s*{');
+const APPLY_PLUGIN_BLOCK_REGEX = new RegExp(`apply\\s+plugin:\\s+['"]${PLUGIN_APPLY_BLOCK_IDENTIFIER}['"]\\n`);
+const APPLY_ANDROID_PLUGIN_BLOCK_REGEX = new RegExp(`apply\\s+plugin:\\s+['"]${ANDROID_PLUGIN_APPLY_BLOCK_IDENTIFIER}['"]`);
+const OLD_PLUGIN_CONFIG_BLOCK_REGEX = new RegExp('(?:\\s*aboutLibraries\\s*{\\s+)(?:(?:\\S+\\s*=\\s*\\S+\\s+)*)(?:})');
+const NEW_PLUGIN_CONFIG_GENERATED_START_COMMENT = '// GENERATED BY REACT-NATIVE-LEGAL DO NOT EDIT!\n';
+const NEW_PLUGIN_CONFIG_GENERATED_END_COMMENT = '// END OF GENERATED BY REACT-NATIVE-LEGAL\n';
+const NEW_PLUGIN_CONFIG_REGEX = new RegExp('(?:\\/\\/ GENERATED BY REACT-NATIVE-LEGAL DO NOT EDIT!\\n)(?:[\\s\\S]+)(?:\\/\\/ END OF GENERATED BY REACT-NATIVE-LEGAL\\n)');
 /**
  * Applies Gradle Plugin Portal & AboutLibraries Gradle plugin repositories (if needed) inside root build.gradle
  */
 function declareAboutLibrariesPluginUtil(androidBuildGradleContent) {
-    if (!androidBuildGradleContent.match(PLUGIN_CLASSPATH)?.length) {
-        // Add Gradle Plugin Portal repository if it's not included
-        if (!androidBuildGradleContent.match(GRADLE_PLUGIN_PORTAL_URL)?.length) {
-            androidBuildGradleContent = androidBuildGradleContent.replace(/repositories\s?{/, `repositories {\n        maven { url = uri("${GRADLE_PLUGIN_PORTAL_URL}") }`);
-            console.log('Gradle Plugin Portal repository - ADDED');
-        }
-        else {
-            console.log('Gradle Plugin Portal repository already added - SKIP');
-        }
+    if (androidBuildGradleContent.match(OLD_PLUGIN_CLASSPATH)?.length) {
+        // Remove old plugin
+        androidBuildGradleContent = androidBuildGradleContent.replace(OLD_PLUGIN_CLASSPATH_REGEX, '');
+    }
+    if (!androidBuildGradleContent.match(ANDROID_PLUGIN_CLASSPATH)?.length) {
         // Declare the AboutLibraries plugin
-        androidBuildGradleContent = androidBuildGradleContent.replace(/dependencies\s?{/, `dependencies {\n        classpath("${PLUGIN_CLASSPATH}:${PLUGIN_VERSION}")`);
+        androidBuildGradleContent = androidBuildGradleContent.replace(DEPENDENCIES_BLOCK_DECLARATION_REGEX, `dependencies {\n        classpath("${ANDROID_PLUGIN_CLASSPATH}:${ANDROID_PLUGIN_DEFAULT_VERSION}")`);
         console.log('About Libraries Gradle Plugin repository - ADDED');
     }
     else {
         console.log('About Libraries Gradle Plugin already added - SKIP');
     }
+    if (androidBuildGradleContent.match(GRADLE_PLUGIN_PORTAL_URL)?.length) {
+        console.log('Gradle Plugin Portal repository already added - SKIP');
+    }
+    else if (!androidBuildGradleContent.match(GRADLE_PLUGIN_PORTAL)?.length) {
+        // Add Gradle Plugin Portal repository if it's not included
+        androidBuildGradleContent = androidBuildGradleContent.replace(REPOSITORIES_BLOCK_DECLARATION_REGEX, 'repositories {\n        gradlePluginPortal()');
+        console.log('Gradle Plugin Portal repository - ADDED');
+    }
     return androidBuildGradleContent;
 }
 /**
  * Applies and configures AboutLibraries Grale plugin (if needed) inside app's build.gradle
  */
 function applyAndConfigureAboutLibrariesPluginUtil(androidAppBuildGradleContent) {
-    // Apply plugin
-    const applyPluginBlockRegex = new RegExp(`apply\\s+plugin:\\s+['"]${PLUGIN_APPLY_BLOCK_IDENTIFIER}['"]`);
-    if (!androidAppBuildGradleContent.match(applyPluginBlockRegex)?.length) {
-        androidAppBuildGradleContent += `\n${PLUGIN_APPLY_BLOCK}`;
+    if (androidAppBuildGradleContent.match(APPLY_PLUGIN_BLOCK_REGEX)?.length) {
+        // Remove old plugin
+        androidAppBuildGradleContent = androidAppBuildGradleContent.replace(APPLY_PLUGIN_BLOCK_REGEX, '');
+    }
+    // Remove old configuration
+    androidAppBuildGradleContent = androidAppBuildGradleContent.replace(OLD_PLUGIN_CONFIG_BLOCK_REGEX, '');
+    if (!androidAppBuildGradleContent.match(APPLY_ANDROID_PLUGIN_BLOCK_REGEX)?.length) {
+        // Apply plugin
+        androidAppBuildGradleContent += `\n${ANDROID_PLUGIN_APPLY_BLOCK}\n`;
         console.log('About Libraries Gradle Plugin - APPLIED');
     }
     else {
         console.log('About Libraries Gradle Plugin already applied - SKIP');
     }
+    let aboutLibrariesConfig = '\n';
+    aboutLibrariesConfig += NEW_PLUGIN_CONFIG_GENERATED_START_COMMENT;
+    aboutLibrariesConfig += 'aboutLibraries {\n';
+    aboutLibrariesConfig += '  offlineMode = false\n';
+    aboutLibrariesConfig += '  collect.configPath = file("../config")\n';
+    aboutLibrariesConfig += '  collect.fetchRemoteLicense = false\n';
+    aboutLibrariesConfig += '  collect.fetchRemoteFunding = false\n';
+    aboutLibrariesConfig += '  export {\n';
+    aboutLibrariesConfig += '    prettyPrint = true\n';
+    aboutLibrariesConfig += '  }\n';
+    aboutLibrariesConfig += '}\n';
+    aboutLibrariesConfig += NEW_PLUGIN_CONFIG_GENERATED_END_COMMENT;
     // Configure plugin
-    const pluginConfigRegex = /aboutLibraries {/;
-    if (!androidAppBuildGradleContent.match(pluginConfigRegex)?.length) {
-        androidAppBuildGradleContent += '\n\naboutLibraries {\n    configPath = "config"\n    prettyPrint = true\n}\n';
-        console.log('About Libraries Gradle Plugin - CONFIGURED');
+    if (androidAppBuildGradleContent.match(NEW_PLUGIN_CONFIG_REGEX)?.length) {
+        androidAppBuildGradleContent = androidAppBuildGradleContent.replace(NEW_PLUGIN_CONFIG_REGEX, aboutLibrariesConfig);
     }
     else {
-        console.log('About Libraries Gradle Plugin already configured - SKIP');
+        androidAppBuildGradleContent += aboutLibrariesConfig;
     }
+    console.log('About Libraries Gradle Plugin - CONFIGURED');
     return androidAppBuildGradleContent;
 }
 /**
@@ -82,9 +124,26 @@ function prepareListActivity() {
         },
     };
 }
+const RESOURCE_KEEP_FILE_CONTENT = `<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@raw/aboutlibraries" />
+`;
+/**
+ * adds a file that will keep the About Libraries json resource when resource shrinking is enabled
+ */
+function addResourceKeepFileUtil(androidProjectRootDir) {
+    const rawResourcesDir = node_path_1.default.join(androidProjectRootDir, 'app/src/main/res/raw');
+    const keepFilePath = node_path_1.default.join(rawResourcesDir, 'com_reactnativelegal_keep.xml');
+    if (!node_fs_1.default.existsSync(rawResourcesDir)) {
+        node_fs_1.default.mkdirSync(rawResourcesDir, { recursive: true });
+    }
+    if (!node_fs_1.default.existsSync(keepFilePath)) {
+        node_fs_1.default.writeFileSync(keepFilePath, RESOURCE_KEEP_FILE_CONTENT);
+        console.log('Android resource keep file - ADDED');
+    }
+    else {
+        console.log('Android resource keep file already exists - SKIPPED');
+    }
+}
 const GRADLE_PLUGIN_PORTAL_URL = 'https://plugins.gradle.org/m2';
 const PLUGIN_ACTIVITY = 'com.reactnativelegal.ReactNativeLegalActivity';
-const PLUGIN_APPLY_BLOCK = "apply plugin: 'com.mikepenz.aboutlibraries.plugin'";
-const PLUGIN_APPLY_BLOCK_IDENTIFIER = 'com.mikepenz.aboutlibraries.plugin';
-const PLUGIN_CLASSPATH = 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin';
-const PLUGIN_VERSION = '11.6.3';

package/plugin-utils/build/ios.js

@@ -34,10 +34,20 @@ function addSettingsBundleUtil(iosProjectPath, addResourceFileToGroup) {
  * Creates a shell script build phase (if needed) and links it to native targets build phases
  */
 function registerLicensePlistBuildPhaseUtil(projectTargetId, pbxproj) {
+    const licensePlistFlags = '--add-version-numbers --output-path ./Settings.bundle';
+    const licensePlistShellScript = `set -e\\n\\nif [[ -n \${PODS_ROOT} ]]; then \${PODS_ROOT}/LicensePlist/license-plist ${licensePlistFlags}; else /usr/bin/env xcrun --sdk macosx swift run -c release --package-path ./build/generated/autolinking/libs/ReactNativeLegal/swift-tools license-plist ${licensePlistFlags}; fi\\n`;
     const nativeTargetSection = pbxproj.pbxNativeTargetSection();
     const nativeTarget = nativeTargetSection[projectTargetId];
-    if (pbxproj.buildPhase(GENERATE_LICENSE_PLIST_BUILD_PHASE_COMMENT, projectTargetId)) {
-        console.log(`LicensePlist buildPhase already added in "${nativeTarget.name}" - SKIP`);
+    const existingBuildPhase = pbxproj.buildPhaseObject('PBXShellScriptBuildPhase', GENERATE_LICENSE_PLIST_BUILD_PHASE_COMMENT, projectTargetId);
+    if (existingBuildPhase) {
+        const licensePlistShellScriptWithDoubleQuotes = '"' + licensePlistShellScript + '"';
+        if (existingBuildPhase.shellScript === licensePlistShellScriptWithDoubleQuotes) {
+            console.log(`LicensePlist buildPhase already added in "${nativeTarget.name}" - SKIP`);
+        }
+        else {
+            existingBuildPhase.shellScript = licensePlistShellScriptWithDoubleQuotes;
+            console.log(`LicensePlist buildPhase in "${nativeTarget.name}" - MODIFIED`);
+        }
         return pbxproj;
     }
     /**
@@ -47,7 +57,7 @@ function registerLicensePlistBuildPhaseUtil(projectTargetId, pbxproj) {
      */
     const newBuildPhase = pbxproj.addBuildPhase([], 'PBXShellScriptBuildPhase', GENERATE_LICENSE_PLIST_BUILD_PHASE_COMMENT, projectTargetId, {
         shellPath: '/bin/sh',
-        shellScript: '${PODS_ROOT}/LicensePlist/license-plist --add-version-numbers --output-path ./Settings.bundle',
+        shellScript: licensePlistShellScript,
     });
     /**
      * In order to correctly link all metadata from `Settings.bundle` to the app

package/plugin-utils/src/android.ts

@@ -1,31 +1,64 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
 import { MiscUtils } from '@callstack/licenses';
 
+const ANDROID_PLUGIN_APPLY_BLOCK_IDENTIFIER = 'com.mikepenz.aboutlibraries.plugin.android';
+const ANDROID_PLUGIN_APPLY_BLOCK = `apply plugin: "${ANDROID_PLUGIN_APPLY_BLOCK_IDENTIFIER}"`;
+const ANDROID_PLUGIN_CLASSPATH =
+  'com.mikepenz.aboutlibraries.plugin.android:com.mikepenz.aboutlibraries.plugin.android.gradle.plugin';
+const ANDROID_PLUGIN_DEFAULT_VERSION = '13.1.0';
+const GRADLE_PLUGIN_PORTAL = 'gradlePluginPortal()';
+const PLUGIN_APPLY_BLOCK_IDENTIFIER = 'com.mikepenz.aboutlibraries.plugin';
+
+const OLD_PLUGIN_CLASSPATH = 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin';
+const OLD_PLUGIN_CLASSPATH_REGEX = new RegExp(
+  `\\s+classpath\\(['"]${OLD_PLUGIN_CLASSPATH}:\\d+\\.\\d+\\.\\d+['"]\\)\\n`,
+);
+const DEPENDENCIES_BLOCK_DECLARATION_REGEX = new RegExp('dependencies\\s*{');
+const REPOSITORIES_BLOCK_DECLARATION_REGEX = new RegExp('repositories\\s*{');
+const APPLY_PLUGIN_BLOCK_REGEX = new RegExp(`apply\\s+plugin:\\s+['"]${PLUGIN_APPLY_BLOCK_IDENTIFIER}['"]\\n`);
+const APPLY_ANDROID_PLUGIN_BLOCK_REGEX = new RegExp(
+  `apply\\s+plugin:\\s+['"]${ANDROID_PLUGIN_APPLY_BLOCK_IDENTIFIER}['"]`,
+);
+const OLD_PLUGIN_CONFIG_BLOCK_REGEX = new RegExp('(?:\\s*aboutLibraries\\s*{\\s+)(?:(?:\\S+\\s*=\\s*\\S+\\s+)*)(?:})');
+const NEW_PLUGIN_CONFIG_GENERATED_START_COMMENT = '// GENERATED BY REACT-NATIVE-LEGAL DO NOT EDIT!\n';
+const NEW_PLUGIN_CONFIG_GENERATED_END_COMMENT = '// END OF GENERATED BY REACT-NATIVE-LEGAL\n';
+const NEW_PLUGIN_CONFIG_REGEX = new RegExp(
+  '(?:\\/\\/ GENERATED BY REACT-NATIVE-LEGAL DO NOT EDIT!\\n)(?:[\\s\\S]+)(?:\\/\\/ END OF GENERATED BY REACT-NATIVE-LEGAL\\n)',
+);
+
 /**
  * Applies Gradle Plugin Portal & AboutLibraries Gradle plugin repositories (if needed) inside root build.gradle
  */
 export function declareAboutLibrariesPluginUtil(androidBuildGradleContent: string) {
-  if (!androidBuildGradleContent.match(PLUGIN_CLASSPATH)?.length) {
-    // Add Gradle Plugin Portal repository if it's not included
-    if (!androidBuildGradleContent.match(GRADLE_PLUGIN_PORTAL_URL)?.length) {
-      androidBuildGradleContent = androidBuildGradleContent.replace(
-        /repositories\s?{/,
-        `repositories {\n        maven { url = uri("${GRADLE_PLUGIN_PORTAL_URL}") }`,
-      );
-      console.log('Gradle Plugin Portal repository - ADDED');
-    } else {
-      console.log('Gradle Plugin Portal repository already added - SKIP');
-    }
+  if (androidBuildGradleContent.match(OLD_PLUGIN_CLASSPATH)?.length) {
+    // Remove old plugin
+    androidBuildGradleContent = androidBuildGradleContent.replace(OLD_PLUGIN_CLASSPATH_REGEX, '');
+  }
 
+  if (!androidBuildGradleContent.match(ANDROID_PLUGIN_CLASSPATH)?.length) {
     // Declare the AboutLibraries plugin
     androidBuildGradleContent = androidBuildGradleContent.replace(
-      /dependencies\s?{/,
-      `dependencies {\n        classpath("${PLUGIN_CLASSPATH}:${PLUGIN_VERSION}")`,
+      DEPENDENCIES_BLOCK_DECLARATION_REGEX,
+      `dependencies {\n        classpath("${ANDROID_PLUGIN_CLASSPATH}:${ANDROID_PLUGIN_DEFAULT_VERSION}")`,
     );
     console.log('About Libraries Gradle Plugin repository - ADDED');
   } else {
     console.log('About Libraries Gradle Plugin already added - SKIP');
   }
 
+  if (androidBuildGradleContent.match(GRADLE_PLUGIN_PORTAL_URL)?.length) {
+    console.log('Gradle Plugin Portal repository already added - SKIP');
+  } else if (!androidBuildGradleContent.match(GRADLE_PLUGIN_PORTAL)?.length) {
+    // Add Gradle Plugin Portal repository if it's not included
+    androidBuildGradleContent = androidBuildGradleContent.replace(
+      REPOSITORIES_BLOCK_DECLARATION_REGEX,
+      'repositories {\n        gradlePluginPortal()',
+    );
+    console.log('Gradle Plugin Portal repository - ADDED');
+  }
+
   return androidBuildGradleContent;
 }
 
@@ -33,26 +66,45 @@ export function declareAboutLibrariesPluginUtil(androidBuildGradleContent: strin
  * Applies and configures AboutLibraries Grale plugin (if needed) inside app's build.gradle
  */
 export function applyAndConfigureAboutLibrariesPluginUtil(androidAppBuildGradleContent: string) {
-  // Apply plugin
-  const applyPluginBlockRegex = new RegExp(`apply\\s+plugin:\\s+['"]${PLUGIN_APPLY_BLOCK_IDENTIFIER}['"]`);
+  if (androidAppBuildGradleContent.match(APPLY_PLUGIN_BLOCK_REGEX)?.length) {
+    // Remove old plugin
+    androidAppBuildGradleContent = androidAppBuildGradleContent.replace(APPLY_PLUGIN_BLOCK_REGEX, '');
+  }
+
+  // Remove old configuration
+  androidAppBuildGradleContent = androidAppBuildGradleContent.replace(OLD_PLUGIN_CONFIG_BLOCK_REGEX, '');
 
-  if (!androidAppBuildGradleContent.match(applyPluginBlockRegex)?.length) {
-    androidAppBuildGradleContent += `\n${PLUGIN_APPLY_BLOCK}`;
+  if (!androidAppBuildGradleContent.match(APPLY_ANDROID_PLUGIN_BLOCK_REGEX)?.length) {
+    // Apply plugin
+    androidAppBuildGradleContent += `\n${ANDROID_PLUGIN_APPLY_BLOCK}\n`;
     console.log('About Libraries Gradle Plugin - APPLIED');
   } else {
     console.log('About Libraries Gradle Plugin already applied - SKIP');
   }
 
-  // Configure plugin
-  const pluginConfigRegex = /aboutLibraries {/;
+  let aboutLibrariesConfig = '\n';
 
-  if (!androidAppBuildGradleContent.match(pluginConfigRegex)?.length) {
-    androidAppBuildGradleContent += '\n\naboutLibraries {\n    configPath = "config"\n    prettyPrint = true\n}\n';
-    console.log('About Libraries Gradle Plugin - CONFIGURED');
+  aboutLibrariesConfig += NEW_PLUGIN_CONFIG_GENERATED_START_COMMENT;
+  aboutLibrariesConfig += 'aboutLibraries {\n';
+  aboutLibrariesConfig += '  offlineMode = false\n';
+  aboutLibrariesConfig += '  collect.configPath = file("../config")\n';
+  aboutLibrariesConfig += '  collect.fetchRemoteLicense = false\n';
+  aboutLibrariesConfig += '  collect.fetchRemoteFunding = false\n';
+  aboutLibrariesConfig += '  export {\n';
+  aboutLibrariesConfig += '    prettyPrint = true\n';
+  aboutLibrariesConfig += '  }\n';
+  aboutLibrariesConfig += '}\n';
+  aboutLibrariesConfig += NEW_PLUGIN_CONFIG_GENERATED_END_COMMENT;
+
+  // Configure plugin
+  if (androidAppBuildGradleContent.match(NEW_PLUGIN_CONFIG_REGEX)?.length) {
+    androidAppBuildGradleContent = androidAppBuildGradleContent.replace(NEW_PLUGIN_CONFIG_REGEX, aboutLibrariesConfig);
   } else {
-    console.log('About Libraries Gradle Plugin already configured - SKIP');
+    androidAppBuildGradleContent += aboutLibrariesConfig;
   }
 
+  console.log('About Libraries Gradle Plugin - CONFIGURED');
+
   return androidAppBuildGradleContent;
 }
 
@@ -91,9 +143,29 @@ function prepareListActivity() {
   } as const;
 }
 
+const RESOURCE_KEEP_FILE_CONTENT = `<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@raw/aboutlibraries" />
+`;
+
+/**
+ * adds a file that will keep the About Libraries json resource when resource shrinking is enabled
+ */
+export function addResourceKeepFileUtil(androidProjectRootDir: string) {
+  const rawResourcesDir = path.join(androidProjectRootDir, 'app/src/main/res/raw');
+  const keepFilePath = path.join(rawResourcesDir, 'com_reactnativelegal_keep.xml');
+
+  if (!fs.existsSync(rawResourcesDir)) {
+    fs.mkdirSync(rawResourcesDir, { recursive: true });
+  }
+
+  if (!fs.existsSync(keepFilePath)) {
+    fs.writeFileSync(keepFilePath, RESOURCE_KEEP_FILE_CONTENT);
+    console.log('Android resource keep file - ADDED');
+  } else {
+    console.log('Android resource keep file already exists - SKIPPED');
+  }
+}
+
 const GRADLE_PLUGIN_PORTAL_URL = 'https://plugins.gradle.org/m2';
 const PLUGIN_ACTIVITY = 'com.reactnativelegal.ReactNativeLegalActivity';
-const PLUGIN_APPLY_BLOCK = "apply plugin: 'com.mikepenz.aboutlibraries.plugin'";
-const PLUGIN_APPLY_BLOCK_IDENTIFIER = 'com.mikepenz.aboutlibraries.plugin';
-const PLUGIN_CLASSPATH = 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin';
-const PLUGIN_VERSION = '11.6.3';

package/plugin-utils/src/ios.ts

@@ -39,11 +39,27 @@ export function registerLicensePlistBuildPhaseUtil(
   projectTargetId: string,
   pbxproj: XcodeProject, // Xcode Pbxproj
 ) {
+  const licensePlistFlags = '--add-version-numbers --output-path ./Settings.bundle';
+  const licensePlistShellScript = `set -e\\n\\nif [[ -n \${PODS_ROOT} ]]; then \${PODS_ROOT}/LicensePlist/license-plist ${licensePlistFlags}; else /usr/bin/env xcrun --sdk macosx swift run -c release --package-path ./build/generated/autolinking/libs/ReactNativeLegal/swift-tools license-plist ${licensePlistFlags}; fi\\n`;
   const nativeTargetSection = pbxproj.pbxNativeTargetSection();
   const nativeTarget = nativeTargetSection[projectTargetId];
 
-  if (pbxproj.buildPhase(GENERATE_LICENSE_PLIST_BUILD_PHASE_COMMENT, projectTargetId)) {
-    console.log(`LicensePlist buildPhase already added in "${nativeTarget.name}" - SKIP`);
+  const existingBuildPhase = pbxproj.buildPhaseObject(
+    'PBXShellScriptBuildPhase',
+    GENERATE_LICENSE_PLIST_BUILD_PHASE_COMMENT,
+    projectTargetId,
+  );
+
+  if (existingBuildPhase) {
+    const licensePlistShellScriptWithDoubleQuotes = '"' + licensePlistShellScript + '"';
+
+    if (existingBuildPhase.shellScript === licensePlistShellScriptWithDoubleQuotes) {
+      console.log(`LicensePlist buildPhase already added in "${nativeTarget.name}" - SKIP`);
+    } else {
+      existingBuildPhase.shellScript = licensePlistShellScriptWithDoubleQuotes;
+      console.log(`LicensePlist buildPhase in "${nativeTarget.name}" - MODIFIED`);
+    }
+
     return pbxproj;
   }
 
@@ -59,7 +75,7 @@ export function registerLicensePlistBuildPhaseUtil(
     projectTargetId,
     {
       shellPath: '/bin/sh',
-      shellScript: '${PODS_ROOT}/LicensePlist/license-plist --add-version-numbers --output-path ./Settings.bundle',
+      shellScript: licensePlistShellScript,
     },
   );
   /**

package/plugin-utils/tsconfig.json

@@ -1,19 +1,20 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "lib": ["es2020"],
-    "module": "commonjs",
+    "lib": ["es2020", "DOM"],
+    "module": "node16",
     "target": "es2020",
 
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
 
     "outDir": "build",
     "rootDir": "src",
-    "typeRoots": ["../types-definitions", "../../../node_modules/@types"]
+    "typeRoots": ["../types-definitions", "../../../node_modules/@types"],
+    "types": ["node", "xcode"]
   },
   "include": ["./src"],
   "exclude": ["**/__mocks__/*", "**/__tests__/*"]