Upgrade intellij (#3)

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## 2021.3.0
+- upgrade intellij version
+
 ## 2021.2.1
 - upgrade to latest intellij idea
 

build.gradle.kts

@@ -1,5 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+
 plugins {
     // Java support
     id("java")
@@ -9,6 +10,8 @@ plugins {
     id("org.jetbrains.intellij") version "1.1.6"
 }
 
+
+
 group = "com.emberjs"
 version = "2021.2.1"
 
@@ -27,7 +30,7 @@ intellij {
 
     // see https://www.jetbrains.com/intellij-repository/releases/
     // and https://www.jetbrains.com/intellij-repository/snapshots/
-    version.set("2021.2")
+    version.set("2021.3")
     type.set("IU")
 
     downloadSources.set(!System.getenv().containsKey("CI"))
@@ -37,7 +40,7 @@ intellij {
     // Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
     //
     // com.dmarcotte.handlebars: see https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions
-    plugins.set(listOf("JavaScriptLanguage", "CSS", "yaml", "com.dmarcotte.handlebars:212.4746.2"))
+    plugins.set(listOf("JavaScriptLanguage", "CSS", "yaml", "com.dmarcotte.handlebars:213.5744.190"))
 
     sandboxDir.set(project.rootDir.canonicalPath + "/.sandbox")
 }
@@ -55,4 +58,9 @@ tasks {
     publishPlugin {
         token.set(System.getenv("ORG_GRADLE_PROJECT_intellijPublishToken"))
     }
+
 }
+
+tasks.test {
+    systemProperty("idea.force.use.core.classloader", "true")
+}

src/main/kotlin/com/emberjs/cli/EmberCliFrameworkDetector.kt

@@ -30,7 +30,7 @@ class EmberCliFrameworkDetector : FrameworkDetector("Ember") {
 
     override fun getFrameworkType(): FrameworkType = EmberFrameworkType
 
-    override fun detect(newFiles: MutableCollection<VirtualFile>, context: FrameworkDetectionContext): MutableList<out DetectedFrameworkDescription> {
+    override fun detect(newFiles: MutableCollection<out VirtualFile>, context: FrameworkDetectionContext): MutableList<out DetectedFrameworkDescription> {
         val rootDir = newFiles.firstOrNull()?.parent
         if (rootDir != null && !isConfigured(newFiles, context.project)) {
             return mutableListOf(EmberFrameworkDescription(rootDir, newFiles))

src/main/kotlin/com/emberjs/cli/EmberCliProjectTemplatesFactory.kt

@@ -6,7 +6,7 @@ import com.intellij.platform.ProjectTemplate
 import com.intellij.platform.ProjectTemplatesFactory
 
 class EmberCliProjectTemplatesFactory : ProjectTemplatesFactory() {
-    override fun createTemplates(group: String?, context: WizardContext?): Array<ProjectTemplate> =
+    override fun createTemplates(group: String?, context: WizardContext): Array<out ProjectTemplate> =
             arrayOf(EmberCliProjectGenerator(), EmberCliAddonProjectGenerator())
 
     override fun getGroups(): Array<String> = arrayOf(WebModuleBuilder.GROUP_NAME)