Skip to content

Commit

Permalink
Fix GString not serializable
Browse files Browse the repository at this point in the history
  • Loading branch information
Shadow-Devil committed Dec 3, 2024
1 parent ba15121 commit bb168e6
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion cli/ballerina-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ test {
dependsOn copyCompilerPluginJars
dependsOn copyProfilerResources

systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}".toString()

useTestNG() {
suites 'src/test/resources/testng.xml'
Expand Down
2 changes: 1 addition & 1 deletion cli/central-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ test {
dependsOn configurations.birJar
dependsOn configurations.birJarCompile

systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}".toString()
useTestNG() {
suites 'src/test/resources/testng.xml'
}
Expand Down
2 changes: 1 addition & 1 deletion distribution/zip/jballerina-tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ tasks.register('generateDocs', JavaExec) {
dependsOn ':docerina-gradle-plugin:build'
outputs.dir("${getLayout().getBuildDirectory().get()}/api-docs")
outputs.cacheIf { true }
systemProperty("ballerina.home", "${getLayout().getBuildDirectory().get()}")
systemProperty("ballerina.home", "${getLayout().getBuildDirectory().get()}".toString())
classpath = files(pathingJar.archiveFile)
mainClass = 'org.ballerinalang.plugin.gradle.doc.DocerinaGen'
args("${getLayout().getBuildDirectory().get()}/api-docs")
Expand Down
4 changes: 2 additions & 2 deletions docs/bir-spec/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ kaitai {
cacheDir = new File("${project.gradle.gradleUserHomeDir}/kaitai-cache")
executionTimeout = 10_000
version = "${libs.versions.kaitaiStructCompilerVersion.get()}"
url = new URL("https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/"+
url = URI.create("https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/"+
"${libs.versions.kaitaiStructCompilerVersion.get()}"+"/kaitai-struct-compiler-" +
"${libs.versions.kaitaiStructCompilerVersion.get()}"+".zip")
"${libs.versions.kaitaiStructCompilerVersion.get()}"+".zip").toURL()
}

sourceSets.main.java.srcDirs += 'build/generated/kaitai'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ test {

inputs.files(configurations.balaTestImplementation);

systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/ballerina-home/test"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/ballerina-home/test".toString()

systemProperty "java.util.logging.config.file", "src/test/resources/logging.properties"
systemProperty "LANG_REPO_BUILD", "true"
Expand Down
2 changes: 1 addition & 1 deletion language-server/modules/langserver-commons/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
description = 'Ballerina - Language server - Commons'

test {
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/".toString()
systemProperty "ballerina.version", project.version
useTestNG() {
suites 'src/test/resources/testng.xml'
Expand Down
2 changes: 1 addition & 1 deletion language-server/modules/langserver-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ test {
dependsOn deleteGeneratedModules
dependsOn loadDistributionCache
dependsOn copyRuntime
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/".toString()
systemProperty "experimental", "true"
systemProperty "ballerina.version", project.version
systemProperty "responseTimeThreshold", 2000
Expand Down
2 changes: 1 addition & 1 deletion misc/ballerinalang-data-mapper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {

test {
dependsOn loadDistributionCache
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/".toString()
systemProperty "experimental", "true"
systemProperty "ballerina.version", project.version
useTestNG() {
Expand Down
2 changes: 1 addition & 1 deletion misc/diagram-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ext.moduleName = 'diagram-util'

test {
dependsOn loadDistributionCache
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/".toString()
systemProperty "experimental", "true"
systemProperty "ballerina.version", project.version
useTestNG() {
Expand Down
2 changes: 1 addition & 1 deletion misc/docerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ test {
dependsOn createTestDistributionCache
dependsOn createTestBre

systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}".toString()

testLogging {
events "failed"
Expand Down
6 changes: 3 additions & 3 deletions tests/ballerina-tools-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ test {
// ":examples-test:test"
]

systemProperty 'project.build.directory', "${getLayout().getBuildDirectory().get()}"
systemProperty 'project.build.directory', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'server.zip', configurations.ballerinaTools.asPath
systemProperty 'jballerina.server.zip', configurations.jballerinaTools.asPath
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/resources/test/logging.properties"
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/resources/test/logging.properties".toString()
systemProperty 'integration.test.utils.service.file', configurations.testUtilsBal.asPath
systemProperty 'javax.net.ssl.trustStore', "${configurations.ballerina.asPath}/security/ballerinaTruststore.p12"
systemProperty 'javax.net.ssl.trustStore', "${configurations.ballerina.asPath}/security/ballerinaTruststore.p12".toString()
systemProperty 'javax.net.ssl.trustStorePassword', 'ballerina'
systemProperty 'ballerina.agent.path', configurations.testUtilsJar.asPath
useTestNG() {
Expand Down
6 changes: 3 additions & 3 deletions tests/jballerina-debugger-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ test {
dependsOn extractDistribution

maxParallelForks = 1
systemProperty 'basedir', "${getLayout().getBuildDirectory().get()}"
systemProperty 'libdir', "${getLayout().getBuildDirectory().get()}"
systemProperty 'basedir', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'libdir', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'server.zip', configurations.jballerinaTools.asPath
systemProperty 'jballerina.server.zip', configurations.jballerinaTools.asPath
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/src/test/resources/logging.properties"
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/src/test/resources/logging.properties".toString()

useTestNG() {
suites 'src/test/resources/testng.xml'
Expand Down
6 changes: 3 additions & 3 deletions tests/jballerina-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ test {
dependsOn ':jballerina-tools:build'

maxParallelForks = 1
systemProperty 'basedir', "${getLayout().getBuildDirectory().get()}"
systemProperty 'libdir', "${getLayout().getBuildDirectory().get()}"
systemProperty 'basedir', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'libdir', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'server.zip', configurations.jballerinaTools.asPath
systemProperty 'jballerina.server.zip', configurations.jballerinaTools.asPath
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/resources/test/logging.properties"
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/resources/test/logging.properties".toString()
systemProperty 'ballerina.agent.path', configurations.testUtils.asPath
systemProperty 'observability.test.utils.bala', configurations.observeTestUtilsBala.asPath
systemProperty 'observability.test.utils.jar', configurations.observeTestUtilsJar.asPath
Expand Down
2 changes: 1 addition & 1 deletion tests/language-server-integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ tasks.register('copyCompilerPluginJars', Copy) {
test {
dependsOn copyCompilerPluginJars
dependsOn loadDistributionCache
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/"
systemProperty "ballerina.home", "${getLayout().getBuildDirectory().get()}/".toString()
systemProperty "experimental", "true"
systemProperty "ballerina.version", project.version
useTestNG() {
Expand Down
6 changes: 3 additions & 3 deletions tests/testerina-integration-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ test {
systemProperty 'enableTesterinaTests', 'true'

maxParallelForks = 1
systemProperty 'basedir', "${getLayout().getBuildDirectory().get()}"
systemProperty 'libdir', "${getLayout().getBuildDirectory().get()}"
systemProperty 'basedir', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'libdir', "${getLayout().getBuildDirectory().get()}".toString()
systemProperty 'server.zip', configurations.jballerinaTools.asPath
systemProperty 'jballerina.server.zip', configurations.jballerinaTools.asPath
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/src/test/resources/logging.properties"
systemProperty 'java.util.logging.config.file', "${getLayout().getBuildDirectory().get()}/src/test/resources/logging.properties".toString()

useTestNG() {
suites 'src/test/resources/testng.xml'
Expand Down

0 comments on commit bb168e6

Please sign in to comment.