Merge pull request #18 from niveathika/main

Revert update default code coverage param
ballerina-platform · Jun 2, 2021 · 3fbaece · 3fbaece
2 parents 71e5b2d + 43ad983
commit 3fbaece
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.ballerina
-version=0.8.3
+version=0.8.4
diff --git a/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy b/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy
@@ -74,12 +74,6 @@ class BallerinaPlugin implements Plugin<Project> {
         def needPublishToLocalCentral = false
         def packageOrg = ''
 
-        if (project.extensions.ballerina.packageOrganization == null) {
-            packageOrg = 'ballerina'
-        } else {
-            packageOrg = project.extensions.ballerina.packageOrganization
-        }
-
         if (project.version.matches(project.ext.timestampedVersionRegex)) {
             def splitVersion = project.version.split('-')
             if (splitVersion.length > 3) {
@@ -173,7 +167,7 @@ class BallerinaPlugin implements Plugin<Project> {
                 }
                 if (graph.hasTask(":${packageName}-ballerina:test")) {
                     if (project.extensions.ballerina.testCoverageParam == null) {
-                        testParams = "--code-coverage --coverage-format=xml --includes=org.ballerinalang.stdlib.${packageName}.*:${packageOrg}.${packageName}.*"
+                        testParams = "--code-coverage --coverage-format=xml --includes=org.ballerinalang.stdlib.${packageName}.*:ballerina.${packageName}.*"
                     } else {
                         testParams = project.extensions.ballerina.testCoverageParam
                     }
@@ -194,6 +188,11 @@ class BallerinaPlugin implements Plugin<Project> {
                 String distributionBinPath = project.projectDir.absolutePath + "/build/target/extracted-distributions/jballerina-tools-zip/jballerina-tools-${project.extensions.ballerina.langVersion}/bin"
                 String packageName = project.extensions.ballerina.module
 
+                if (project.extensions.ballerina.packageOrganization == null) {
+                    packageOrg = 'ballerina'
+                } else {
+                    packageOrg = project.extensions.ballerina.packageOrganization
+                }
                 if (needBuildWithTest) {
                     project.exec {
                         workingDir project.projectDir