Skip to content

Support swift package.resolved v3 #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Support swift package.resolved v3 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/fosslight_dependency/_package_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ def version_refine(oss_version):


def connect_github(github_token):
if github_token is not None:
if len(github_token) > 0:
g = Github(github_token)
else:
g = Github()
Expand Down
11 changes: 6 additions & 5 deletions src/fosslight_dependency/package_manager/Swift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def parse_dep_tree_json(self, rel_json):
return ret

def parse_oss_information(self, f_name):
json_ver = 1
json_ver = 2
purl_dict = {}

with open(f_name, 'r', encoding='utf8') as json_file:
Expand All @@ -107,11 +107,12 @@ def parse_oss_information(self, f_name):

if json_ver == 1:
json_data = json_raw["object"]["pins"]
elif json_ver == 2:
elif json_ver == 2 or json_ver == 3:
json_data = json_raw["pins"]
else:
logger.error(f'Not supported Package.resolved version {json_ver}')
return
logger.warning(f'Not supported Package.resolved version {json_ver}')
logger.warning('Try to parse as version 2(or 3)')
json_data = json_raw["pins"]

g = connect_github(self.github_token)

Expand All @@ -121,7 +122,7 @@ def parse_oss_information(self, f_name):
if json_ver == 1:
oss_origin_name = key['package']
oss_item.homepage = key['repositoryURL']
elif json_ver == 2:
else:
oss_origin_name = key['identity']
oss_item.homepage = key['location']

Expand Down
Loading