From 350c904a5046452d873526961a3dce7753714e71 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 11 Sep 2024 01:19:36 +0200
Subject: [PATCH] Testing CI

---
 Jenkinsfile | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 59ff3a9..fce37f5 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,44 +13,45 @@ pipeline {
 
     tools {
         jdk 'jdk-11'
-        gradle 'gradle-6.x'
+    }
+
+    environment {
+        gradleParams = "-Pversion=1.0.${BUILD_NUMBER}" // --no-daemon
     }
 
     stages {
         stage('Checkout') {
             steps {
-                checkout scm
+            checkout scm
             }
         }
 
-        withGradle {
-            def gradleParams = "-Pversion=1.0.${BUILD_NUMBER}" // --no-daemon
-
-            stage('Build') {
-                steps {
-                    sh "chmod +x ./gradlew"
-                    sh "./gradlew ${gradleParams} -x test clean build"
+        stage('Build') {
+            steps{
+                withGradle {
+            sh "chmod +x ./gradlew"
+            sh "./gradlew ${gradleParams} -x test clean build"
                 }
             }
+        }
 
-            stage('Test') {
-                steps {
-                    sh "./gradlew ${gradleParams} test"
+        stage('Test') {
+            steps {
+                withGradle {
+            sh "./gradlew ${gradleParams} test"
                 }
             }
+        }
 
-            stage('Deploy') {
-                steps {
+        stage('Deploy') {
+            steps {
+                withGradle {
                     withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId:'gpg_key', usernameVariable: 'KEY_ID', passwordVariable: 'KEY_PASSWORD']]) {
                         sh "./gradlew ${gradleParams} -Psigning.homeDir=/var/jenkins_home/.gnupg_ci -psigning.keyId=${KEY_ID} -Psigning.password=${KEY_PASSWORD} sign"
                     }
-                }
 
-                steps {
                     sh "./gradlew ${gradleParams} publishToMavenLocal"
-                }
 
-                steps {
                     withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId:'36795fd4-6f0a-491b-b869-b26ec9c06996', usernameVariable: 'SONATYPE_NEXUS_USERNAME', passwordVariable: 'SONATYPE_NEXUS_PASSWORD']]) {
                         sh "./gradlew ${gradleParams} -PSONATYPE_NEXUS_USERNAME=${SONATYPE_NEXUS_USERNAME} -PSONATYPE_NEXUS_PASSWORD=${SONATYPE_NEXUS_PASSWORD}  -Prelease publish"
                     }
@@ -58,4 +59,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}