Merge branch 'trunk' of https://github.com/bancolombia/devsecops-engi…

…ne-tools into feature/parser_truffle
bancolombia · Nov 14, 2024 · 499eca0 · 499eca0
2 parents 5dcdbc2 + 2818175
commit 499eca0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/.github/workflows/intellij-build.yml b/.github/workflows/intellij-build.yml
@@ -70,12 +70,6 @@ jobs:
           distribution: temurin
           java-version: 21
 
-      # Setup Gradle
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
-
       # Set environment variables
       - name: Export Properties
         id: properties
@@ -124,12 +118,6 @@ jobs:
           distribution: temurin
           java-version: 21
 
-      # Setup Gradle
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
-
       # Run tests
       - name: Run Tests
         working-directory: ./ide_extension/intellij
@@ -167,12 +155,6 @@ jobs:
           distribution: temurin
           java-version: 21
 
-      # Setup Gradle
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-home-cache-cleanup: true
-
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
         working-directory: ./ide_extension/intellij

diff --git a/.github/workflows/intellij-release.yml b/.github/workflows/intellij-release.yml
@@ -37,14 +37,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: zulu
-          java-version: 17
-
-      # Setup Gradle
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+          distribution: temurin
+          java-version: 21
 
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/intellij-v}" >> $GITHUB_ENV

diff --git a/.github/workflows/intellij-updater.yml b/.github/workflows/intellij-updater.yml
@@ -25,8 +25,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
         with:
-          distribution: 'temurin' 
-          java-version: 17
+          distribution: temurin
+          java-version: 21
       - name: Set up NodeJS Latest
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 #v4.0.4
         with:

diff --git a/ide_extension/intellij/gradle.properties b/ide_extension/intellij/gradle.properties
@@ -6,7 +6,7 @@ pluginDescription=DevSecOps Engine Tools plugin which allows you to execute DevS
 pluginRepositoryUrl=https://github.com/bancolombia/devsecops-engine-tools
 pluginVendorName=Bancolombia
 # SemVer format -> https://semver.org
-pluginVersion=1.4.0
+pluginVersion=1.5.0
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=243
 pluginUntilBuild=243.*
@@ -23,6 +23,6 @@ gradleVersion=8.10.2
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency=false
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
 # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
-org.gradle.caching=true
+org.gradle.caching=false