aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-12-03 17:08:06 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-12-03 17:08:06 +0100
commit334f25c392aa72ee76e4c4aaf0676b7f57c4a20c (patch)
treeca01d8ac76b60858cf69140ac1a49cd2fba9b251
parentdd762a167d1652feb66000d72eee28f056a54985 (diff)
downloaddokka-334f25c392aa72ee76e4c4aaf0676b7f57c4a20c.tar.gz
dokka-334f25c392aa72ee76e4c4aaf0676b7f57c4a20c.tar.bz2
dokka-334f25c392aa72ee76e4c4aaf0676b7f57c4a20c.zip
configure Ant dependency so that it's visible in IntelliJ
-rw-r--r--.idea/libraries/Gradle__org_apache_ant_ant_1_9_6.xml11
-rw-r--r--.idea/libraries/Gradle__org_apache_ant_ant_launcher_1_9_6.xml11
-rw-r--r--.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml12
-rw-r--r--.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml6
-rw-r--r--core/build.gradle6
-rw-r--r--dokka-gradle-plugin/dokka-gradle-plugin.iml12
6 files changed, 53 insertions, 5 deletions
diff --git a/.idea/libraries/Gradle__org_apache_ant_ant_1_9_6.xml b/.idea/libraries/Gradle__org_apache_ant_ant_1_9_6.xml
new file mode 100644
index 00000000..7e352486
--- /dev/null
+++ b/.idea/libraries/Gradle__org_apache_ant_ant_1_9_6.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.apache.ant:ant:1.9.6">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.9.6/80e2063b01bab3c79c2d84e4ed5e73868394c85a/ant-1.9.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.9.6/a09556e6512056c6741b6ffbf4de7a52282fd4ff/ant-1.9.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_apache_ant_ant_launcher_1_9_6.xml b/.idea/libraries/Gradle__org_apache_ant_ant_launcher_1_9_6.xml
new file mode 100644
index 00000000..aa889a6a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_apache_ant_ant_launcher_1_9_6.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.apache.ant:ant-launcher:1.9.6">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.9.6/d75dd4c39ba06401f20e7afffb861d268baec6bc/ant-launcher-1.9.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.9.6/717ab721434006f709330a1d4342e844120847af/ant-launcher-1.9.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml
new file mode 100644
index 00000000..de07faa2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="Gradle: org.fusesource.jansi:jansi:1.11">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/655c643309c2f45a56a747fda70e3fadf57e9f11/jansi-1.11.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/fusesource/jansi/jansi/1.11/jansi-1.11.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/2f0e4b53b6b0eec426dad7118bf54b3deb58000b/jansi-1.11-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
index 8262f729..b9f5b319 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
@@ -1,11 +1,9 @@
<component name="libraryTable">
<library name="Gradle: org.hamcrest:hamcrest-core:1.3">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</component> \ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
index 49d6d4d6..c7313278 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -33,6 +33,7 @@ dependencies {
compile "com.google.inject:guice:4.0"
compile "com.github.spullara.cli-parser:cli-parser:1.1.1"
compile "org.jsoup:jsoup:1.8.3"
+ compile "org.apache.ant:ant:1.9.6"
compile files("../lib/intellij-core-analysis.jar")
compile files("../lib/kotlin-for-upsource.jar")
@@ -40,7 +41,6 @@ dependencies {
compile files("../lib/picocontainer.jar")
provided files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs().findAll { it.path.endsWith("jar") })
- provided "org.apache.ant:ant:1.9.6"
runtime "org.fusesource.jansi:jansi:1.11"
@@ -72,6 +72,10 @@ jar {
shadowJar {
baseName = 'dokka-fatjar'
classifier = ''
+
+ dependencies {
+ exclude(dependency('org.apache.ant:ant:1.9.6'))
+ }
}
publishing {
diff --git a/dokka-gradle-plugin/dokka-gradle-plugin.iml b/dokka-gradle-plugin/dokka-gradle-plugin.iml
index 90500970..ec733ee0 100644
--- a/dokka-gradle-plugin/dokka-gradle-plugin.iml
+++ b/dokka-gradle-plugin/dokka-gradle-plugin.iml
@@ -1447,5 +1447,17 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.9.6" level="project" />
+ <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.ant:ant-launcher:1.9.6" level="project" />
+ <orderEntry type="module-library">
+ <library name="Gradle: jps-model">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../lib/jps-model.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module> \ No newline at end of file