Merge pull request #59 from ballerina-platform/sahan-dev

Update gradle to pull the correct sheets connector version
ballerina-platform · Apr 11, 2024 · 61b9452 · 61b9452
2 parents 5970ef7 + 9ffcbc5
commit 61b9452
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 57 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -62,3 +62,4 @@ jobs:
           nexusPassword: ${{ secrets.NEXUS_PASSWORD }}
         run: |
           ./gradlew clean publishMavenJavaPublicationToWSO2NexusRepository -x test --scan --no-daemon
+          
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -37,3 +37,4 @@ jobs:
       native_image_options: '-J-Xmx7G ${{ inputs.native_image_options }}'
       additional_windows_build_flags: '-x test'
     secrets: inherit
+
diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -84,4 +84,4 @@ jobs:
           REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
         run: |
           sed -i 's/version=\(.*\)-SNAPSHOT/version=\1/g' gradle.properties
-          ./gradlew clean build -PpublishToCentral=true
+          ./gradlew clean build -PpublishToCentral=true
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -45,4 +45,4 @@ jobs:
           packageUser: ${{ github.actor }}
           packagePAT: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew.bat build -x test
-        # Disabling tests because no docker in git-action windows
+        # Disabling tests because no docker in git-action windows
diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
@@ -31,3 +31,4 @@ jobs:
           format: 'table'
           timeout: '10m0s'
           exit-code: '1'
+
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerinax"
 name = "persist.googlesheets"
-version = "1.2.0"
+version = "1.3.0"
 authors = ["Ballerina"]
 keywords = ["persist", "googlesheets", "experimental"]
 repository = "https://github.com/ballerina-platform/module-ballerina-persist"
@@ -15,11 +15,11 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist.googlesheets-native"
-version = "1.2.0"
-path = "../native/build/libs/persist.googlesheets-native-1.2.0-SNAPSHOT.jar"
+version = "1.3.0"
+path = "../native/build/libs/persist.googlesheets-native-1.3.0-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist-native"
-version = "1.2.0"
-path = "./lib/persist-native-1.2.0-20230810-161400-f232e8d.jar"
+version = "1.3.0"
+path = "./lib/persist-native-1.3.0-20240409-100100-594c874.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,12 +5,12 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.0-20230726-145300-b2bdf796"
+distribution-version = "2201.9.0-20240405-165800-4b163f78"
 
 [[package]]
 org = "ballerina"
 name = "auth"
-version = "2.10.0"
+version = "2.11.0"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -22,7 +22,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "cache"
-version = "3.7.0"
+version = "3.8.0"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -33,15 +33,15 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.5.0"
+version = "2.7.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "time"}
@@ -61,7 +61,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.10.0"
+version = "2.11.0"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
@@ -110,7 +110,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "jwt"
-version = "2.10.0"
+version = "2.11.0"
 dependencies = [
 	{org = "ballerina", name = "cache"},
 	{org = "ballerina", name = "crypto"},
@@ -234,7 +234,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "oauth2"
-version = "2.10.0"
+version = "2.11.0"
 dependencies = [
 	{org = "ballerina", name = "cache"},
 	{org = "ballerina", name = "crypto"},
@@ -247,7 +247,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.2.0"
+version = "1.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -260,30 +260,18 @@ dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"}
 ]
-modules = [
-	{org = "ballerina", packageName = "os", moduleName = "os"}
-]
 
 [[package]]
 org = "ballerina"
 name = "persist"
-version = "1.2.0"
+version = "1.3.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 modules = [
 	{org = "ballerina", packageName = "persist", moduleName = "persist"}
 ]
 
-[[package]]
-org = "ballerina"
-name = "regex"
-version = "1.4.3"
-dependencies = [
-	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "lang.string"}
-]
-
 [[package]]
 org = "ballerina"
 name = "task"
@@ -300,6 +288,7 @@ version = "0.0.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.array"},
 	{org = "ballerina", name = "lang.error"}
 ]
 modules = [
@@ -328,6 +317,15 @@ modules = [
 	{org = "ballerina", packageName = "url", moduleName = "url"}
 ]
 
+[[package]]
+org = "ballerinai"
+name = "observe"
+version = "0.0.0"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "observe"}
+]
+
 [[package]]
 org = "ballerinax"
 name = "client.config"
