Merge pull request #13 from remotemobprogramming/feature/compatible_203

Compatibility for 2020.3

Author: nowsprinting

.github/workflows/build.yml

@@ -29,10 +29,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
 
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
@@ -67,6 +67,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        JAVA_HOME: '' # Avoid 'java: not found' error
 
     - name: Build plugin
       run: ./gradlew buildPlugin
@@ -76,22 +77,9 @@ jobs:
         path: build/distributions
 
     - name: Check plugin compatibility
-      uses: ChrisCarini/intellij-platform-plugin-verifier-action@v0.0.2
+      uses: ChrisCarini/intellij-platform-plugin-verifier-action@v1.0.3
       with:
-        ide-versions: |
-          ideaIC:2020.1
-          ideaIU:2020.1
-          clion:2020.1
-          goland:2020.1
-          pycharmPC:2020.1
-          pycharmPY:2020.1
-          riderRD:2020.1
-          ideaIC:LATEST-EAP-SNAPSHOT
-          ideaIU:LATEST-EAP-SNAPSHOT
-          clion:LATEST-EAP-SNAPSHOT
-          goland:LATEST-EAP-SNAPSHOT
-          pycharmPC:LATEST-EAP-SNAPSHOT
-          pycharmPY:LATEST-EAP-SNAPSHOT
+        ide-versions: .github/workflows/ide_versions_file.txt
 
     - uses: nowsprinting/check-version-format-action@v1
       id: version

.github/workflows/ide_versions_file.txt

@@ -0,0 +1,3 @@
+ideaIC:2020.3
+goland:2020.3
+riderRD:2020.3

.idea/copyright/Apache_2_0.xml

@@ -1,4 +1,5 @@
 ## Unreleased
+- Support for 2020.3
 
 ## 1.0.2
 - Fix meta wording

.idea/kotlinc.xml

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Koji Hasegawa
+   Copyright 2020-2021 Koji Hasegawa
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

CHANGELOG.md

@@ -1,11 +1,11 @@
 /*
- * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 
 plugins {
-    id("org.jetbrains.intellij") version "0.4.21"
+    id("org.jetbrains.intellij") version "0.6.5"
     java
-    kotlin("jvm") version "1.3.71"
+    kotlin("jvm") version "1.4.21"
     id("com.palantir.git-version") version "0.12.3"
     jacoco
     id("io.gitlab.arturbosch.detekt") version "1.11.0"
@@ -38,7 +38,7 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = "LATEST-EAP-SNAPSHOT"
+    version = "2020.3"
     setPlugins("git4idea")
 }
 configure<JavaPluginConvention> {
@@ -53,12 +53,19 @@ detekt {
     }
 }
 tasks {
-    compileKotlin {
-        kotlinOptions.jvmTarget = "1.8"
+    // Set the compatibility versions to 1.8
+    withType<JavaCompile> {
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
     }
-    compileTestKotlin {
+    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"
     }
+
+    withType<io.gitlab.arturbosch.detekt.Detekt> {
+        jvmTarget = "1.8"
+    }
+
     test {
         useJUnitPlatform {
             includeEngines("junit-jupiter")
@@ -81,7 +88,7 @@ tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml
     changeNotes(
         changeNotesFromChangeLog()
     )
-    sinceBuild("201.6668.121")
+    sinceBuild("203")
     untilBuild(null)
 }
 

LICENSE

@@ -1 +1,5 @@
+#
+# Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+#
+
 kotlin.code.style=official

build.gradle.kts

@@ -1,5 +1,9 @@
+#
+# Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists