Fix #23: Compatibility with Kotlin plugin 1.4.20+

And use JVM target 1.8

Author: BlueBoxWare

build.gradle

@@ -82,6 +82,11 @@ sourceSets {
     }
 }
 
+compileJava {
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+}
+
 compileAnnotationsJava {
     sourceCompatibility = 1.6
     targetCompatibility = 1.6

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

@@ -17,6 +17,7 @@ package com.gmail.blueboxware.libgdxplugin.inspections.kotlin
 
 import com.gmail.blueboxware.libgdxplugin.inspections.getFlushingMethods
 import com.gmail.blueboxware.libgdxplugin.message
+import com.gmail.blueboxware.libgdxplugin.utils.compat.isGetter
 import com.intellij.codeInspection.LocalInspectionToolSession
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.PsiElement
@@ -148,26 +149,19 @@ private class LoopBodyChecker(val holder: ProblemsHolder, session: LocalInspecti
     //
     // Are we using a property accessor which contains a flushing call?
     //
+    val spars = refs.filterIsInstance<SyntheticPropertyAccessorReference>()
 
-    var getter: Boolean? = null
-
-    for (ref in refs) {
-      if (ref is SyntheticPropertyAccessorReference) {
-        if (ref is SyntheticPropertyAccessorReference.Getter) {
-          getter = true
-        } else if (ref is SyntheticPropertyAccessorReference.Setter) {
-          getter = false
-        }
-      }
+    if (spars.isEmpty()) {
+      return
     }
 
-    if (getter == null) return
+    val isGetter = spars.any { it.isGetter() }
 
     for (ref in refs) {
       val target = ref.resolve()
       if (target is KtProperty) {
         // Kotlin accessor
-        val accessor = if (getter) target.getter else target.setter
+        val accessor = if (isGetter) target.getter else target.setter
         if (accessor != null && allFlushingMethods.contains(accessor)) {
           registerProblem(expression)
           return

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

@@ -2,6 +2,7 @@ package com.gmail.blueboxware.libgdxplugin.inspections.kotlin
 
 import com.gmail.blueboxware.libgdxplugin.utils.isSetLogLevel
 import com.gmail.blueboxware.libgdxplugin.message
+import com.gmail.blueboxware.libgdxplugin.utils.compat.isGetter
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.PsiMethod
 import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
@@ -70,7 +71,7 @@ class KotlinLogLevelInspection: LibGDXKotlinBaseInspection() {
 
         for (ref in refs) {
 
-          if (ref is SyntheticPropertyAccessorReference.Setter) {
+          if ((ref as? SyntheticPropertyAccessorReference)?.isGetter() == false) {
             val target = ref.resolve()
             if (target is PsiMethod) {
               val clazz = target.containingClass ?: continue

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/utils/compat/Utils.kt

@@ -0,0 +1,36 @@
+package com.gmail.blueboxware.libgdxplugin.utils.compat
+
+import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference
+import org.jetbrains.kotlin.utils.addToStdlib.cast
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.memberProperties
+
+
+/*
+ * Copyright 2020 Blue Box Ware
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+fun SyntheticPropertyAccessorReference.isGetter(): Boolean {
+  if (this::class.simpleName == "Getter") {
+    return true
+  } else if (this::class.simpleName == "Setter") {
+    return false
+  }
+  return this::class
+          .memberProperties
+          .firstOrNull { it.name == "getter" }
+          ?.cast<KProperty1<SyntheticPropertyAccessorReference, Boolean>>()
+          ?.get(this)
+          ?: false
+}

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

@@ -18,7 +18,7 @@
     <id>com.gmail.blueboxware.libgdxplugin</id>
     <!--suppress PluginXmlCapitalization -->
     <name>libGDX</name>
-    <version>1.21</version>
+    <version>1.22</version>
     <vendor url="https://github.com/BlueBoxWare/LibGDXPlugin">Blue Box Ware</vendor>
 
     <description><![CDATA[
@@ -31,6 +31,11 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <b>1.22</b>
+        <ul>
+            <li>Compatibility with Kotlin plugin 1.4.20+ (<a href="https://github.com/BlueBoxWare/LibGDXPlugin/issues/23">#23</a>)</li>
+            <li>Build for Java target 1.8 (fixes compatibility with Android Studio)</li>
+        </ul>
         <b>1.21</b>
         <ul>
             <li>Changed plugin name to libGDX (<a href="https://github.com/BlueBoxWare/LibGDXPlugin/issues/22">#22</a>).</li>

versions.gradle

@@ -1,9 +1,9 @@
 ext {
 
-    pluginVersion = '1.21'
+    pluginVersion = '1.22'
 
     kotlinVersion = '1.4.10'
-    
+
     intellijPluginVersion = '0.4.26'
 
 //    ideaVersion = '2019.3.3'