Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/nativephp.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
'storage/framework/sessions',
'storage/framework/cache',
'storage/framework/testing',
'storage/logs/laravel.log'
'storage/logs/laravel.log',
],

/*
Expand Down
96 changes: 96 additions & 0 deletions src/Commands/PluginRegisterCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,102 @@ protected function detectConflicts(Plugin $newPlugin): array
}
}

// Check native dependency version conflicts
foreach ($this->registry->all() as $existing) {
$conflicts = array_merge($conflicts, $this->detectDependencyConflictsBetween($newPlugin, $existing));
}

return $conflicts;
}

/**
* Detect native dependency version conflicts between two plugins.
*
* @return array<string> Conflict messages
*/
protected function detectDependencyConflictsBetween(Plugin $newPlugin, Plugin $existing): array
{
$conflicts = [];

// Android Gradle dependencies
$newAndroidDeps = $this->parseAndroidDeps($newPlugin);
$existingAndroidDeps = $this->parseAndroidDeps($existing);

foreach ($newAndroidDeps as $artifact => $version) {
if (isset($existingAndroidDeps[$artifact]) && $existingAndroidDeps[$artifact] !== $version) {
$conflicts[] = "Android dependency '{$artifact}' version conflict: {$version} vs {$existingAndroidDeps[$artifact]} (from '{$existing->name}')";
}
}

// CocoaPods
$newPods = $this->parsePodDeps($newPlugin);
$existingPods = $this->parsePodDeps($existing);

foreach ($newPods as $podName => $version) {
if ($version !== null && isset($existingPods[$podName]) && $existingPods[$podName] !== null && $existingPods[$podName] !== $version) {
$conflicts[] = "CocoaPods dependency '{$podName}' version conflict: {$version} vs {$existingPods[$podName]} (from '{$existing->name}')";
}
}

// Swift Packages
$newSwiftPkgs = $this->parseSwiftPackageDeps($newPlugin);
$existingSwiftPkgs = $this->parseSwiftPackageDeps($existing);

foreach ($newSwiftPkgs as $url => $version) {
if ($version !== null && isset($existingSwiftPkgs[$url]) && $existingSwiftPkgs[$url] !== null && $existingSwiftPkgs[$url] !== $version) {
$conflicts[] = "Swift Package '{$url}' version conflict: {$version} vs {$existingSwiftPkgs[$url]} (from '{$existing->name}')";
}
}

return $conflicts;
}

/**
* Parse Android Gradle dependencies into artifact => version map.
*/
protected function parseAndroidDeps(Plugin $plugin): array
{
$deps = [];
foreach ($plugin->getAndroidDependencies() as $type => $libraries) {
foreach ($libraries as $library) {
$parts = explode(':', $library);
if (count($parts) >= 3) {
$deps[$parts[0].':'.$parts[1]] = $parts[2];
}
}
}

return $deps;
}

/**
* Parse CocoaPods dependencies into name => version map.
*/
protected function parsePodDeps(Plugin $plugin): array
{
$deps = [];
foreach ($plugin->getIosDependencies()['pods'] ?? [] as $pod) {
if (isset($pod['name'])) {
$deps[$pod['name']] = $pod['version'] ?? null;
}
}

return $deps;
}

/**
* Parse Swift Package dependencies into normalizedUrl => version map.
*/
protected function parseSwiftPackageDeps(Plugin $plugin): array
{
$deps = [];
foreach ($plugin->getIosDependencies()['swift_packages'] ?? [] as $pkg) {
if (isset($pkg['url'])) {
$normalizedUrl = rtrim(preg_replace('/\.git$/', '', $pkg['url']), '/');
$deps[$normalizedUrl] = $pkg['version'] ?? null;
}
}

return $deps;
}
}
12 changes: 7 additions & 5 deletions src/Exceptions/PluginConflictException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ public function __construct(array $conflicts)
$messages = [];
foreach ($conflicts as $conflict) {
$plugins = implode(' and ', $conflict['plugins']);
if ($conflict['type'] === 'namespace') {
$messages[] = "Namespace '{$conflict['value']}' is used by both {$plugins}";
} else {
$messages[] = "Bridge function '{$conflict['value']}' is registered by both {$plugins}";
}
$messages[] = match ($conflict['type']) {
'namespace' => "Namespace '{$conflict['value']}' is used by both {$plugins}",
'android_dependency' => "Android dependency '{$conflict['value']}' has version conflicts between {$plugins}",
'ios_pod_dependency' => "CocoaPods dependency '{$conflict['value']}' has version conflicts between {$plugins}",
'ios_swift_package_dependency' => "Swift Package '{$conflict['value']}' has version conflicts between {$plugins}",
default => "Bridge function '{$conflict['value']}' is registered by both {$plugins}",
};
}

