Adapter Android studio 2021.3.1 P1

Author: longforus

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
 
+## [v1.4.6](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2022-11-24)
+- Adapter Android studio 2021.3.1 P1.
+
 ## [v1.4.5](https://plugins.jetbrains.com/plugin/10907-mvpautocodeplus)(2020-10-17)
 - Adapter Android studio 4.1,fix create layout file error.
 

build.gradle

@@ -1,30 +1,32 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.6.10'
     repositories {
         //        maven { url 'http://192.168.2.39:8908/repository/maven-public/' }
         maven { url 'https://maven.aliyun.com/repository/public' }
         google()
         mavenCentral()
     }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
+//    dependencies {
+//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+//    }
 }
 
 plugins {
-    id 'org.jetbrains.intellij' version '0.4.2'
+    id 'org.jetbrains.intellij' version '1.5.3'
+//    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version "$kotlin_version"
 }
 
-version '1.4.5'
+version '1.4.6'
 group 'com.longforus'
 
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'org.jetbrains.intellij'
+//apply plugin: 'java'
+//apply plugin: 'kotlin'
+//apply plugin: 'kotlin-kapt'
+//apply plugin: 'org.jetbrains.intellij'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 //sourceSets {
 //    main {
@@ -42,57 +44,53 @@ repositories {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 
 if (!hasProperty('StudioCompilePath')) {
     throw new GradleException("No StudioCompilePath value was set, please create gradle.properties file")
 }
 
 intellij {
-    version '2019.3'
-    plugins 'java'
-    plugins 'org.jetbrains.kotlin:1.3.72-release-IJ2019.3-1' //here
-    //        plugins 'org.jetbrains.kotlin:1.3.21-release-IJ2018.2-1' //here
-    //    version '2018.2'
-    //    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2018.2-1' //here
-    //    version '2018.1'
-    //    plugins 'org.jetbrains.kotlin:1.2.60-release-IJ2018.1-1' //here
-    //    version '2017.3'
-    //    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2017.3-1' //here
-    intellij.updateSinceUntilBuild false
-//    intellij.localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
+    pluginName='MvpAutoCodePlus'
+//    version '2021.1.3'
+//    type 'IC'
+    plugins=['java','android']
+//    plugins 'org.jetbrains.kotlin:212-1.6.20-release-275-AS5457.46' //here
+    updateSinceUntilBuild=false
+    downloadSources=true
+    localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compileOnly fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
-    compileOnly fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
-    compileOnly fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
-
-    testCompile fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
-    testCompile fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
-    testCompile fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
-//    compile "com.jetbrains.intellij.java:java-psi:192.7142.36"
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+//    compileOnly fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
+//    compileOnly fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
+//    compileOnly fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
+//
+//    testImplementation fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
+//    testImplementation fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
+//    testImplementation fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
+//    implementation "com.jetbrains.intellij.java:java-psi:192.7142.36"
 //    compileOnly "com.android.tools.build:gradle:3.6.1"
-    compileOnly "com.android.tools.build:gradle:4.0.1"
+//    compileOnly "com.android.tools.build:gradle:4.2.2"
 //    compileOnly "com.jetbrains.intellij.java:java:192.7142.36"
-    //    compile 'com.squareup:javapoet:1.11.0'
-    //    testCompile group: 'junit', name: 'junit', version: '4.12'
+    //    Implementation 'com.squareup:javapoet:1.11.0'
+    //    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 patchPluginXml {
-    changeNotes """<h3>Adapter Android studio 4.1,fix create layout file error.</h3>
+    changeNotes="""<h3>Adapter Android studio 2021.3.1 P1</h3>
 <br/>
 <a href="https://github.com/longforus/MvpAutoCodePlus/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>"""
 }
 
-publishPlugin {
-    token publishToken
-}
+//publishPlugin {
+//    token publishToken
+//}
 
 //指定编译的编码
 tasks.withType(JavaCompile) {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

src/main/kotlin/com/longforus/mvpautocodeplus/MainAction.kt

@@ -85,7 +85,7 @@ open class MainAction : AnAction("Generate MVP Code", "auto make mvp code", Plat
             val module = ModuleUtil.findModuleForFile(dir.virtualFile, project!!)
             val facet = AndroidFacet.getInstance(module!!)
             if (facet != null) {
-                AndroidRootUtil.getManifestFileForCompiler(facet)?.let {
+                AndroidRootUtil.getPrimaryManifestFile(facet)?.let {
                     AndroidUtils.loadDomElement(facet.module, it, Manifest::class.java)?.let {
                         curAppPackage = it.getPackage()?.value
                     }

src/main/kotlin/com/longforus/mvpautocodeplus/maker/LayoutCreator.kt

@@ -39,7 +39,7 @@ fun doCreateLayoutFile(ic: ItemConfigBean,element: PsiClass?, project: Project,
     return if (element == null) {
         null
     } else {
-        val manifestFile = AndroidRootUtil.getManifestFileForCompiler(facet) ?: return null
+        val manifestFile = AndroidRootUtil.getPrimaryManifestFile(facet) ?: return null
         val manifest = AndroidUtils.loadDomElement(facet.module, manifestFile,Manifest::class.java)
 //        val manifest = Manifest.getMainManifest(facet)
         val appPackage = manifest?.getPackage()?.value

src/main/kotlin/com/longforus/mvpautocodeplus/maker/MethodImpl.kt

@@ -9,15 +9,14 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.WriteCommandAction.writeCommandAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiMethod
-import com.intellij.psi.PsiModifier
+import com.intellij.psi.*
 import com.intellij.util.IncorrectOperationException
 import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.idea.core.overrideImplement.GenerateMembersHandler
 import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
-import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembersHandler
+import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMembersHandler
+import org.jetbrains.kotlin.psi.KtClassOrObject
 
 /**
  * Created by XQ Yang on 2018/7/2  15:53.
@@ -41,14 +40,12 @@ fun overrideOrImplementMethods(project: Project,
 fun kotlinDoMultiOverrideImplement(aClass: KtLightClass, project: Project, editor: Editor) {
 //    val classOrObject = PsiTreeUtil.getParentOfType(aClass, KtClassOrObject::class.java)
 //        ?: error("Caret should be inside class or object")
-    val classOrObject = aClass.kotlinOrigin ?: error("Caret should be inside class or object")
-
+    val classOrObject : KtClassOrObject = aClass.kotlinOrigin ?:  throw IllegalStateException("Caret should be inside class or object")
 
     val chooserObjects = implementMembersHandler.collectMembersToGenerate(
         classOrObject).sortedBy { it.descriptor.name.asString() + " in " + it.immediateSuper.containingDeclaration.name.asString() }
-
-    writeCommandAction(project, aClass.containingFile).run<Throwable> {
-        OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
+    writeCommandAction(project,classOrObject.containingKtFile as PsiFile).run<Throwable> {
+        GenerateMembersHandler.generateMembers(editor,classOrObject,chooserObjects,false)
     }
 }
 

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

@@ -57,7 +57,6 @@
   </application-components>
   <actions>
     <!-- Add your actions here -->
-
     <group description="auto make mvp code" id="mvpMaker" text="Generate MVP Code">
       <add-to-group anchor="first" group-id="NewGroup"/>
       <action class="com.longforus.mvpautocodeplus.MainAction" description="auto make mvp code" id="mvpMaker.make" text="Generate MVP Code"/>