Skip to content

Commit

Permalink
Sort out gradle build
Browse files Browse the repository at this point in the history
  • Loading branch information
Liam Falconer committed Jun 23, 2017
1 parent e9c3da8 commit 8a59b82
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build/
out/
.DS_Store
/intellijLint.jar
src/main/resources
18 changes: 13 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,26 @@ buildscript {
}

plugins {
id "org.jetbrains.intellij" version "0.1.10"
id "org.jetbrains.intellij" version "0.2.13"
}

task symlinkPluginXml(type:Exec) {
commandLine './symlink-resources-for-gradle.sh'
}

patchPluginXml.dependsOn(symlinkPluginXml)

apply plugin: 'idea'
apply plugin: 'org.jetbrains.intellij'
apply plugin: 'java'

intellij {
version 'IC-2016.3' //IntelliJ IDEA 2016.3 dependency; for a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
plugins 'coverage' //Bundled plugin dependencies
pluginName 'intellij-inspections'
}

patchPluginXml {
sinceBuild '145.*'
untilBuild null
}

group 'com.lmax'
version '1.0-SNAPSHOT'
version '0.1'
1 change: 1 addition & 0 deletions intellijLint.iml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
Expand Down
14 changes: 2 additions & 12 deletions resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<idea-plugin version="2">
<id>com.lmax.intellijLint</id>
<name>intellijLint</name>
<version>1.0</version>
<vendor email="intellij@lmax.com" url="https://github.com/lmax/intellijLint">YourCompany</vendor>
<version>0.1</version>
<vendor email="opensource@lmax.com" url="https://github.com/lmax/intellijLint">LMAX</vendor>

<description><![CDATA[
Some additional inspections, including a type checker for annotated primitives.
Expand All @@ -14,14 +14,9 @@
]]>
</change-notes>

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
<idea-version since-build="145.0"/>

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
on how to target different products -->
<!-- uncomment to enable plugin in all products
<depends>com.intellij.modules.lang</depends>
-->

<extensions defaultExtensionNs="com.intellij">
<inspectionToolProvider implementation="com.lmax.intellijLint.OptionalNullProvider"/>
Expand All @@ -33,9 +28,4 @@
<implementation-class>com.lmax.intellijLint.Units.UnitsInspection</implementation-class>
</component>
</project-components>

<actions>
<!-- Add your actions here -->
</actions>

</idea-plugin>
2 changes: 2 additions & 0 deletions symlink-resources-for-gradle.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rm src/main/resources
ln -s ../../resources/ src/main/resources

0 comments on commit 8a59b82

Please sign in to comment.