Merge branch 'develop' of https://github.com/fosslight/fosslight_dependency_scanner into develop

Author: dd-jy

.bumpversion.cfg

@@ -2,7 +2,7 @@
 commit = True
 tag = False
 message = Bump version: {current_version} → {new_version}
-current_version = 3.8.0
+current_version = 3.9.4
 
 [bumpversion:file:setup.py]
 search = '{current_version}'

.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

CHANGELOG.md

@@ -1,5 +1,59 @@
 # Changelog
 
+## v3.9.4 (11/04/2022)
+## Changes
+## 🚀 Features
+
+- Support Package.resolved v2 (swift) @dd-jy (#84)
+
+## 🐛 Hotfixes
+
+- Fix to show npm package license even if not spdx @dd-jy (#80)
+- Fix the npm issue (no packages to install) @dd-jy (#79)
+
+## 🔧 Maintenance
+
+- Add a commit message checker @soimkim (#82)
+
+---
+
+## v3.9.3 (11/03/2022)
+## Changes
+## 🔧 Maintenance
+
+- Apply f-string format @bjk7119 (#78)
+- Comment out some sentences in the PR template @soimkim (#77)
+
+---
+
+## v3.9.2 (14/02/2022)
+## Changes
+## 🐛 Hotfixes
+
+- Support local scm package for Cocoapods @dd-jy (#76)
+
+---
+
+## v3.9.1 (10/02/2022)
+## Changes
+## 🔧 Maintenance
+
+- Modify to print output file name @bjk7119 (#75)
+
+---
+
+## v3.9.0 (13/01/2022)
+## Changes
+## 🚀 Features
+
+- Modify to analyze the license name for carthage @dd-jy (#73)
+
+## 🔧 Maintenance
+
+- Update the README to add 'how it works without Internet' @dd-jy (#74)
+
+---
+
 ## v3.8.0 (24/12/2021)
 ## Changes
 ## 🚀 Features

setup.py

@@ -17,7 +17,7 @@
 if __name__ == "__main__":
     setup(
         name='fosslight_dependency',
-        version='3.8.0',
+        version='3.9.4',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Dependency Scanner',

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 = ''