diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a199d5e..0aa9d3e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,8 +8,10 @@ on: pull_request jobs: call_workflow: - name: Run PR Build Workflow - if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main - with: - additional-windows-test-flags: "-x test" \ No newline at end of file + - name: Set Permissions for gradlew + run: chmod +x ./gradlew + - name: Run PR Build Workflow + if: ${{ github.repository_owner == 'ballerina-platform' }} + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main + with: + additional-windows-test-flags: "-x test" diff --git a/build.gradle b/build.gradle index 818ac26..4acfa0b 100644 --- a/build.gradle +++ b/build.gradle @@ -17,17 +17,18 @@ */ plugins { - id "com.github.spotbugs" version "${githubSpotbugsVersion}" - id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}" - id "de.undercouch.download" version "${underCouchDownloadVersion}" - id "net.researchgate.release" version "${researchgateReleaseVersion}" + id 'com.github.spotbugs' + id 'com.github.johnrengelman.shadow' + id 'de.undercouch.download' + id 'net.researchgate.release' + id 'jacoco' } description = 'Ballerina - Persist' def packageName = "persist.redis" -ext.ballerinaLangVersion = project.ballerinaLangVersion +ballerinaLangVersion = project.ballerinaLangVersion allprojects { group = project.group diff --git a/gradle.properties b/gradle.properties index 7ab1887..7cb8e65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,18 +13,29 @@ ballerinaGradlePluginVersion=2.0.1 ballerinaLangVersion=2201.8.2 -# Direct Dependencies +# Dependencies # Level 01 stdlibIoVersion=1.6.0 stdlibTimeVersion=2.4.0 stdlibUrlVersion=2.4.0 +stdlibConstraintVersion=1.4.0 # Level 02 stdlibLogVersion=2.9.0 stdlibOsVersion=1.8.0 +stdlibCryptoVersion=2.5.0 +stdlibTaskVersion=2.5.0 # Level 03 stdlibFileVersion=1.9.0 +stdlibCacheVersion=3.7.0 +stdlibMimeVersion=2.9.0 +stdlibUuidVersion=1.7.0 + +# Level 04 +stdlibAuthVersion=2.10.0 +stdlibJwtVersion=2.10.0 +stdlibOAuth2Version=2.10.0 # Level 05 stdlibHttpVersion=2.10.0 @@ -39,24 +50,6 @@ stdlibPersistVersion=1.2.0 observeVersion=1.2.0 observeInternalVersion=1.2.0 -# Transitive Dependencies -# Level 01 -stdlibConstraintVersion=1.4.0 - -#Level 02 -stdlibCryptoVersion=2.5.0 -stdlibTaskVersion=2.5.0 - -# Level 03 -stdlibCacheVersion=3.7.0 -stdlibMimeVersion=2.9.0 -stdlibUuidVersion=1.7.0 - -# Level 04 -stdlibAuthVersion=2.10.0 -stdlibJwtVersion=2.10.0 -stdlibOAuth2Version=2.10.0 - # Enabled publishing insecure checksums, due to fail to publish to maven central # Refer https://github.com/gradle/gradle/issues/11308 systemProp.org.gradle.internal.publish.checksums.insecure=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index 4ac3234..0000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..9f4197d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle index e474ede..245de3f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,26 @@ * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.5/userguide/building_swift_projects.html in the Gradle documentation. */ +pluginManagement { + plugins { + id "com.github.spotbugs" version "${githubSpotbugsVersion}" + id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}" + id "de.undercouch.download" version "${underCouchDownloadVersion}" + id "net.researchgate.release" version "${researchgateReleaseVersion}" + } + + repositories { + gradlePluginPortal() + maven { + url = 'https://maven.pkg.github.com/ballerina-platform/*' + credentials { + username System.getenv("packageUser") + password System.getenv("packagePAT") + } + } + } +} + plugins { id "com.gradle.enterprise" version "3.13.2" }