Merge pull request #71 from xdev-software/develop

AB-xdev · web-flow · commit f6beb2e9ce83 · 2024-11-18T14:27:31.000+01:00
Release
diff --git a/.config/pmd/ruleset.xml b/.config/pmd/ruleset.xml
@@ -151,5 +151,12 @@
 		<exclude name="UseStringBufferForStringAppends"/>
 	</rule>
 
+	<rule ref="category/java/performance.xml/TooFewBranchesForSwitch">
+		<properties>
+			<!-- If you have one case only please use a if -->
+			<property name="minimumNumberCaseForASwitch" value="2"/>
+		</properties>
+	</rule>
+
 	<rule ref="category/java/security.xml"/>
 </ruleset>
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml
@@ -11,14 +11,17 @@ permissions:
 jobs:
   link-checker:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
 
       - run: mv .github/.lycheeignore .lycheeignore
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1
+        uses: lycheeverse/lychee-action@v2
+        with:
+          fail: false # Don't fail on broken links, create an issue instead
 
       - name: Find already existing issue
         id: find-issue
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
@@ -22,6 +22,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     strategy:
       matrix:
@@ -76,6 +77,7 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
@@ -93,11 +95,12 @@ jobs:
         cache: 'gradle'
 
     - name: Run Checkstyle
-      run: ./gradlew checkstyleMain checkstyleTest -PcheckstyleEnabled=true
+      run: ./gradlew checkstyleMain checkstyleTest -PcheckstyleEnabled
 
   pmd:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
@@ -115,7 +118,7 @@ jobs:
         cache: 'gradle'
 
     - name: Run PMD
-      run: ./gradlew pmdMain pmdTest
+      run: ./gradlew pmdMain pmdTest -PpmdEnabled
 
     - name: Upload report
       if: always()
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,9 @@ permissions:
   pull-requests: write
 
 jobs:
-  check_code: # Validates the code
+  check_code:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
       
@@ -45,6 +46,7 @@ jobs:
   prepare_release:
     runs-on: ubuntu-latest
     needs: [check_code]
+    timeout-minutes: 10
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
@@ -99,6 +101,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     needs: [prepare_release]
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
     
@@ -132,6 +135,7 @@ jobs:
   after_release:
     runs-on: ubuntu-latest
     needs: [publish]
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v4
       
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -11,7 +11,7 @@ on:
       - '.idea/**'
       - 'assets/**'
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: [ develop ]
     paths-ignore: 
       - '**.md'
       - '.config/**'
@@ -27,6 +27,7 @@ jobs:
   token-check:
     runs-on: ubuntu-latest
     if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
+    timeout-minutes: 5
     outputs:
       hasToken: ${{ steps.check-token.outputs.has }}
     steps:
@@ -40,6 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: token-check
     if: ${{ needs.token-check.outputs.hasToken }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:
@@ -67,7 +69,7 @@ jobs:
 
       - name: Build
         run: |
-          ./gradlew build sonarqube --info \
+          ./gradlew build sonarqube -x test --info \
             -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
             -Dsonar.organization=${{ env.SONARCLOUD_ORG }} \
             -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -14,6 +14,7 @@ permissions:
 jobs:
   labels:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
@@ -31,6 +31,7 @@ permissions:
 jobs:
   update:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     outputs:
       update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
       create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
@@ -180,6 +181,7 @@ jobs:
     needs: [update]
     if: needs.update.outputs.create_update_branch_merged_pr == 1
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -13,12 +13,14 @@ classes
 
 # Plugins
 *.idea/checkstyle-idea.xml
-.intellijPlatform
 
 # Gradle
 .gradle/
 build/
 
+# IntelliJ Platform Plugin
+.intellijPlatform
+
 
 # Some files are user/installation independent and are used for configuring the IDE
 # See also https://stackoverflow.com/a/35279076
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.run/Run Tests.run.xml b/.run/Run Tests.run.xml
@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PskipPMD" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.3
+* Drop support for IntelliJ < 2024.3
+  * This is required to fix deprecations
+
 # 1.0.2
 * Drop support for IntelliJ < 2024.2
 * Removed deprecated code that was only required for older IDE versions
diff --git a/build.gradle b/build.gradle
@@ -3,13 +3,13 @@ plugins {
     id 'idea'
     id 'checkstyle'
     id 'pmd'
-    id 'org.jetbrains.intellij.platform' version '2.0.1'
+    id 'org.jetbrains.intellij.platform' version '2.1.0'
     id 'org.sonarqube' version '5.1.0.4882'
 }
 
 ext {
-    checkstyleVersion = '10.18.1'
-    pmdVersion = '7.5.0'
+    checkstyleVersion = '10.20.1'
+    pmdVersion = '7.7.0'
 }
 
 def properties(String key) {
@@ -57,7 +57,7 @@ dependencies {
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
     pmd "net.sourceforge.pmd:pmd-ant:${pmdVersion}",
             "net.sourceforge.pmd:pmd-java:${pmdVersion}"
-    testImplementation platform('org.junit:junit-bom:5.11.0'),
+    testImplementation platform('org.junit:junit-bom:5.11.3'),
             'org.junit.jupiter:junit-jupiter',
             'org.junit.jupiter:junit-jupiter-engine',
             'org.assertj:assertj-core:3.26.3'
@@ -120,7 +120,7 @@ tasks.withType(Checkstyle).configureEach {
 }
 
 tasks.withType(Pmd).configureEach {
-    enabled = !project.hasProperty("skipPMD")
+    enabled = project.hasProperty("pmdEnabled")
 }
 
 // Configure compileJava AND compileTestJava
diff --git a/gradle.properties b/gradle.properties
@@ -5,8 +5,8 @@ pluginName=OpenRewriter X
 pluginVersion=1.0.3-SNAPSHOT
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IC
-platformVersion=2024.2.2
-platformSinceBuild=242
+platformVersion=2024.3
+platformSinceBuild=243
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformBundledPlugins=org.jetbrains.idea.maven,org.jetbrains.plugins.gradle
diff --git 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.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/software/xdev/openrewriter/executor/request/target/directory/DirectoryExecutionTargetProvider.java b/src/main/java/software/xdev/openrewriter/executor/request/target/directory/DirectoryExecutionTargetProvider.java
@@ -68,7 +68,7 @@ public DirectoryExecutionTargetProviderConfigPanel()
 			this.field.setEnabled(false);
 			
 			final TextFieldWithBrowseButton resultPath = new TextFieldWithBrowseButton(this.field);
-			resultPath.addBrowseFolderListener(null, null, null, descriptor, TEXT_FIELD_WHOLE_TEXT);
+			resultPath.addBrowseFolderListener(null, descriptor, TEXT_FIELD_WHOLE_TEXT);
 			
 			this.add(resultPath);
 			