parent::__construct(
Expand Down
104 changes: 104 additions & 0 deletions src/Plugins/PluginRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,110 @@ public function detectConflicts(): array
}
}

return array_merge($conflicts, $this->detectDependencyConflicts($plugins));
}

/**
* Detect native dependency version conflicts between plugins.
*
* @return array<array{type: string, value: string, plugins: array<string>}>
*/
protected function detectDependencyConflicts(Collection $plugins): array
{
$conflicts = [];

// Collect all dependencies grouped by artifact identifier
$androidDeps = []; // keyed by "group:artifact"
$podDeps = []; // keyed by pod name
$swiftPkgDeps = []; // keyed by normalized URL

foreach ($plugins as $plugin) {
// Android Gradle dependencies
foreach ($plugin->getAndroidDependencies() as $type => $libraries) {
foreach ($libraries as $library) {
$parts = explode(':', $library);
if (count($parts) >= 3) {
$artifact = $parts[0].':'.$parts[1];
$version = $parts[2];
$androidDeps[$artifact][] = [
'version' => $version,
'plugin' => $plugin->name,
];
}
}
}

// iOS dependencies
$iosDeps = $plugin->getIosDependencies();

// CocoaPods
foreach ($iosDeps['pods'] ?? [] as $pod) {
if (! isset($pod['name'])) {
continue;
}
$podDeps[$pod['name']][] = [
'version' => $pod['version'] ?? null,
'plugin' => $plugin->name,
];
}

// Swift Packages
foreach ($iosDeps['swift_packages'] ?? [] as $pkg) {
if (! isset($pkg['url'])) {
continue;
}
$normalizedUrl = rtrim(preg_replace('/\.git$/', '', $pkg['url']), '/');
$swiftPkgDeps[$normalizedUrl][] = [
'version' => $pkg['version'] ?? null,
'plugin' => $plugin->name,
];
}
}

// Check for Android dependency version conflicts
foreach ($androidDeps as $artifact => $entries) {
$versions = array_unique(array_column($entries, 'version'));
if (count($versions) > 1) {
$pluginNames = array_unique(array_column($entries, 'plugin'));
$versionList = implode(' vs ', $versions);
$conflicts[] = [
'type' => 'android_dependency',
'value' => "{$artifact} ({$versionList})",
'plugins' => array_values($pluginNames),
];
}
}

// Check for CocoaPods version conflicts
foreach ($podDeps as $podName => $entries) {
$versioned = array_filter($entries, fn ($e) => $e['version'] !== null);
$versions = array_unique(array_column($versioned, 'version'));
if (count($versions) > 1) {
$pluginNames = array_unique(array_column($entries, 'plugin'));
$versionList = implode(' vs ', $versions);
$conflicts[] = [
'type' => 'ios_pod_dependency',
'value' => "{$podName} ({$versionList})",
'plugins' => array_values($pluginNames),
];
}
}

// Check for Swift Package version conflicts
foreach ($swiftPkgDeps as $url => $entries) {
$versioned = array_filter($entries, fn ($e) => $e['version'] !== null);
$versions = array_unique(array_column($versioned, 'version'));
if (count($versions) > 1) {
$pluginNames = array_unique(array_column($entries, 'plugin'));
$versionList = implode(' vs ', $versions);
$conflicts[] = [
'type' => 'ios_swift_package_dependency',
'value' => "{$url} ({$versionList})",
'plugins' => array_values($pluginNames),
];
}
}

return $conflicts;
}

Expand Down
Loading
Loading