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

WIP code #1

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
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
11 changes: 4 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
**/.DS_Store
.idea/workspace.xml
.idea/modules.xml
.idea/misc.xml
.idea/gradle.xml
.idea/libraries/
.idea/kotlinc.xml
.idea/shelf/
.idea/*
!.idea/codeStyles/
!.idea/copyright/
!.idea/checkstyle-idea.xml
**/*.iml
.gradle/
**/build/
Expand Down
13 changes: 0 additions & 13 deletions .idea/compiler.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/dictionaries/leinardi.xml

This file was deleted.

5 changes: 5 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/vcs.xml

This file was deleted.

26 changes: 13 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ buildscript {

plugins {
id 'org.jetbrains.intellij' version '0.4.17'
id 'net.ltgt.errorprone' version '0.0.16'
id 'net.ltgt.errorprone' version '2.0.2'
id 'idea'
id 'java'
id 'checkstyle'
Expand All @@ -45,11 +45,10 @@ checkstyle {
ignoreFailures = false // Whether this task will ignore failures and continue running the build.
configFile rootProject.file('config/checkstyle/checkstyle.xml')
// The Checkstyle configuration file to use.
toolVersion = '8.29' // The version of Checkstyle you want to be used
toolVersion = '9.1' // The version of Checkstyle you want to be used
}

def hasPyCharm = project.hasProperty('pycharmPath')
def hasPythonPlugin = project.hasProperty('pythonPlugin')
def hasPycharmPath = project.hasProperty('pycharmPath')
def props = new Properties()
rootProject.file('src/main/resources/com/leinardi/pycharm/mypy/MypyBundle.properties')
.withInputStream {
Expand All @@ -69,24 +68,25 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

intellij {
version ideaVersion
version ideVersion
pluginName props.getProperty('plugin.name').toLowerCase().replace(' ', '-')
downloadSources Boolean.valueOf(downloadIdeaSources)
updateSinceUntilBuild = true
if (hasPyCharm) {
if (hasPycharmPath) {
alternativeIdePath pycharmPath
}
if (hasPythonPlugin) {
plugins += [pythonPlugin]
}
plugins += [pythonPlugin]
}

runIde {
systemProperties.put("idea.log.debug.categories", "#com.leinardi.pycharm.mypy")
}

patchPluginXml {
version project.property('version')
sinceBuild project.property('sinceBuild')
untilBuild project.property('untilBuild')
pluginDescription props.getProperty('plugin.Mypy-PyCharm.description')
changeNotes getChangelogHtml()
}

publishPlugin {
Expand All @@ -99,18 +99,18 @@ repositories {
jcenter()
maven { url "https://plugins.gradle.org/m2/" }
maven { url 'https://dl.bintray.com/jetbrains/intellij-plugin-service' }
if (hasPyCharm) {
if (hasPycharmPath) {
flatDir {
dirs "$pycharmPath/lib"
}
}
}

dependencies {
if (hasPyCharm) {
if (hasPycharmPath) {
compileOnly name: 'pycharm'
}
errorprone 'com.google.errorprone:error_prone_core:2.3.1'
errorprone 'com.google.errorprone:error_prone_core:2.10.0'
}

def getChangelogHtml() {
Expand Down
6 changes: 3 additions & 3 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
-->

<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">

<module name="SuppressionFilter">
<property name="file" value="config/checkstyle/checkstyle-suppressions.xml"/>
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
</module>

<!-- Checks that a package-info.java file exists for each package. -->
Expand Down
15 changes: 6 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
version=0.11.2
ideaVersion=2018.1.8
sinceBuild=181.5684
version=0.12.0-alpha2
ideVersion=PC-2021.2.3
pythonPlugin=PythonCore:212.5457.59
sinceBuild=192.7142.36
untilBuild=
downloadIdeaSources=true
publishUsername=leinardi
publishChannels=Stable
#######################################################################################################################
# Uncomment one of the following settings: either pycharmPath or pythonPlugin
#######################################################################################################################
# Run Mypy plugin inside PyCharm installed into the following path
pycharmPath=/home/leinardi/pycharm-community
# Run Mypy plugin inside IntelliJ IDEA with the Python plugin. The IDE and the plugin will be downloaded automatically
pythonPlugin=PythonCore:2018.1.181.5087.50
# To run PyCharm from a custom path, uncomment and change the following line
# pycharmPath=/home/leinardi/pycharm-community
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading