refactor

Signed-off-by: Yury-Fridlyand <[email protected]>
valkey-io · Jan 9, 2025 · 3453294 · 3453294
1 parent 91f9de8
commit 3453294
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/ort.yml b/.github/workflows/ort.yml
@@ -158,6 +158,12 @@ jobs:
                   distribution: "temurin"
                   java-version: 11
 
+            - name: Install protoc (protobuf)
+              uses: arduino/setup-protoc@v3
+              with:
+                  version: "29.1"
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+
             - name: Build java artifact
               working-directory: ./java
               run: |

diff --git a/java/build.gradle b/java/build.gradle
@@ -41,7 +41,10 @@ subprojects {
         // finalizedBy jacocoTestReport, jacocoTestCoverageVerification
     }
 
-    ext.failedTests = []
+    ext {
+        defaultReleaseVersion = "255.255.255"
+        failedTests = []
+    }
 
     tasks.withType(Test) {
         afterTest { TestDescriptor descriptor, TestResult result ->

diff --git a/java/client/build.gradle b/java/client/build.gradle
@@ -139,8 +139,6 @@ tasks.register('copyNativeLib', Copy) {
     into sourceSets.main.output.resourcesDir
 }
 
-def defaultReleaseVersion = "255.255.255";
-
 delombok.dependsOn('compileJava')
 jar.dependsOn('copyNativeLib')
 javadoc.dependsOn('copyNativeLib')
@@ -170,7 +168,7 @@ publishing {
             from components.java
             groupId = 'io.valkey'
             artifactId = 'valkey-glide'
-            version = System.getenv("GLIDE_RELEASE_VERSION") ?: defaultReleaseVersion;
+            version = System.getenv("GLIDE_RELEASE_VERSION") ?: project.ext.defaultReleaseVersion
             pom {
                 name = 'valkey-glide'
                 description = 'General Language Independent Driver for the Enterprise (GLIDE) for Valkey'

diff --git a/java/integTest/build.gradle b/java/integTest/build.gradle
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     // client
-    implementation group: 'io.valkey', name: 'valkey-glide', version: '255.255.255', classifier: osdetector.classifier
+    implementation group: 'io.valkey', name: 'valkey-glide', version: project.ext.defaultReleaseVersion, classifier: osdetector.classifier
 
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
     implementation 'com.google.code.gson:gson:2.10.1'