react-native-legal 1.6.4 → 1.7.0

package/Package.swift

@@ -0,0 +1,56 @@
+// swift-tools-version: 6.0
+import PackageDescription
+
+let package = Package(
+    name: "ReactNativeLegal",
+    platforms: [.iOS(.v15), .tvOS(.v15)],
+    products: [
+        .library(name: "ReactNativeLegal", targets: ["ReactNativeLegalObjC"]),
+    ],
+    dependencies: [
+        .package(name: "ReactNative", path: "../../../../xcframeworks"),
+        .package(name: "React-GeneratedCode", path: "../../../ios"),
+    ],
+    targets: [
+        .target(
+            name: "ReactNativeLegalSwift",
+            path: ".",
+            sources: [
+                "ios/ReactNativeLegalDetailViewController.swift",
+                "ios/ReactNativeLegalLicenseMetadata.swift",
+                "ios/ReactNativeLegalModuleImpl.swift",
+                "ios/ReactNativeLegalTableViewController.swift",
+            ],
+            publicHeadersPath: "ios",
+            cSettings: [.headerSearchPath("ios")],
+            cxxSettings: [.headerSearchPath("ios"), .define("DEBUG", .when(configuration: .debug)), .define("NDEBUG", .when(configuration: .release))],
+            linkerSettings: [.linkedFramework("UIKit"), .linkedFramework("Foundation"), .linkedFramework("CoreGraphics")]
+        ),
+        .target(
+            name: "ReactNativeLegalObjC",
+            dependencies: [
+                "ReactNativeLegalSwift",
+                .product(name: "ReactHeaders", package: "ReactNative"),
+                .product(name: "ReactNativeHeaders", package: "ReactNative"),
+                .product(name: "ReactNativeDependenciesHeaders", package: "ReactNative"),
+                .product(name: "ReactAppHeaders", package: "React-GeneratedCode"),
+            ],
+            path: ".",
+            sources: [
+                "ios/ReactNativeLegalModule.h",
+                "ios/ReactNativeLegalModule.mm",
+            ],
+            publicHeadersPath: "ios",
+            cSettings: [.headerSearchPath("ios"), .define("REACT_NATIVE_LEGAL_USING_SPM")],
+            cxxSettings: [
+                .headerSearchPath("ios"),
+                .define("REACT_NATIVE_LEGAL_USING_SPM"),
+                .define("DEBUG", .when(configuration: .debug)),
+                .define("NDEBUG", .when(configuration: .release)),
+                .unsafeFlags(["-fmodules", "-fcxx-modules"])
+            ],
+            linkerSettings: [.linkedFramework("UIKit"), .linkedFramework("Foundation"), .linkedFramework("CoreGraphics")]
+        )
+    ],
+    cxxLanguageStandard: .cxx20
+)

package/android/build.gradle

@@ -25,7 +25,14 @@ if (project == rootProject) {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+// AGP 9 ships built-in Kotlin support and registers the `kotlin` extension
+// itself. Applying the Kotlin plugin on top of it fails configuration with
+// "Cannot add extension with name 'kotlin'". Only apply it when nothing has
+// registered that extension yet.
+if (project.extensions.findByName('kotlin') == null) {
+    apply plugin: 'kotlin-android'
+}
+
 if (isNewArchitectureEnabled()) {
     apply plugin: "com.facebook.react"
 }

package/bare-plugin/tsconfig.json

@@ -2,18 +2,19 @@
   "compilerOptions": {
     "declaration": true,
     "lib": ["es2020"],
-    "module": "commonjs",
+    "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__/*"]

package/ios/ReactNativeLegalDetailViewController.swift

@@ -1,3 +1,5 @@
+import UIKit
+
 class ReactNativeLegalDetailViewController: UIViewController {
   private var licenseContentTextView: UITextView = {
     let textView = UITextView()

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
       }
 
@@ -101,13 +104,13 @@ public class ReactNativeLegalModuleImpl: NSObject {
           .appendingPathExtension("plist")
 
         guard
-          let data = parsePlistToDictArray(fileUrl: fileUrl),
-          let item = data.first(where: { $0["FooterText"] != nil }),
-          let footerText = item["FooterText"] as? String
+          let data = parsePlistToDictArray(fileUrl: fileUrl)
         else {
           return ReactNativeLegalLicenseMetadata(name: title)
         }
 
+        let footerText = data.compactMap { $0["FooterText"] as? String }.joined(separator: "\n")
+
         return ReactNativeLegalLicenseMetadata(name: title, content: footerText)
       }
       .filter { $0.name != nil }

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.4",
+  "version": "1.7.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-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/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__/*"]

package/swift-tools/Package.resolved

@@ -0,0 +1,96 @@
+{
+  "originHash" : "cee7bf8ff6206ef1f83a8d7f34e0a0b8ad3e2b2f0097d8f6864806fc464ba4ed",
+  "pins" : [
+    {
+      "identity" : "apikit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ishkawa/APIKit.git",
+      "state" : {
+        "revision" : "b839e53b870104798035b279d2a6168b0a2227b1",
+        "version" : "5.4.0"
+      }
+    },
+    {
+      "identity" : "heliumlogger",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/HeliumLogger.git",
+      "state" : {
+        "revision" : "fc2a71597ae974da5282d751bcc11965964bccce",
+        "version" : "2.0.0"
+      }
+    },
+    {
+      "identity" : "licenseplist",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mono0926/LicensePlist",
+      "state" : {
+        "revision" : "af8dd93bcf798fc70e648f489a14423ea9105334",
+        "version" : "3.28.0"
+      }
+    },
+    {
+      "identity" : "loggerapi",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/LoggerAPI.git",
+      "state" : {
+        "revision" : "c26d5ef0009fbc0945326933e0f790bd33fe9062",
+        "version" : "2.1.0"
+      }
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "state" : {
+        "revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
+        "version" : "1.8.2"
+      }
+    },
+    {
+      "identity" : "swift-html-entities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Kitura/swift-html-entities.git",
+      "state" : {
+        "revision" : "d8ca73197f59ce260c71bd6d7f6eb8bbdccf508b",
+        "version" : "4.0.1"
+      }
+    },
+    {
+      "identity" : "swift-log",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-log.git",
+      "state" : {
+        "revision" : "3ffafb9722d5d918c614feb496c8789a3b59d222",
+        "version" : "1.15.0"
+      }
+    },
+    {
+      "identity" : "tomlkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/LebJe/TOMLKit.git",
+      "state" : {
+        "revision" : "ec6198d37d495efc6acd4dffbd262cdca7ff9b3f",
+        "version" : "0.6.0"
+      }
+    },
+    {
+      "identity" : "xcodeedit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tomlokhorst/XcodeEdit.git",
+      "state" : {
+        "revision" : "0e550cdee72844b35431afc3a1e176042be6d0f0",
+        "version" : "2.13.0"
+      }
+    },
+    {
+      "identity" : "yams",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jpsim/Yams.git",
+      "state" : {
+        "revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
+        "version" : "6.2.2"
+      }
+    }
+  ],
+  "version" : 3
+}

package/swift-tools/Package.swift

@@ -0,0 +1,15 @@
+// swift-tools-version: 6.0
+import PackageDescription
+
+let package = Package(
+  name: "Tools",
+  platforms: [
+    .macOS(.v11)
+  ],
+  dependencies: [
+    .package(url: "https://github.com/mono0926/LicensePlist", from: "3.28.0")
+  ],
+  targets: [
+    .target(name: "Tools", path: "")
+  ]
+)