Skip to content
Open
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
4 changes: 2 additions & 2 deletions ue4cli/PluginManager.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from inspect import signature
import pkg_resources
from importlib.metadata import entry_points

class PluginManager:
"""
Expand All @@ -16,7 +16,7 @@ def getPlugins():
plugins = {
entry_point.name: entry_point.load()
for entry_point
in pkg_resources.iter_entry_points('ue4cli.plugins')
in entry_points(group='ue4cli.plugins')
}

# Filter out any invalid plugins
Expand Down
10 changes: 5 additions & 5 deletions ue4cli/UnrealManagerDarwin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from .UnrealManagerException import UnrealManagerException
from .UnrealManagerUnix import UnrealManagerUnix
from .Utility import Utility
from pkg_resources import parse_version
from packaging import version
import glob, os

class UnrealManagerDarwin(UnrealManagerUnix):
Expand Down Expand Up @@ -34,16 +34,16 @@ def _detectEngineRoot(self):
return None

def _editorPathSuffix(self, cmdVersion):
version = parse_version(self.getEngineVersion())
if version < parse_version('5.0.0'):
version = version.parse(self.getEngineVersion())
if version < version.parse('5.0.0'):
return '.app/Contents/MacOS/UE4Editor'
else:
return '.app/Contents/MacOS/UnrealEditor'

def _transformBuildToolPlatform(self, platform):
# Prior to 4.22.2, Build.sh under Mac requires "macosx" as the platform name for macOS
version = parse_version(self.getEngineVersion())
return 'macosx' if platform == 'Mac' and version < parse_version('4.22.2') else platform
version = version.parse(self.getEngineVersion())
return 'macosx' if platform == 'Mac' and version < version.parse('4.22.2') else platform

def _getRunXBuildScript(self):
xbuildScript = super(UnrealManagerDarwin, self)._getRunXBuildScript()
Expand Down