Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add constraint validation #21

Merged
merged 12 commits into from
Jul 31, 2024
Merged

Add constraint validation #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5c20bb2
Add constraint annotation validation
prakanth97 May 29, 2024
1e4f000
Add constraint validation tests
prakanth97 May 29, 2024
837e389
[Automated] Update the native jar versions
prakanth97 May 29, 2024
457e065
Add module ballerina time as dependency
prakanth97 May 29, 2024
27a0dfa
Resolve merge conflicts
prakanth97 Jun 6, 2024
2aae455
Address review suggestions
prakanth97 Jun 14, 2024
28d40fa
Resolve merge conflict
prakanth97 Jun 14, 2024
f254072
Resolve merge conflicts
prakanth97 Jul 22, 2024
0bbdaa6
Add tests for disabling constraint validation
prakanth97 Jul 22, 2024
1990aeb
Resolve merge conflicts
prakanth97 Jul 25, 2024
2f4694a
Sync with main
prakanth97 Jul 25, 2024
a348f15
Resolve merge conflicts
prakanth97 Jul 29, 2024
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
6 changes: 6 additions & 0 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ groupId = "io.ballerina.lib"
artifactId = "data-native"
version = "1.0.0"
path = "../native/build/libs/data.xmldata-native-1.0.0-SNAPSHOT.jar"

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "constraint-native"
version = "1.5.0"
path = "./lib/constraint-native-1.5.0.jar"
28 changes: 27 additions & 1 deletion ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,28 @@
dependencies-toml-version = "2"
distribution-version = "2201.10.0-20240724-114000-40e856f7"

[[package]]
org = "ballerina"
name = "constraint"
version = "1.5.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
modules = [
{org = "ballerina", packageName = "constraint", moduleName = "constraint"}
]

[[package]]
org = "ballerina"
name = "data.xmldata"
version = "1.0.0"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "test"}
{org = "ballerina", name = "test"},
{org = "ballerina", name = "time"}
]
modules = [
{org = "ballerina", packageName = "data.xmldata", moduleName = "data.xmldata"}
Expand Down Expand Up @@ -99,3 +113,15 @@ modules = [
{org = "ballerina", packageName = "test", moduleName = "test"}
]

[[package]]
org = "ballerina"
name = "time"
version = "2.4.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
modules = [
{org = "ballerina", packageName = "time", moduleName = "time"}
]

15 changes: 15 additions & 0 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,25 @@ ballerina {
testCoverageParam = "--code-coverage --coverage-format=xml --includes=io.ballerina.lib.data.xmldata*:ballerina.*"
}

configurations {
externalJars
}

dependencies {
externalJars(group: 'io.ballerina.stdlib', name: 'constraint-native', version: "${stdlibConstraintVersion}") {
transitive = false
}
}

task updateTomlFiles {
doLast {
def stdlibDependentConstraintNativeVersion = stdlibConstraintVersion
def stdlibDependentConstraintVersion = stripBallerinaExtensionVersion("${stdlibDependentConstraintNativeVersion}")

def newConfig = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
newConfig = newConfig.replace("@toml.version@", tomlVersion)
newConfig = newConfig.replace("@stdlib.constraintnative.version@", stdlibDependentConstraintNativeVersion)
newConfig = newConfig.replace("@constraint.version@", stdlibDependentConstraintVersion)
ballerinaTomlFile.text = newConfig

def newCompilerPluginToml = compilerPluginTomlFilePlaceHolder.text.replace("@project.version@", project.version)
Expand Down
Loading
Loading