Merge pull request #84 from fosslight/swift_issue

Support Package.resolved v2

Author: dd-jy

.github/workflows/pull-request.yml

@@ -100,6 +100,7 @@ jobs:
         fosslight_dependency -p tests/test_pub -o tests/result/pub
         fosslight_dependency -p tests/test_cocoapods/cocoapods-tips/JWSCocoapodsTips -o tests/result/Cocoapods
         fosslight_dependency -p tests/test_swift -o tests/result/swift -t ${{ secrets.TOKEN }}
+        fosslight_dependency -p tests/test_swift2 -o tests/result/swift2 -t ${{ secrets.TOKEN }}
         fosslight_dependency -p tests/test_carthage -o tests/result/carthage -t ${{ secrets.TOKEN }}
   reuse:
     runs-on: ubuntu-latest

.reuse/dep5

@@ -89,3 +89,7 @@ License: Apache-2.0
 Files: tests/test_multi_pypi_npm/*
 Copyright: 2021 LG Electronics
 License: Apache-2.0
+
+Files: tests/test_swift2/*
+Copyright: 2022 LG Electronics
+License: Apache-2.0

src/fosslight_dependency/package_manager/Swift.py

@@ -40,16 +40,34 @@ def check_input_file_path(self):
                             logger.info(f"It uses the manifest file: {self.input_file_name}")
 
     def parse_oss_information(self, f_name):
+        sheet_list = []
+        json_ver = 1
+
         with open(f_name, 'r', encoding='utf8') as json_file:
             json_raw = json.load(json_file)
-            json_data = json_raw["object"]["pins"]
+            json_ver = json_raw['version']
 
-        sheet_list = []
+            if json_ver == 1:
+                json_data = json_raw["object"]["pins"]
+            elif json_ver == 2:
+                json_data = json_raw["pins"]
+            else:
+                logger.error(f'Not supported Package.resolved version {json_ver}')
+                return sheet_list
 
         g = connect_github(self.github_token)
 
         for key in json_data:
-            oss_origin_name = key['package']
+            if json_ver == 1:
+                oss_origin_name = key['package']
+                homepage = key['repositoryURL']
+            elif json_ver == 2:
+                oss_origin_name = key['identity']
+                homepage = key['location']
+
+            if homepage.endswith('.git'):
+                homepage = homepage[:-4]
+
             oss_name = f"{self.package_manager_name}:{oss_origin_name}"
 
             revision = key['state']['revision']
@@ -59,7 +77,6 @@ def parse_oss_information(self, f_name):
             else:
                 oss_version = version
 
-            homepage = key['repositoryURL']
             dn_loc = homepage
             license_name = ''