Skip to content

Commit 440f22f

Browse files
committed
Remove more deprecated stuff, fixes.
1 parent 389eaf0 commit 440f22f

File tree

13 files changed

+18
-131
lines changed

13 files changed

+18
-131
lines changed

build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ sourceSets {
4545

4646
tasks {
4747
withType<JavaCompile> {
48+
sourceCompatibility = "17"
49+
targetCompatibility = "17"
50+
}
51+
52+
named<JavaCompile>("compileAnnotationsJava") {
4853
sourceCompatibility = "11"
4954
targetCompatibility = "11"
5055
}

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/actions/MarkAsGdxJsonAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import icons.Icons
3232
*/
3333
class MarkAsGdxJsonAction : AnAction() {
3434

35-
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
35+
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
3636

3737
override fun update(event: AnActionEvent) {
3838

@@ -55,7 +55,7 @@ class MarkAsGdxJsonAction : AnAction() {
5555
presentation.isEnabled = true
5656

5757
} else if (
58-
currentLanguage == LibGDXJsonLanuage.INSTANCE
58+
currentLanguage == LibGDXJsonLanuage.INSTANCE && file.extension != "lson"
5959
) {
6060

6161
@Suppress("DialogTitleCapitalization")

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/actions/MarkAsSkinAction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import icons.Icons
2929
*/
3030
class MarkAsSkinAction : AnAction() {
3131

32-
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
32+
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
3333

3434
override fun update(event: AnActionEvent) {
3535

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/annotators/ColorAnnotator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.gmail.blueboxware.libgdxplugin.utils.key
88
import com.intellij.lang.annotation.AnnotationHolder
99
import com.intellij.lang.annotation.Annotator
1010
import com.intellij.psi.PsiElement
11-
import org.jetbrains.kotlin.idea.refactoring.getLineNumber
11+
import org.jetbrains.kotlin.idea.base.psi.getLineNumber
1212
import java.awt.Color
1313

1414
/*

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/inspections/gradle/GradleKotlinOutdatedVersionInspection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.gmail.blueboxware.libgdxplugin.utils.*
55
import com.gmail.blueboxware.libgdxplugin.versions.Libraries
66
import com.intellij.codeInspection.ProblemsHolder
77
import com.intellij.psi.PsiElement
8-
import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
8+
import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection
99
import org.jetbrains.kotlin.psi.KtStringTemplateExpression
1010
import org.jetbrains.kotlin.psi.KtValueArgumentList
1111
import org.jetbrains.kotlin.psi.KtVisitorVoid

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/inspections/kotlin/KotlinFlushInsideLoopInspection.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package com.gmail.blueboxware.libgdxplugin.inspections.kotlin
1717

1818
import com.gmail.blueboxware.libgdxplugin.inspections.getFlushingMethods
1919
import com.gmail.blueboxware.libgdxplugin.message
20-
import com.gmail.blueboxware.libgdxplugin.utils.compat.isGetter
2120
import com.intellij.codeInspection.LocalInspectionToolSession
2221
import com.intellij.codeInspection.ProblemsHolder
2322
import com.intellij.psi.PsiElement
@@ -151,7 +150,7 @@ private class LoopBodyChecker(val holder: ProblemsHolder, session: LocalInspecti
151150
return
152151
}
153152

154-
val isGetter = spars.any { it.isGetter() }
153+
val isGetter = spars.any { it.getter }
155154

156155
for (ref in refs) {
157156
val target = ref.resolve()

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/inspections/kotlin/KotlinLogLevelInspection.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.gmail.blueboxware.libgdxplugin.inspections.kotlin
22

33
import com.gmail.blueboxware.libgdxplugin.message
4-
import com.gmail.blueboxware.libgdxplugin.utils.compat.getCalleeExpressionIfAny
5-
import com.gmail.blueboxware.libgdxplugin.utils.compat.isGetter
64
import com.gmail.blueboxware.libgdxplugin.utils.isSetLogLevel
75
import com.intellij.codeInspection.ProblemsHolder
86
import com.intellij.psi.PsiMethod
97
import org.jetbrains.kotlin.idea.base.psi.kotlinFqName
108
import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference
119
import org.jetbrains.kotlin.lexer.KtSingleValueToken
1210
import org.jetbrains.kotlin.psi.*
11+
import org.jetbrains.kotlin.resolve.calls.util.getCalleeExpressionIfAny
1312

1413
/*
1514
* Copyright 2016 Blue Box Ware
@@ -68,7 +67,7 @@ class KotlinLogLevelInspection : LibGDXKotlinBaseInspection() {
6867

6968
for (ref in refs) {
7069

71-
if ((ref as? SyntheticPropertyAccessorReference)?.isGetter() == false) {
70+
if ((ref as? SyntheticPropertyAccessorReference)?.getter == false) {
7271
val target = ref.resolve()
7372
if (target is PsiMethod) {
7473
val clazz = target.containingClass ?: continue

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/inspections/kotlin/LibGDXKotlinBaseInspection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package com.gmail.blueboxware.libgdxplugin.inspections.kotlin
1717

18-
import com.gmail.blueboxware.libgdxplugin.utils.compat.getCall
19-
import com.gmail.blueboxware.libgdxplugin.utils.compat.getResolvedCall
2018
import com.gmail.blueboxware.libgdxplugin.utils.isLibGDXProject
2119
import com.intellij.codeInspection.LocalInspectionTool
2220
import com.intellij.psi.PsiElement
2321
import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
2422
import org.jetbrains.kotlin.idea.caches.resolve.analyze
2523
import org.jetbrains.kotlin.psi.KtCallExpression
24+
import org.jetbrains.kotlin.resolve.calls.util.getCall
25+
import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
2626
import org.jetbrains.kotlin.types.KotlinType
2727

2828
@Suppress("InspectionDescriptionNotFoundInspection")

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/inspections/xml/MissingExternalFilesPermissionInspection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.gmail.blueboxware.libgdxplugin.inspections.xml
22

33
import com.gmail.blueboxware.libgdxplugin.message
44
import com.gmail.blueboxware.libgdxplugin.utils.androidManifest.ManifestModel
5-
import com.gmail.blueboxware.libgdxplugin.utils.compat.getCalleeExpressionIfAny
65
import com.gmail.blueboxware.libgdxplugin.utils.firstParent
76
import com.gmail.blueboxware.libgdxplugin.utils.psiFacade
87
import com.intellij.codeInspection.ProblemsHolder
@@ -14,6 +13,7 @@ import com.intellij.psi.xml.XmlFile
1413
import org.jetbrains.kotlin.idea.base.psi.kotlinFqName
1514
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
1615
import org.jetbrains.kotlin.psi.KtCallExpression
16+
import org.jetbrains.kotlin.resolve.calls.util.getCalleeExpressionIfAny
1717

1818
/*
1919
* Copyright 2017 Blue Box Ware

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/utils/ColorPsiElementsUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.gmail.blueboxware.libgdxplugin.utils
1717

18-
import com.gmail.blueboxware.libgdxplugin.utils.compat.getType
1918
import com.intellij.openapi.util.text.StringUtil
2019
import com.intellij.psi.*
2120
import com.intellij.psi.impl.compiled.ClsElementImpl
@@ -31,6 +30,7 @@ import org.jetbrains.kotlin.idea.intentions.callExpression
3130
import org.jetbrains.kotlin.idea.references.AbstractKtReference
3231
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
3332
import org.jetbrains.kotlin.psi.*
33+
import org.jetbrains.kotlin.resolve.calls.util.getType
3434
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
3535
import java.awt.Color
3636

0 commit comments

Comments
 (0)