Merge pull request #273 from koxudaxi/support_pycharm_2021.1

Support PyCharm 2021.1
koxudaxi · Apr 16, 2021 · 9696013 · 9696013
2 parents 77ac9e1 + 00b58b8
commit 9696013
Show file tree

Hide file tree

Showing 24 changed files with 574 additions and 233 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -32,7 +32,7 @@ jobs:
       uses: ChrisCarini/intellij-platform-plugin-verifier-action@v0.0.2
       with: 
         ide-versions: |
-            pycharmPC:2020.2
+            pycharmPC:2021.1
             pycharmPC:LATEST-EAP-SNAPSHOT
     - name: setup python
       uses: actions/setup-python@v1

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.3.70"
+    ext.kotlin_version = "1.4.32"
     repositories {
         mavenCentral()
     }
@@ -10,18 +10,25 @@ buildscript {
 
 
 plugins {
-    id "org.jetbrains.intellij" version "0.6.5"
+    id "org.jetbrains.intellij" version "0.7.2"
 }
 
 intellij {
     pluginName project.name
-    version "2020.2"
+    version "2021.1"
     type "PC"
     updateSinceUntilBuild false
     downloadSources true
     plugins "python-ce"
 }
 
+
+patchPluginXml {
+    sinceBuild "211.6693.111"
+//    untilBuild "211.*"
+}
+
+
 allprojects {
     apply plugin: "org.jetbrains.intellij"
     apply plugin: "kotlin"
@@ -33,24 +40,25 @@ allprojects {
     compileKotlin {
         kotlinOptions {
             jvmTarget = "11"
-            languageVersion = "1.3"
-            apiVersion = "1.3"
+            languageVersion = "1.4"
+            apiVersion = "1.4"
         }
     }
 
     compileTestKotlin {
         kotlinOptions {
             jvmTarget = "11"
-            languageVersion = "1.3"
-            apiVersion = "1.3"
+            languageVersion = "1.4"
+            apiVersion = "1.4"
         }
     }
 
     dependencies {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
         compile "org.apache.tuweni:tuweni-toml:1.1.0"
         compile group: 'org.ini4j', name: 'ini4j', version: '0.5.4'
-        testCompile group: 'junit', name: 'junit', version: '4.13.2'
-        compile group: 'org.jetbrains', name: 'annotations', version: '20.0.0'
+        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
+        compile group: 'org.jetbrains', name: 'annotations', version: '20.1.0'
     }
 
     jacocoTestReport {

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,9 +1,14 @@
 <idea-plugin url="https://github.com/koxudaxi/pydantic-pycharm-plugin" require-restart="true">
     <id>com.koxudaxi.pydantic</id>
     <name>Pydantic</name>
-    <version>0.2.1</version>
+    <version>0.3.0</version>
     <vendor email="koaxudai@gmail.com">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.3.0</h2>
+    <p>Features</p>
+    <ul>
+        <li>Support PyCharm 2021.1 [#]</li>
+    </ul>
     <h2>version 0.2.1</h2>
     <p>Features</p>
     <ul>
@@ -299,8 +304,6 @@
     </ul>
     ]]></description>
 
-    <idea-version since-build="202.6397.20"/>
-
     <depends>com.intellij.modules.lang</depends>
     <depends>com.intellij.modules.python</depends>
 
@@ -329,6 +332,7 @@
     </projectListeners>
     <extensions defaultExtensionNs="Pythonid">
         <typeProvider implementation="com.koxudaxi.pydantic.PydanticTypeProvider"/>
+        <typeProvider implementation="com.koxudaxi.pydantic.PydanticDataclassTypeProvider"/>
         <inspectionExtension implementation="com.koxudaxi.pydantic.PydanticIgnoreInspection"/>
         <pyDataclassParametersProvider implementation="com.koxudaxi.pydantic.PydanticParametersProvider"/>
         <pyAnnotator implementation="com.koxudaxi.pydantic.PydanticAnnotator"/>