Fix coverage for converted SPM projects

undefinedlabs · Feb 14, 2020 · 2b360f7 · 2b360f7
1 parent b43ab3f
commit 2b360f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/action.yml b/action.yml
@@ -21,15 +21,12 @@ inputs:
   sdk:
     description: 'Sdk used for building, by default: \"iphonesimulator\" will be used'
     required: false
-    default: "iphonesimulator"
   destination:
     description: 'Destination for testing, by default: \"platform=iOS Simulator,name=iPhone 11\"'
     required: false
-    default: '\"platform=iOS Simulator,name=iPhone 11\"'
   configuration:
     description: 'Configuration for testing, by default: \"Debug\"'
     required: false
-    default: '\"Debug\"'
   agentVersion:
     description: "Version of the Scope agent to use for testing, by default the latest stable"
     required: false

diff --git a/dist/index.js b/dist/index.js
@@ -1001,7 +1001,6 @@ async function run() {
     //Read project
     const workspace = await getWorkspace();
     let xcodeproj = await getXCodeProj();
-    let isSPM = false;
     var projectParameter;
 
     if (workspace) {
@@ -1015,13 +1014,12 @@ async function run() {
         await swiftPackageRun(extraParameters, codePathEnabled, agentVersion);
         return;
       } else {
-        isSPM = true;
         xcodeproj = await generateProjectFromSPM();
         projectParameter = "-project " + xcodeproj;
       }
     } else {
       core.setFailed(
-        "Unable to find workspace, project or Swift package file. Please set with.workspace or.xcodeproj"
+        "Unable to find workspace, project or Swift package file. Please set with workspace or xcodeproj"
       );
     }
 
@@ -1157,7 +1155,7 @@ async function run() {
         ) {
           await runScopeCoverageWithSettings(
             settings.buildSettings,
-            isSPM,
+            false,
             scopeFrameworkToolsPath
           );
         }

diff --git a/index.js b/index.js
@@ -60,7 +60,6 @@ async function run() {
     //Read project
     const workspace = await getWorkspace();
     let xcodeproj = await getXCodeProj();
-    let isSPM = false;
     var projectParameter;
 
     if (workspace) {
@@ -74,13 +73,12 @@ async function run() {
         await swiftPackageRun(extraParameters, codePathEnabled, agentVersion);
         return;
       } else {
-        isSPM = true;
         xcodeproj = await generateProjectFromSPM();
         projectParameter = "-project " + xcodeproj;
       }
     } else {
       core.setFailed(
-        "Unable to find workspace, project or Swift package file. Please set with.workspace or.xcodeproj"
+        "Unable to find workspace, project or Swift package file. Please set with workspace or xcodeproj"
       );
     }
 
@@ -216,7 +214,7 @@ async function run() {
         ) {
           await runScopeCoverageWithSettings(
             settings.buildSettings,
-            isSPM,
+            false,
             scopeFrameworkToolsPath
           );
         }