From cb8aaa010f43f42a3cbe2abc5d56166abe777917 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Fri, 28 Jun 2024 16:41:32 +0530 Subject: [PATCH 1/2] Fix unknown property issue with buildResults variable --- .../groovy/io/ballerina/plugin/BallerinaPlugin.groovy | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy b/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy index e9a31d6..b603bf2 100644 --- a/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy +++ b/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy @@ -267,7 +267,7 @@ class BallerinaPlugin implements Plugin { project.exec { workingDir project.projectDir environment 'JAVA_OPTS', '-DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true' - def buildResult = new ByteArrayOutputStream() + standardOutput = new ByteArrayOutputStream() if (buildOnDocker) { createDockerEnvFile("$project.projectDir/docker.env") def balPackWithDocker = """ @@ -280,22 +280,18 @@ class BallerinaPlugin implements Plugin { """ if (Os.isFamily(Os.FAMILY_WINDOWS)) { commandLine 'cmd', '/c', "$balPackWithDocker && exit %%ERRORLEVEL%%" - standardOutput = buildResult } else { commandLine 'sh', '-c', "$balPackWithDocker" - standardOutput = buildResult } } else { if (Os.isFamily(Os.FAMILY_WINDOWS)) { commandLine 'cmd', '/c', "$distributionBinPath/bal.bat pack --target-dir ${balBuildTarget} --offline && exit %%ERRORLEVEL%%" - standardOutput = buildResult } else { commandLine 'sh', '-c', "$distributionBinPath/bal pack --target-dir ${balBuildTarget} --offline" - standardOutput = buildResult } } } - println "Command output: ${buildResult.toString()}" + println "Command output: ${standardOutput.toString()}" def balaPath = "$project.projectDir/${balBuildTarget}/bala" def balaDir = new File(balaPath) From ff5228514e4e0c96e7d8fa3942bb280678911e53 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Fri, 28 Jun 2024 16:45:29 +0530 Subject: [PATCH 2/2] Add functionality to log details in the std-out --- src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy b/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy index b603bf2..90272c7 100644 --- a/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy +++ b/src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy @@ -268,6 +268,7 @@ class BallerinaPlugin implements Plugin { workingDir project.projectDir environment 'JAVA_OPTS', '-DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true' standardOutput = new ByteArrayOutputStream() + showStandardStreams = true if (buildOnDocker) { createDockerEnvFile("$project.projectDir/docker.env") def balPackWithDocker = """