Skip to content

Commit a7c5477

Browse files
committed
Replace usage of deprecated code and drop support for 2019.1, 2019.2, 2019.3
Fixes #72
1 parent 22a41d8 commit a7c5477

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
ideaVersion: [2019.1, 2019.2, 2019.3, 2020.1, 2020.2, 2020.3, LATEST-EAP-SNAPSHOT]
10+
ideaVersion: [2020.1, 2020.2, 2020.3, LATEST-EAP-SNAPSHOT]
1111
name: 'IDEA ${{ matrix.ideaVersion }}'
1212
env:
1313
IDEA_VERSION: ${{ matrix.ideaVersion }}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# https://www.jetbrains.com/intellij-repository/releases
33
# https://www.jetbrains.com/intellij-repository/snapshots
44

5-
ideaVersion = 2019.1
5+
ideaVersion = 2020.1
66
ideaType = IC
77
sources = true
88
isEAP = false
99
runGenerators = true
1010

1111
pluginGroup = org.mapstruct
1212
pluginName = mapstruct-intellij
13-
pluginVersion = 1.2.5-SNAPSHOT
13+
pluginVersion = 1.3.0-SNAPSHOT
1414

1515
publishPluginId =
1616
publishUsername =

src/main/java/org/mapstruct/intellij/MapStructBundle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.lang.ref.SoftReference;
1010
import java.util.ResourceBundle;
1111

12-
import com.intellij.CommonBundle;
12+
import com.intellij.AbstractBundle;
1313
import org.jetbrains.annotations.NonNls;
1414
import org.jetbrains.annotations.NotNull;
1515
import org.jetbrains.annotations.PropertyKey;
@@ -22,7 +22,7 @@
2222
public class MapStructBundle {
2323
public static String message(@NotNull @PropertyKey(resourceBundle = MapStructBundle.PATH_TO_BUNDLE) String key,
2424
@NotNull Object... params) {
25-
return CommonBundle.message( getBundle(), key, params );
25+
return AbstractBundle.message( getBundle(), key, params );
2626
}
2727

2828
private static Reference<ResourceBundle> ourBundle;

src/main/java/org/mapstruct/intellij/inspection/WrongUsageOfMappersFactoryInspection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.intellij.psi.PsiMethodCallExpression;
2626
import com.intellij.psi.PsiNameValuePair;
2727
import com.intellij.psi.PsiVariable;
28+
import com.intellij.psi.util.PsiUtil;
2829
import com.siyeh.ig.callMatcher.CallMatcher;
29-
import com.siyeh.ig.psiutils.ParenthesesUtils;
3030
import org.jetbrains.annotations.Nls;
3131
import org.jetbrains.annotations.NotNull;
3232
import org.mapstruct.intellij.MapStructBundle;
@@ -60,7 +60,7 @@ private MyJavaElementVisitor(ProblemsHolder problemsHolder) {
6060
@Override
6161
public void visitMethodCallExpression(PsiMethodCallExpression expression) {
6262
if ( MAPPERS_FACTORY_CALL_MATCHER.test( expression ) ) {
63-
PsiExpression argument = ParenthesesUtils.stripParentheses( expression.getArgumentList()
63+
PsiExpression argument = PsiUtil.skipParenthesizedExprDown( expression.getArgumentList()
6464
.getExpressions()[0] );
6565
if ( !( argument instanceof PsiClassObjectAccessExpression ) ) {
6666
return;

src/main/java/org/mapstruct/intellij/util/MapstructAnnotationUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import static com.intellij.codeInsight.AnnotationUtil.findAnnotation;
3636
import static com.intellij.codeInsight.AnnotationUtil.findDeclaredAttribute;
37-
import static com.intellij.codeInsight.intention.AddAnnotationPsiFix.addPhysicalAnnotation;
37+
import static com.intellij.codeInsight.intention.AddAnnotationPsiFix.addPhysicalAnnotationTo;
3838
import static com.intellij.codeInsight.intention.AddAnnotationPsiFix.removePhysicalAnnotations;
3939
import static org.mapstruct.intellij.util.MapstructUtil.MAPPING_ANNOTATION_FQN;
4040

@@ -98,7 +98,7 @@ public static void addMappingAnnotation(@NotNull Project project,
9898
qualifiedName
9999
) );
100100

101-
PsiAnnotation inserted = addPhysicalAnnotation(
101+
PsiAnnotation inserted = addPhysicalAnnotationTo(
102102
fqn,
103103
attributes,
104104
mappingMethod.getModifierList()

src/main/java/org/mapstruct/intellij/util/MapstructUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ static boolean isMapStructJdk8Present(@NotNull Module module) {
549549
* {@code false} otherwise
550550
*/
551551
public static boolean isInheritInverseConfiguration(PsiMethod method) {
552-
return isAnnotated( method, INHERIT_INVERSE_CONFIGURATION, false );
552+
return isAnnotated( method, INHERIT_INVERSE_CONFIGURATION, AnnotationUtil.CHECK_TYPE );
553553
}
554554

555555
}

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<vendor url="http://www.mapstruct.org">MapStruct</vendor>
2525

2626
<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
27-
<idea-version since-build="191"/>
27+
<idea-version since-build="201"/>
2828

2929
<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
3030
on how to target different products -->

0 commit comments

Comments
 (0)