Browse Source

Merge pull request #20 from csmith/master

Update IDEA config for new parser modules.
pull/21/head
Greg Holmes 9 years ago
parent
commit
b84dfbbecb
8 changed files with 58 additions and 13 deletions
  1. 1
    1
      .idea/client.iml
  2. 24
    0
      .idea/common.iml
  3. 2
    0
      .idea/gradle.xml
  4. 1
    2
      .idea/identd.iml
  5. 25
    0
      .idea/irc.iml
  6. 2
    0
      .idea/modules.xml
  7. 2
    9
      .idea/parser.iml
  8. 1
    1
      .idea/parser_irc.iml

+ 1
- 1
.idea/client.iml View File

25
     <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:5.0.1" level="project" />
25
     <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:5.0.1" level="project" />
26
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
26
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
27
     <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
27
     <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
28
-    <orderEntry type="library" exported="" name="Gradle: com.dmdirc.parser:common:0.8-38-gbfc363c-SNAPSHOT" level="project" />
29
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
28
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
30
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
29
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
31
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
30
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
37
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
36
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
38
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
37
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
39
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
38
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
39
+    <orderEntry type="module" module-name="common" exported="" />
40
   </component>
40
   </component>
41
 </module>
41
 </module>
42
 
42
 

+ 24
- 0
.idea/common.iml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module external.linked.project.id=":parser:common" external.linked.project.path="$MODULE_DIR$/parser/common" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc.parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
4
+    <output url="file://$MODULE_DIR$/parser/common/build/classes/main" />
5
+    <output-test url="file://$MODULE_DIR$/parser/common/build/classes/test" />
6
+    <exclude-output />
7
+    <content url="file://$MODULE_DIR$/parser/common">
8
+      <sourceFolder url="file://$MODULE_DIR$/parser/common/src" isTestSource="false" />
9
+      <sourceFolder url="file://$MODULE_DIR$/parser/common/src/main/java" isTestSource="false" />
10
+      <sourceFolder url="file://$MODULE_DIR$/parser/common/src/test/java" isTestSource="true" />
11
+      <sourceFolder url="file://$MODULE_DIR$/parser/common/test" isTestSource="true" />
12
+      <sourceFolder url="file://$MODULE_DIR$/parser/common/src/main/resources" type="java-resource" />
13
+      <sourceFolder url="file://$MODULE_DIR$/parser/common/src/test/resources" type="java-test-resource" />
14
+      <excludeFolder url="file://$MODULE_DIR$/parser/common/.gradle" />
15
+      <excludeFolder url="file://$MODULE_DIR$/parser/common/build" />
16
+    </content>
17
+    <orderEntry type="inheritedJdk" />
18
+    <orderEntry type="sourceFolder" forTests="false" />
19
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
20
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
21
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
22
+  </component>
23
+</module>
24
+

+ 2
- 0
.idea/gradle.xml View File

10
             <option value="$PROJECT_DIR$" />
10
             <option value="$PROJECT_DIR$" />
11
             <option value="$PROJECT_DIR$/client" />
11
             <option value="$PROJECT_DIR$/client" />
12
             <option value="$PROJECT_DIR$/parser" />
12
             <option value="$PROJECT_DIR$/parser" />
13
+            <option value="$PROJECT_DIR$/parser/common" />
14
+            <option value="$PROJECT_DIR$/parser/irc" />
13
             <option value="$PROJECT_DIR$/plugins" />
15
             <option value="$PROJECT_DIR$/plugins" />
14
             <option value="$PROJECT_DIR$/plugins/activewindow" />
16
             <option value="$PROJECT_DIR$/plugins/activewindow" />
15
             <option value="$PROJECT_DIR$/plugins/audio" />
17
             <option value="$PROJECT_DIR$/plugins/audio" />

+ 1
- 2
.idea/identd.iml View File

21
     <orderEntry type="module" module-name="client" exported="" />
21
     <orderEntry type="module" module-name="client" exported="" />
22
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
22
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
23
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
23
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
24
-    <orderEntry type="library" exported="" name="Gradle: com.dmdirc.parser:irc:0.8-39-g830e54a-SNAPSHOT" level="project" />
25
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
24
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
26
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
25
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
27
-    <orderEntry type="library" exported="" name="Gradle: com.dmdirc.parser:common:0.8-38-gbfc363c-SNAPSHOT" level="project" />
28
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
26
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
29
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
27
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
30
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
28
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
31
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
29
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
32
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
30
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
31
+    <orderEntry type="module" module-name="irc" exported="" />
33
   </component>
