aboutsummaryrefslogtreecommitdiff
path: root/.idea
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-11-05 17:35:01 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-11-05 17:35:01 +0100
commit7097a8079ec95dc97fc1d0d5936533b982b458cd (patch)
treedf1340f5cd2f7fc0549c447175d1df738e1d5e15 /.idea
parent979dbca7bedeffc9bd91159fcf6a9a06b1cf1564 (diff)
downloaddokka-7097a8079ec95dc97fc1d0d5936533b982b458cd.tar.gz
dokka-7097a8079ec95dc97fc1d0d5936533b982b458cd.tar.bz2
dokka-7097a8079ec95dc97fc1d0d5936533b982b458cd.zip
update IDE configuration
Diffstat (limited to '.idea')
-rw-r--r--.idea/compiler.xml1
-rw-r--r--.idea/gradle.xml50
-rw-r--r--.idea/libraries/Gradle__junit_junit_4_12.xml3
-rw-r--r--.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml11
-rw-r--r--.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml11
-rw-r--r--.idea/misc.xml9
6 files changed, 31 insertions, 54 deletions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e22d39e5..c928ac74 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -22,7 +22,6 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
- <module name="dokka-maven-plugin" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index acfc0bba..f80c40fc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,62 +4,24 @@
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/dokka-fatjar" />
- <option name="gradleJvm" value="1.6" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleHome" value="$USER_HOME$/dev/gradle-2.2.1" />
<option name="modules">
<set>
+ <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/dokka-fatjar" />
+ <option value="$PROJECT_DIR$/dokka-gradle-plugin" />
</set>
</option>
<option name="useAutoImport" value="true" />
<option name="myModules">
<set>
+ <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/dokka-fatjar" />
+ <option value="$PROJECT_DIR$/dokka-gradle-plugin" />
</set>
</option>
</GradleProjectSettings>
- <GradleProjectSettings>
- <option name="distributionType" value="DEFAULT_WRAPPED" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/gradle-plugin" />
- <option name="modules">
- <set>
- <option value="$PROJECT_DIR$/gradle-plugin" />
- </set>
- </option>
- <option name="useAutoImport" value="true" />
- <option name="myModules">
- <set>
- <option value="$PROJECT_DIR$/gradle-plugin" />
- </set>
- </option>
- </GradleProjectSettings>
- <GradleProjectSettings>
- <option name="distributionType" value="DEFAULT_WRAPPED" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/javadoc" />
- <option name="gradleJvm" value="1.8" />
- <option name="modules">
- <set>
- <option value="$PROJECT_DIR$/javadoc" />
- </set>
- </option>
- <option name="useAutoImport" value="true" />
- <option name="myModules">
- <set>
- <option value="$PROJECT_DIR$/javadoc" />
- </set>
- </option>
- </GradleProjectSettings>
- <GradleProjectSettings>
- <option name="distributionType" value="DEFAULT_WRAPPED" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/javadoc" />
- <option name="gradleJvm" value="1.8" />
- <option name="modules">
- <set>
- <option value="$PROJECT_DIR$/javadoc" />
- </set>
- </option>
- <option name="useAutoImport" value="true" />
- </GradleProjectSettings>
</option>
</component>
</project> \ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 985f66bc..5871944a 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
<component name="libraryTable">
<library name="Gradle: junit:junit:4.12">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
</SOURCES>
</library>
</component> \ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml
new file mode 100644
index 00000000..c023c035
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/0.1-SNAPSHOT/kotlin-runtime-0.1-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/0.1-SNAPSHOT/kotlin-runtime-0.1-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml
new file mode 100644
index 00000000..1319bd53
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/0.1-SNAPSHOT/kotlin-stdlib-0.1-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/0.1-SNAPSHOT/kotlin-stdlib-0.1-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 543b1856..2a5a8914 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,14 +12,7 @@
<file type="web" url="file://$PROJECT_DIR$/gradle-plugin" />
<file type="web" url="file://$PROJECT_DIR$/javadoc" />
</component>
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/maven-plugin/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project> \ No newline at end of file