diff --git a/mdw-draw/build.gradle.kts b/mdw-draw/build.gradle.kts index 9ff03fd..61aa88d 100644 --- a/mdw-draw/build.gradle.kts +++ b/mdw-draw/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "com.centurylink.mdw" -version = "1.0.4" +version = "1.0.5-SNAPSHOT" java.sourceSets { "main" { diff --git a/mdw-studio/build.gradle.kts b/mdw-studio/build.gradle.kts index c76446d..0600890 100644 --- a/mdw-studio/build.gradle.kts +++ b/mdw-studio/build.gradle.kts @@ -2,12 +2,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.intellij.tasks.PublishTask plugins { - kotlin("jvm") version "1.2.61" + kotlin("jvm") version "1.2.71" id("org.jetbrains.intellij") version "0.3.7" } group = "com.centurylink.mdw" -version = "1.0.4" +version = "1.0.5-SNAPSHOT" java.sourceSets { "main" { @@ -23,8 +23,9 @@ repositories { } dependencies { - implementation(kotlin("stdlib-jdk8")) - implementation(kotlin("reflect")) +// implementation(kotlin("stdlib-jdk8")) +// implementation(kotlin("reflect")) +// implementation(kotlin("compiler")) compile(project(":mdw-draw")) compile("com.beust:jcommander:1.72") compile("org.eclipse.jgit:org.eclipse.jgit:4.8.0.201706111038-r") { isTransitive = false } @@ -35,6 +36,7 @@ dependencies { intellij { version = "2018.2.3" + setPlugins("Kotlin") } tasks.withType { diff --git a/mdw-studio/build.md b/mdw-studio/build.md index a47063e..386437f 100644 --- a/mdw-studio/build.md +++ b/mdw-studio/build.md @@ -24,4 +24,7 @@ ``` 1. Update version in build.gradle.kts (x2) and resources/META-INF/plugin.xml. 2. (Release build only) - Comment out the PublishTask Channels entry (but do not commit) -2. Run Gradle task intellij/publishPlugin. \ No newline at end of file +3. Run Gradle task intellij/publishPlugin. +4. After success: + - Revert PublishTask comment-out + - Set next SNAPSHOT in build.gradle.kts x2, and commit \ No newline at end of file diff --git a/mdw-studio/resources/META-INF/plugin.xml b/mdw-studio/resources/META-INF/plugin.xml index 4ce6bde..7e63687 100644 --- a/mdw-studio/resources/META-INF/plugin.xml +++ b/mdw-studio/resources/META-INF/plugin.xml @@ -15,6 +15,7 @@ that makes it easy for you to create workflow processes and other assets.
com.intellij.modules.lang + org.jetbrains.kotlin diff --git a/mdw-studio/src/com/centurylink/mdw/studio/proj/ProjectSetup.kt b/mdw-studio/src/com/centurylink/mdw/studio/proj/ProjectSetup.kt index b5f45d6..94ae881 100644 --- a/mdw-studio/src/com/centurylink/mdw/studio/proj/ProjectSetup.kt +++ b/mdw-studio/src/com/centurylink/mdw/studio/proj/ProjectSetup.kt @@ -314,7 +314,7 @@ class ProjectSetup(val project: Project) : ProjectComponent, com.centurylink.mdw val annotatedAssets = mutableMapOf>() for (javaAsset in findAssetsOfType("java")) { val psiFile = PsiManager.getInstance(project).findFile(javaAsset.file) - psiFile?.let { assetPsiFile -> + psiFile?.let { _ -> if (psiFile is PsiClassOwner) { for (psiClass in psiFile.classes) { AnnotationUtil.findAnnotation(psiClass, annotation)?.let { psiAnnotation -> @@ -332,7 +332,7 @@ class ProjectSetup(val project: Project) : ProjectComponent, com.centurylink.mdw } for (ktAsset in findAssetsOfType("kt")) { val psiFile = PsiManager.getInstance(project).findFile(ktAsset.file) - psiFile?.let { assetPsiFile -> + psiFile?.let { _ -> if (psiFile is PsiClassOwner) { for (psiClass in psiFile.classes) { AnnotationUtil.findAnnotation(psiClass, annotation)?.let { psiAnnotation ->