From a825752b4b577de14172571dcde1a320c5fba37f Mon Sep 17 00:00:00 2001
From: Dawson <dawson@funkemunky.cc>
Date: Wed, 8 Apr 2026 15:24:41 -0400
Subject: [PATCH] Using built in pipeline

---
 .github/workflows/create-release.yml | 10 +++++-----
 .github/workflows/gradle.yml         |  8 ++++----
 .github/workflows/test-gradle.yml    |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index db46861..7bba1ff 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -5,10 +5,10 @@ jobs:
   build-and-release:
     name: Build and Release
     runs-on: ubuntu-latest
+    env:
+      JAVA_TOOL_OPTIONS: -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit
     steps:
       - uses: actions/checkout@v5
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
       - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
@@ -17,15 +17,15 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 'wrapper'
+          gradle-version: '9.4.1'
       - name: Build
-        run: ./gradlew build --no-daemon -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore="$JAVA_HOME/lib/security/cacerts" -Djavax.net.ssl.trustStorePassword=changeit
+        run: gradle build --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get Version Number from Gradle
         id: get_version
         run: |
-          VERSION=$(./gradlew properties -q -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore="$JAVA_HOME/lib/security/cacerts" -Djavax.net.ssl.trustStorePassword=changeit | awk -F': ' '/^version:/ {print $2; exit}')
+          VERSION=$(gradle properties -q | awk -F': ' '/^version:/ {print $2; exit}')
           echo "VERSION=$VERSION" >> "$GITHUB_ENV"
       - name: Extract latest CHANGELOG entry
         id: changelog
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 7cdd363..32caac1 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -9,11 +9,11 @@ jobs:
   build:
     name: Build and Test
     runs-on: ubuntu-latest
+    env:
+      JAVA_TOOL_OPTIONS: -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit
 
     steps:
       - uses: actions/checkout@v5
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
       - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
@@ -22,9 +22,9 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 'wrapper'
+          gradle-version: '9.4.1'
       - name: Build
-        run: ./gradlew build --no-daemon -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore="$JAVA_HOME/lib/security/cacerts" -Djavax.net.ssl.trustStorePassword=changeit
+        run: gradle build --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload AntiVPN
diff --git a/.github/workflows/test-gradle.yml b/.github/workflows/test-gradle.yml
index 548c221..5d0a605 100644
--- a/.github/workflows/test-gradle.yml
+++ b/.github/workflows/test-gradle.yml
@@ -4,11 +4,11 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      JAVA_TOOL_OPTIONS: -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit
 
     steps:
       - uses: actions/checkout@v5
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
       - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
@@ -17,8 +17,8 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 'wrapper'
+          gradle-version: '9.4.1'
       - name: Build
-        run: ./gradlew build --no-daemon -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore="$JAVA_HOME/lib/security/cacerts" -Djavax.net.ssl.trustStorePassword=changeit
+        run: gradle build --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}