@@ -340,7 +338,7 @@ dependencies = [
 [[package]]
 org = "ballerinax"
 name = "googleapis.sheets"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -349,7 +347,7 @@ dependencies = [
 	{org = "ballerina", name = "lang.regexp"},
 	{org = "ballerina", name = "log"},
 	{org = "ballerina", name = "os"},
-	{org = "ballerina", name = "regex"},
+	{org = "ballerinai", name = "observe"},
 	{org = "ballerinax", name = "client.config"}
 ]
 modules = [
@@ -359,13 +357,12 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "persist.googlesheets"
-version = "1.2.0"
+version = "1.3.0"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.regexp"},
 	{org = "ballerina", name = "lang.runtime"},
-	{org = "ballerina", name = "os"},
 	{org = "ballerina", name = "persist"},
 	{org = "ballerina", name = "test"},
 	{org = "ballerina", name = "time"},

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -132,14 +132,14 @@ task pullGoogleSheetsDependency(type: Exec) {
     if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
         try {
             String distributionBinPath = project.projectDir.absolutePath + "/build/jballerina-tools-${project.extensions.ballerina.langVersion}/bin"
-            commandLine 'sh', '-c', "$distributionBinPath/bal pull ballerinax/googleapis.sheets"
+            commandLine 'sh', '-c', "${distributionBinPath}/bal pull ballerinax/googleapis.sheets:${googleSheetsConnector}"
         } catch (all) {
             return 1
         }
     } else {
         try {
             String distributionBinPath = project.projectDir.absolutePath + "/build/jballerina-tools-${project.extensions.ballerina.langVersion}/bin"
-            commandLine 'cmd', '/c', "$distributionBinPath/bal.bat pull ballerinax/googleapis.sheets"
+            commandLine 'cmd', '/c', "${distributionBinPath}/bal.bat pull ballerinax/googleapis.sheets:${googleSheetsConnector}"
         } catch (all) {
             return 1
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=io.ballerina.stdlib
-version=1.2.0-SNAPSHOT
+version=1.3.0-SNAPSHOT
 
 puppycrawlCheckstyleVersion=10.12.1
 checkstyleToolVersion=10.12.1
@@ -11,52 +11,55 @@ testngVersion=7.6.1
 gsonVersion=2.10
 ballerinaGradlePluginVersion=2.0.1
 
-ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796
+ballerinaLangVersion=2201.9.0-20240405-165800-4b163f78
 
 # Direct Dependencies
 
 # Level 01
-stdlibIoVersion=1.6.0-20230810-115500-2e569f5
-stdlibTimeVersion=2.4.0-20230810-115600-b28bb07
-stdlibUrlVersion=2.4.0-20230810-111000-683c6e4
+stdlibIoVersion=1.6.0
+stdlibTimeVersion=2.4.0
+stdlibUrlVersion=2.4.0
 
 # Level 02
-stdlibLogVersion=2.9.0-20230810-161500-6d3d1df
-stdlibOsVersion=1.8.0-20230810-161400-624a2aa
+stdlibLogVersion=2.9.0
+stdlibOsVersion=1.8.0
 
 # Level 03
-stdlibFileVersion=1.9.0-20230811-093200-875a787
+stdlibFileVersion=1.9.0
 
 # Level 05
-stdlibHttpVersion=2.10.0-20230811-144100-cac5d57
+stdlibHttpVersion=2.11.0-20240410-121300-ae1095d
 
 # Level 08
-stdlibPersistVersion=1.2.0-20230810-161400-f232e8d
+stdlibPersistVersion=1.3.0-20240409-100100-594c874
 
 # Ballerinax Observer
-observeVersion=1.2.0-20230810-105500-5841859
-observeInternalVersion=1.2.0-20230810-141300-a348751
+observeVersion=1.2.3-20240408-194900-a0e331f
+observeInternalVersion=1.2.2-20240408-195500-1436319
 
 # Transitive Dependencies
 # Level 01
-stdlibConstraintVersion=1.4.0-20230810-133100-e09cfc1
+stdlibConstraintVersion=1.5.0
 
 #Level 02
-stdlibCryptoVersion=2.5.0-20230810-124300-ddf6788
-stdlibTaskVersion=2.5.0-20230810-145800-b191831
+stdlibCryptoVersion=2.7.0-20240410-115200-2ae9fd5
+stdlibTaskVersion=2.5.0
 
 # Level 03
-stdlibCacheVersion=3.7.0-20230811-093200-b83e72c
-stdlibMimeVersion=2.9.0-20230810-183500-af95101
-stdlibUuidVersion=1.7.0-20230811-093200-dc65fdd
+stdlibCacheVersion=3.8.0-20240409-101100-e2d7f4e
+stdlibMimeVersion=2.9.0
+stdlibUuidVersion=1.8.0-20240410-125400-bbe7ac5
 
 # Level 04
-stdlibAuthVersion=2.10.0-20230811-110600-2428623
-stdlibJwtVersion=2.10.0-20230811-114700-d48ab2f
-stdlibOAuth2Version=2.10.0-20230811-111300-5550652
+stdlibAuthVersion=2.11.0-20240410-121600-c514b62
+stdlibJwtVersion=2.11.0-20240410-124800-1a4eb44
+stdlibOAuth2Version=2.11.0-20240410-121700-502990d
 
 # Level 06
-stdlibTransactionVersion=1.8.0-20230814-091700-0011487
+stdlibTransactionVersion=1.9.0-20240410-104900-57aec29
+
+# Connectors
+googleSheetsConnector=3.5.0
 
 # Enabled publishing insecure checksums, due to fail to publish to maven central
 # Refer https://github.com/gradle/gradle/issues/11308