32
   </component>
34
 </module>
33
 </module>
35
 
34
 

+ 25
- 0
.idea/irc.iml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module external.linked.project.id=":parser:irc" external.linked.project.path="$MODULE_DIR$/parser/irc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc.parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
4
+    <output url="file://$MODULE_DIR$/parser/irc/build/classes/main" />
5
+    <output-test url="file://$MODULE_DIR$/parser/irc/build/classes/test" />
6
+    <exclude-output />
7
+    <content url="file://$MODULE_DIR$/parser/irc">
8
+      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src" isTestSource="false" />
9
+      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src/main/java" isTestSource="false" />
10
+      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src/test/java" isTestSource="true" />
11
+      <sourceFolder url="file://$MODULE_DIR$/parser/irc/test" isTestSource="true" />
12
+      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src/main/resources" type="java-resource" />
13
+      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src/test/resources" type="java-test-resource" />
14
+      <excludeFolder url="file://$MODULE_DIR$/parser/irc/.gradle" />
15
+      <excludeFolder url="file://$MODULE_DIR$/parser/irc/build" />
16
+    </content>
17
+    <orderEntry type="inheritedJdk" />
18
+    <orderEntry type="sourceFolder" forTests="false" />
19
+    <orderEntry type="module" module-name="common" exported="" />
20
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
21
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
22
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
23
+  </component>
24
+</module>
25
+

+ 2
- 0
.idea/modules.xml View File

6
       <module fileurl="file://$PROJECT_DIR$/.idea/audio.iml" filepath="$PROJECT_DIR$/.idea/audio.iml" />
6
       <module fileurl="file://$PROJECT_DIR$/.idea/audio.iml" filepath="$PROJECT_DIR$/.idea/audio.iml" />
7
       <module fileurl="file://$PROJECT_DIR$/.idea/calc.iml" filepath="$PROJECT_DIR$/.idea/calc.iml" />
7
       <module fileurl="file://$PROJECT_DIR$/.idea/calc.iml" filepath="$PROJECT_DIR$/.idea/calc.iml" />
8
       <module fileurl="file://$PROJECT_DIR$/.idea/client.iml" filepath="$PROJECT_DIR$/.idea/client.iml" />
8
       <module fileurl="file://$PROJECT_DIR$/.idea/client.iml" filepath="$PROJECT_DIR$/.idea/client.iml" />
9
+      <module fileurl="file://$PROJECT_DIR$/.idea/common.iml" filepath="$PROJECT_DIR$/.idea/common.iml" />
9
       <module fileurl="file://$PROJECT_DIR$/.idea/conditional_execute.iml" filepath="$PROJECT_DIR$/.idea/conditional_execute.iml" />
10
       <module fileurl="file://$PROJECT_DIR$/.idea/conditional_execute.iml" filepath="$PROJECT_DIR$/.idea/conditional_execute.iml" />
10
       <module fileurl="file://$PROJECT_DIR$/.idea/contactlist.iml" filepath="$PROJECT_DIR$/.idea/contactlist.iml" />
11
       <module fileurl="file://$PROJECT_DIR$/.idea/contactlist.iml" filepath="$PROJECT_DIR$/.idea/contactlist.iml" />
11
       <module fileurl="file://$PROJECT_DIR$/.idea/dcc.iml" filepath="$PROJECT_DIR$/.idea/dcc.iml" />
12
       <module fileurl="file://$PROJECT_DIR$/.idea/dcc.iml" filepath="$PROJECT_DIR$/.idea/dcc.iml" />
16
       <module fileurl="file://$PROJECT_DIR$/.idea/exec.iml" filepath="$PROJECT_DIR$/.idea/exec.iml" />
17
       <module fileurl="file://$PROJECT_DIR$/.idea/exec.iml" filepath="$PROJECT_DIR$/.idea/exec.iml" />
17
       <module fileurl="file://$PROJECT_DIR$/.idea/freedesktop_notifications.iml" filepath="$PROJECT_DIR$/.idea/freedesktop_notifications.iml" />
18
       <module fileurl="file://$PROJECT_DIR$/.idea/freedesktop_notifications.iml" filepath="$PROJECT_DIR$/.idea/freedesktop_notifications.iml" />
