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.

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

Change Option configures to optional fields #1109

Merged
merged 9 commits into from
Jul 9, 2024
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
8 changes: 4 additions & 4 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerinax"
name = "java.jdbc"
version = "1.12.0"
version = "2.0.0"
authors = ["Ballerina"]
keywords = ["database", "client", "network", "SQL", "RDBMS", "JDBC"]
repository = "https://github.com/ballerina-platform/module-ballerinax-java.jdbc"
Expand All @@ -15,11 +15,11 @@ graalvmCompatible = true
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "java.jdbc-native"
version = "1.12.0"
path = "../native/build/libs/java.jdbc-native-1.12.0-SNAPSHOT.jar"
version = "2.0.0"
path = "../native/build/libs/java.jdbc-native-2.0.0-SNAPSHOT.jar"

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "sql-native"
version = "1.13.0"
path = "./lib/sql-native-1.13.0-20240410-111000-2cc6b6c.jar"
path = "./lib/sql-native-1.13.0.jar"
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "jdbc-compiler-plugin"
class = "io.ballerina.stdlib.java.jdbc.compiler.JDBCCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/java.jdbc-compiler-plugin-1.12.0-SNAPSHOT.jar"
path = "../compiler-plugin/build/libs/java.jdbc-compiler-plugin-2.0.0-SNAPSHOT.jar"
10 changes: 5 additions & 5 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.9.0-20240405-165800-4b163f78"
distribution-version = "2201.9.0"

[[package]]
org = "ballerina"
Expand Down Expand Up @@ -44,7 +44,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "crypto"
version = "2.7.0"
version = "2.7.2"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -69,7 +69,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.11.0"
version = "2.11.2"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
Expand Down Expand Up @@ -295,7 +295,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "sql"
version = "1.13.0"
version = "1.13.2"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -396,7 +396,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "java.jdbc"
version = "1.12.0"
version = "2.0.0"
dependencies = [
{org = "ballerina", name = "file"},
{org = "ballerina", name = "io"},
Expand Down
4 changes: 2 additions & 2 deletions ballerina/client.bal
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ public isolated client class Client {
# Some databases have limitations to support this. This should be configured
# based on the database type.
public type Options record {|
string? datasourceName = ();
map<anydata>? properties = ();
string datasourceName?;
map<anydata> properties?;
Operations requestGeneratedKeys = ALL;
|};

Expand Down
26 changes: 13 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=io.ballerina.stdlib
version=1.12.0-SNAPSHOT
version=2.0.0-SNAPSHOT

puppycrawlCheckstyleVersion=10.12.1
checkstyleToolVersion=10.12.1
Expand All @@ -11,9 +11,9 @@ ballerinaGradlePluginVersion=2.0.1
testngVersion=7.6.1
h2DriverVersion=2.2.220

ballerinaLangVersion=2201.9.0-20240405-165800-4b163f78
ballerinaLangVersion=2201.9.0

stdlibSqlVersion=1.13.0-20240410-111000-2cc6b6c
stdlibSqlVersion=1.13.0

# Direct Dependencies
# Level 01
Expand All @@ -28,33 +28,33 @@ stdlibOsVersion=1.8.0
stdlibFileVersion=1.9.0

# Ballerinax Observer
observeVersion=1.2.3-20240408-194900-a0e331f
observeInternalVersion=1.2.2-20240408-195500-1436319
observeVersion=1.2.3
observeInternalVersion=1.2.2

# Transitive Dependencies
# Level 01
stdlibConstraintVersion=1.5.0
stdlibUrlVersion=2.4.0

# Level 02
stdlibCryptoVersion=2.7.0-20240328-114200-c8cc19f
stdlibCryptoVersion=2.7.0
stdlibTaskVersion=2.5.0

# Level 03
stdlibCacheVersion=3.8.0-20240409-101100-e2d7f4e
stdlibCacheVersion=3.8.0
stdlibMimeVersion=2.9.0
stdlibUuidVersion=1.8.0-20240409-104400-2aaa58d
stdlibUuidVersion=1.8.0

# Level 04
stdlibAuthVersion=2.11.0-20240409-124200-655c2d4
stdlibJwtVersion=2.11.0-20240409-134000-9b5bf2e
stdlibOAuth2Version=2.11.0-20240409-124200-15a9919
stdlibAuthVersion=2.11.0
stdlibJwtVersion=2.11.0
stdlibOAuth2Version=2.11.0

# Level 05
stdlibHttpVersion=2.11.0-20240409-155700-86d3a0d
stdlibHttpVersion=2.11.0

# Level 06
stdlibTransactionVersion=1.9.0-20240410-104900-57aec29
stdlibTransactionVersion=1.9.0

# Ballerina extended library
stdlibH2DriverVersion=1.1.0
Loading