Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support PyCharm 2021.1 #273

Merged
merged 5 commits into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 17 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = "1.3.70"
ext.kotlin_version = "1.4.32"
repositories {
mavenCentral()
}
Expand All @@ -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"
Expand All @@ -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 {
Expand Down
10 changes: 7 additions & 3 deletions resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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"/>
Expand Down
Loading