Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.java text eol=lf
3 changes: 3 additions & 0 deletions .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jobs:
group: ${{ github.ref_name }}-ubuntu
cancel-in-progress: true
steps:
- name: Enable long paths for Git
run: git config --system core.longpaths true

- name: Checkout repository
uses: actions/checkout@v4

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ jobs:
runs-on: windows-latest
timeout-minutes: 60
steps:
- name: Enable long paths for Git
run: git config --system core.longpaths true

- name: Checkout repository
uses: actions/checkout@v4

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
group: ${{ github.head_ref }}-windows
cancel-in-progress: true
steps:
- name: Enable long paths for Git
run: git config --system core.longpaths true

- name: Checkout repository
uses: actions/checkout@v4

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ configurations {
dependencies {
implementation project(":model-generator-commons")

implementation "org.ballerinalang:language-server-commons:${ballerinaLangVersion}"
implementation project(":langserver-commons")
implementation "org.ballerinalang:ballerina-lang:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-parser:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-tools-api:${ballerinaLangVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ configurations {
dependencies {
implementation project(':architecture-model-generator:architecture-model-generator-core')
implementation project(":model-generator-commons")
implementation project(":langserver-commons")

implementation "org.ballerinalang:ballerina-lang:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-parser:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-tools-api:${ballerinaLangVersion}"
implementation "org.ballerinalang:language-server-commons:${ballerinaLangVersion}"
implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:${eclipseLsp4jVersion}"
implementation "com.google.code.gson:gson:${gsonVersion}"

testImplementation project(':architecture-model-generator:architecture-model-generator-core')
testImplementation "org.ballerinalang:language-server-core:${ballerinaLangVersion}"
testImplementation project(":langserver-core")
testImplementation "org.eclipse.lsp4j:org.eclipse.lsp4j:${eclipseLsp4jVersion}"
testImplementation "org.testng:testng:${testngVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ public void test(Path config) throws IOException {
}
}

@Override
protected String[] skipList() {
return new String[]{
// TODO: Need to replace this with the latest ai agent implementation
"agent.json",
// TODO: Investigate why the following test fails intermittently in Windows
"graphql.json"
};
}

@Override
protected String getResourceDir() {
return "artifacts";
Expand Down
88 changes: 42 additions & 46 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ plugins {
id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}"
id "de.undercouch.download" version "${downloadPluginVersion}"
id "net.researchgate.release" version "${releasePluginVersion}"
id "java"
}
apply plugin: 'maven-publish'


allprojects {
group = project.group
version = project.version
Expand Down Expand Up @@ -87,6 +87,7 @@ subprojects {
ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibJsonDataVersion}"
ballerinaStdLibs "io.ballerina.stdlib:http-ballerina:${stdlibHttpVersion}"
ballerinaStdLibs "io.ballerina.stdlib:graphql-ballerina:${stdlibGraphqlVersion}"
ballerinaStdLibs "io.ballerina.stdlib:sql-ballerina:${stdLibSqlVersion}"
ballerinaStdLibs "io.ballerina.stdlib:grpc-ballerina:${stdlibGrpcVersion}"
ballerinaStdLibs "io.ballerina:observe-ballerina:${observeInternalVersion}"
ballerinaStdLibs "io.ballerina.stdlib:observe-ballerina:${observeVersion}"
Expand Down Expand Up @@ -215,46 +216,6 @@ release {
}
}

task test {
}

test.dependsOn rootProject.pullBallerinaModule('ai', ballerinaxAiAgent)
test.dependsOn rootProject.pullBallerinaModule('np', ballerinaxNp)
test.dependsOn rootProject.pullBallerinaModule('kafka', ballerinaxKafkaVersion)
test.dependsOn rootProject.pullBallerinaModule('rabbitmq', ballerinaxRabbitmqVersion)
test.dependsOn rootProject.pullBallerinaModule('trigger.github', ballerinaxGithubTriggerVersion)

task clean {
delete "build"
delete "dist"
}

task buildFlow {
dependsOn(":flow-model-generator:flow-model-generator-core:build")
dependsOn(":flow-model-generator:flow-model-generator-ls-extension:build")
}

task buildService {
dependsOn(":service-model-generator:service-model-generator-ls-extension:build")
}

task buildDesign {
dependsOn(":architecture-model-generator:architecture-model-generator-core:build")
dependsOn(":architecture-model-generator:architecture-model-generator-ls-extension:build")
}

task buildSequence {
dependsOn(":sequence-model-generator:sequence-model-generator-core:build")
dependsOn(":sequence-model-generator:sequence-model-generator-ls-extension:build")
}

task buildTestService {
dependsOn(":test-manager-service:test-manager-service-ls-extension:build")
}

task buildCommons {
dependsOn(":model-generator-commons:build")
}

configurations {
externalJarDeps
Expand All @@ -275,7 +236,7 @@ dependencies {
externalJarDeps "com.moandjiezana.toml:toml4j:${moandjiezanaToml4jVersion}"
}

task combineAllJars(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
task pack(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
description 'Creates a single JAR containing all submodules'
group 'build'

Expand Down Expand Up @@ -320,12 +281,47 @@ task combineAllJars(type: com.github.jengelman.gradle.plugins.shadow.tasks.Shado
}
}

task build {
dependsOn test
dependsOn(':launcher:build')
dependsOn combineAllJars
task pullBallerinaModules {
dependsOn pullBallerinaModule('ai', ballerinaxAiAgent)
dependsOn pullBallerinaModule('kafka', ballerinaxKafkaVersion)
dependsOn pullBallerinaModule('rabbitmq', ballerinaxRabbitmqVersion)
dependsOn pullBallerinaModule('trigger.github', ballerinaxGithubTriggerVersion)
dependsOn pullBallerinaModule('np', ballerinaxNp)
}

test {
dependsOn pullBallerinaModules
}

task buildFlow {
dependsOn(":flow-model-generator:flow-model-generator-core:build")
dependsOn(":flow-model-generator:flow-model-generator-ls-extension:build")
}

task buildService {
dependsOn(":service-model-generator:service-model-generator-ls-extension:build")
}

task buildDesign {
dependsOn(":architecture-model-generator:architecture-model-generator-core:build")
dependsOn(":architecture-model-generator:architecture-model-generator-ls-extension:build")
}

task buildSequence {
dependsOn(":sequence-model-generator:sequence-model-generator-core:build")
dependsOn(":sequence-model-generator:sequence-model-generator-ls-extension:build")
}

task buildTestService {
dependsOn(":test-manager-service:test-manager-service-ls-extension:build")
}

task buildCommons {
dependsOn(":model-generator-commons:build")
}


build.dependsOn test
build.doNotTrackState("build needs to run every time")
publishToMavenLocal.dependsOn build
publish.dependsOn build
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,16 @@ configurations {

dependencies {
implementation project(":model-generator-commons")
implementation project(":langserver-core")
implementation project(":langserver-commons")


implementation "org.ballerinalang:ballerina-lang:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-parser:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-tools-api:${ballerinaLangVersion}"
implementation "org.ballerinalang:central-client:${ballerinaLangVersion}"
implementation "org.ballerinalang:diagram-util:${ballerinaLangVersion}"
implementation "org.ballerinalang:formatter-core:${ballerinaLangVersion}"
implementation "org.ballerinalang:language-server-commons:${ballerinaLangVersion}"
implementation "org.ballerinalang:language-server-core:${ballerinaLangVersion}"
implementation "com.google.code.gson:gson:${gsonVersion}"
implementation "com.graphql-java:graphql-java:${graphqlJavaVersion}"
compileOnly "org.eclipse.lsp4j:org.eclipse.lsp4j:${eclipseLsp4jVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ configurations {
dependencies {
implementation project(':flow-model-generator:flow-model-generator-core')
implementation project(":model-generator-commons")
implementation project(":langserver-core")
implementation project(":langserver-commons")

implementation "org.ballerinalang:ballerina-lang:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-parser:${ballerinaLangVersion}"
implementation "org.ballerinalang:formatter-core:${ballerinaLangVersion}"
implementation "org.ballerinalang:ballerina-tools-api:${ballerinaLangVersion}"
implementation "org.ballerinalang:language-server-commons:${ballerinaLangVersion}"
implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:${eclipseLsp4jVersion}"
implementation "org.ballerinalang:language-server-core:${ballerinaLangVersion}"
implementation "org.ballerinalang:diagram-util:${ballerinaLangVersion}"
implementation "org.ballerinalang:json-mapper:${ballerinaLangVersion}"
implementation "org.ballerinalang:toml-parser:${ballerinaLangVersion}"
Expand Down Expand Up @@ -111,7 +111,6 @@ test.dependsOn rootProject.pullBallerinaModule('snowflake', ballerinaxSnowflakeV
test.dependsOn rootProject.pullBallerinaModule('docusign.dsadmin', ballerinaxDocusignDsadminVersion)
test.dependsOn rootProject.pullBallerinaModule('mysql', ballerinaxMysqlVersion)
test.dependsOn rootProject.pullBallerinaModule('wso2.controlplane', ballerinaxWso2ControlplaneVersion)
test.dependsOn rootProject.pullBallerinaModule('sql', ballerinaSqlVersion, 'ballerina')
// TODO: Re-enable this once the `np` module is available on central
//test.dependsOn rootProject.pullBallerinaModule('np')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ protected String[] skipList() {
"custom_default.json",
"custom_default1.json",
"custom_default2.json",
// TODO: Investigate why this test fails on Github Actions
"custom_sum.json",
"default.json"
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
"metadata": {
"label": "query",
"description": "Executes the query, which may return multiple results.\nWhen processing the stream, make sure to consume all fetched data or close the stream.\n",
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.14.0.png"
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.15.0.png"
},
"codedata": {
"node": "REMOTE_ACTION_CALL",
"org": "ballerinax",
"module": "mysql",
"object": "Client",
"symbol": "query",
"version": "1.14.0",
"version": "1.15.0",
"lineRange": {
"fileName": "mysql.bal",
"startLine": {
Expand Down Expand Up @@ -179,15 +179,15 @@
"metadata": {
"label": "query",
"description": "Executes the query, which may return multiple results.\nWhen processing the stream, make sure to consume all fetched data or close the stream.\n",
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.14.0.png"
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.15.0.png"
},
"codedata": {
"node": "REMOTE_ACTION_CALL",
"org": "ballerinax",
"module": "mysql",
"object": "Client",
"symbol": "query",
"version": "1.14.0",
"version": "1.15.0",
"lineRange": {
"fileName": "mysql.bal",
"startLine": {
Expand Down Expand Up @@ -317,7 +317,7 @@
"metadata": {
"label": "New Connection",
"description": "Represents a MySQL database client.",
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.14.0.png"
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.15.0.png"
},
"codedata": {
"node": "NEW_CONNECTION",
Expand Down Expand Up @@ -502,7 +502,7 @@
"typeMembers": [
{
"type": "Options",
"packageInfo": "ballerinax:mysql:1.14.0",
"packageInfo": "ballerinax:mysql:1.15.0",
"kind": "RECORD_TYPE",
"selected": false
},
Expand Down Expand Up @@ -533,7 +533,7 @@
"typeMembers": [
{
"type": "ConnectionPool",
"packageInfo": "ballerina:sql:1.15.0",
"packageInfo": "ballerina:sql:1.16.0",
"kind": "RECORD_TYPE",
"selected": false
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
"metadata": {
"label": "queryRow",
"description": "Executes the query, which is expected to return at most one row of the result.\nIf the query does not return any results, `sql:NoRowsError` is returned.\n",
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.14.0.png"
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.15.0.png"
},
"codedata": {
"node": "REMOTE_ACTION_CALL",
"org": "ballerinax",
"module": "mysql",
"object": "Client",
"symbol": "queryRow",
"version": "1.14.0",
"version": "1.15.0",
"lineRange": {
"fileName": "mysql.bal",
"startLine": {
Expand Down Expand Up @@ -197,7 +197,7 @@
"metadata": {
"label": "New Connection",
"description": "Represents a MySQL database client.",
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.14.0.png"
"icon": "https://bcentral-packageicons.azureedge.net/images/ballerinax_mysql_1.15.0.png"
},
"codedata": {
"node": "NEW_CONNECTION",
Expand Down Expand Up @@ -382,7 +382,7 @@
"typeMembers": [
{
"type": "Options",
"packageInfo": "ballerinax:mysql:1.14.0",
"packageInfo": "ballerinax:mysql:1.15.0",
"kind": "RECORD_TYPE",
"selected": false
},
Expand Down Expand Up @@ -413,7 +413,7 @@
"typeMembers": [
{
"type": "ConnectionPool",
"packageInfo": "ballerina:sql:1.15.0",
"packageInfo": "ballerina:sql:1.16.0",
"kind": "RECORD_TYPE",
"selected": false
},
Expand Down
Loading
Loading