18
       <module fileurl="file://$PROJECT_DIR$/.idea/identd.iml" filepath="$PROJECT_DIR$/.idea/identd.iml" />
19
       <module fileurl="file://$PROJECT_DIR$/.idea/identd.iml" filepath="$PROJECT_DIR$/.idea/identd.iml" />
20
+      <module fileurl="file://$PROJECT_DIR$/.idea/irc.iml" filepath="$PROJECT_DIR$/.idea/irc.iml" />
19
       <module fileurl="file://$PROJECT_DIR$/.idea/lagdisplay.iml" filepath="$PROJECT_DIR$/.idea/lagdisplay.iml" />
21
       <module fileurl="file://$PROJECT_DIR$/.idea/lagdisplay.iml" filepath="$PROJECT_DIR$/.idea/lagdisplay.iml" />
20
       <module fileurl="file://$PROJECT_DIR$/.idea/logging.iml" filepath="$PROJECT_DIR$/.idea/logging.iml" />
22
       <module fileurl="file://$PROJECT_DIR$/.idea/logging.iml" filepath="$PROJECT_DIR$/.idea/logging.iml" />
21
       <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_dbus.iml" filepath="$PROJECT_DIR$/.idea/mediasource_dbus.iml" />
23
       <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_dbus.iml" filepath="$PROJECT_DIR$/.idea/mediasource_dbus.iml" />

+ 2
- 9
.idea/parser.iml View File

1
 <?xml version="1.0" encoding="UTF-8"?>
1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<module external.linked.project.id=":parser" external.linked.project.path="$MODULE_DIR$/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
2
+<module external.linked.project.id=":parser" external.linked.project.path="$MODULE_DIR$/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
     <output url="file://$MODULE_DIR$/parser/build/classes/main" />
4
     <output url="file://$MODULE_DIR$/parser/build/classes/main" />
5
     <output-test url="file://$MODULE_DIR$/parser/build/classes/test" />
5
     <output-test url="file://$MODULE_DIR$/parser/build/classes/test" />
6
     <exclude-output />
6
     <exclude-output />
7
     <content url="file://$MODULE_DIR$/parser">
7
     <content url="file://$MODULE_DIR$/parser">
8
-      <sourceFolder url="file://$MODULE_DIR$/parser/src" isTestSource="false" />
9
-      <sourceFolder url="file://$MODULE_DIR$/parser/src/main/java" isTestSource="false" />
10
-      <sourceFolder url="file://$MODULE_DIR$/parser/src/test/java" isTestSource="true" />
11
-      <sourceFolder url="file://$MODULE_DIR$/parser/test" isTestSource="true" />
12
-      <sourceFolder url="file://$MODULE_DIR$/parser/src/main/resources" type="java-resource" />
13
-      <sourceFolder url="file://$MODULE_DIR$/parser/src/test/resources" type="java-test-resource" />
14
-      <sourceFolder url="file://$MODULE_DIR$/parser/test-res" type="java-test-resource" />
15
       <excludeFolder url="file://$MODULE_DIR$/parser/.gradle" />
8
       <excludeFolder url="file://$MODULE_DIR$/parser/.gradle" />
16
       <excludeFolder url="file://$MODULE_DIR$/parser/build" />
9
       <excludeFolder url="file://$MODULE_DIR$/parser/build" />
17
     </content>
10
     </content>

+ 1
- 1
.idea/parser_irc.iml View File

19
     <orderEntry type="inheritedJdk" />
19
     <orderEntry type="inheritedJdk" />
20
     <orderEntry type="sourceFolder" forTests="false" />
20
     <orderEntry type="sourceFolder" forTests="false" />
21
     <orderEntry type="module" module-name="client" exported="" />
21
     <orderEntry type="module" module-name="client" exported="" />
22
-    <orderEntry type="library" exported="" name="Gradle: com.dmdirc.parser:irc:0.8-39-g830e54a-SNAPSHOT" level="project" />
23
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
22
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
24
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
23
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
25
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
24
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
29
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
28
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
30
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
29
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
31
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
30
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
31
+    <orderEntry type="module" module-name="irc" exported="" />
32
   </component>
32
   </component>
33
 </module>
33
 </module>
34
 
34
 

Loading…
Cancel
Save