Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 2.2.2.0x; fix compatibility for auto-fix suggestions in 2023.2 #525

Merged
merged 2 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
set JAVA_HOME=C:\jdk-17\

cd ./p3c-pmd
call ./mvnw clean install -Dmaven.javadoc.skip=false -e -X
cd ../
cd ./idea-plugin

set JAVA_HOME=C:\jdk-17\

cd ./p3c-common
call ../gradlew clean publishToMavenLocal
cd ../
Expand Down
5 changes: 4 additions & 1 deletion deploy.cmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
set JAVA_HOME=C:\jdk-17\
set JAVA_HOME=C:\jdk-8\

cd ./p3c-pmd
call ./mvnw clean deploy -Dmaven.javadoc.skip=false -e -X -Psonatype-oss-release
cd ../
cd ./idea-plugin

set JAVA_HOME=C:\jdk-17\

cd ./p3c-common
rem call ../gradlew clean install sign uploadArchives -DossrhUsername="%ossrhUsername%" -DossrhPassword="%ossrhPassword%"
call ../gradlew publishToMavenLocal
Expand Down
2 changes: 1 addition & 1 deletion idea-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cd p3c-idea

## <font color="green">Use p3c-common as your plugin dependency</font>
```groovy
compile 'com.xenoamess.p3c.idea:p3c-common:2.2.1.0x'
compile 'com.xenoamess.p3c.idea:p3c-common:2.2.2.0x'
```
## [中文使用手册](README_cn.md)
## <font color="green">Install</font>
Expand Down
5 changes: 3 additions & 2 deletions idea-plugin/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
# See https://www.jetbrains.com/intellij-repository/releases/
# See https://www.jetbrains.com/intellij-repository/snapshots/
#idea_version=2022.1
idea_version=231.8109.175
idea_version=232.8660.185
#idea_version=181.5540.23
#idea_version=145.258.11
plugin_name=Alibaba Java Coding Guidelines
systemProp.file.encoding=UTF-8
plugin_version=2.2.1.0x
plugin_version=2.2.2.0x
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class AliMissingOverrideAnnotationInspection : MissingOverrideAnnotationInspecti

override fun createOptionsPanel(): JComponent? = null

override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
val fix : InspectionGadgetsFix
override protected fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
val fix : LocalQuickFix
try {
fix = super.buildFix(*infos) ?: return null
} catch (e: Exception){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.alibaba.p3c.idea.quickfix

import com.intellij.codeInspection.LocalQuickFix
import com.intellij.codeInspection.ProblemDescriptor
import com.intellij.openapi.project.Project
import com.siyeh.ig.InspectionGadgetsFix
Expand All @@ -26,9 +27,9 @@ import com.siyeh.ig.InspectionGadgetsFix
* @date 2017/03/02
*/
class DecorateInspectionGadgetsFix(
val fix: InspectionGadgetsFix,
internal val name: String,
internal val familyName: String = name
val fix: LocalQuickFix,
internal val name: String,
internal val familyName: String = name
) : InspectionGadgetsFix() {
override fun getName(): String {
return name
Expand Down
5 changes: 4 additions & 1 deletion idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
]]></description>

<change-notes><![CDATA[
<ul>2.2.2.0x
<li>Fix 2023.2 compatibility issue</li>
</ul>
<ul>2.2.1.0x
<li>Fix @Override missing error</li>
</ul>
Expand Down Expand Up @@ -230,7 +233,7 @@
]]>
</change-notes>

<idea-version since-build="231.8109.175"/>
<idea-version since-build="232.8660.185"/>

<depends optional="true" config-file="pluginWithJava.xml">com.intellij.modules.java</depends>
<depends>com.intellij.modules.platform</depends>
Expand Down
2 changes: 1 addition & 1 deletion p3c-pmd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<dependency>
<groupId>com.xenoamess.p3c</groupId>
<artifactId>p3c-pmd</artifactId>
<version>2.2.1.0x</version>
<version>2.2.2.0x</version>
</dependency>
```
### <font color="green">Gradle</font>
Expand Down
2 changes: 1 addition & 1 deletion p3c-pmd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.xenoamess.p3c</groupId>
<artifactId>p3c-pmd</artifactId>
<version>2.2.1.0x</version>
<version>2.2.2.0x</version>
<packaging>jar</packaging>
<name>p3c-pmd</name>
<properties>
Expand Down