Quellcode durchsuchen

Merge pull request #7 from csmith/master

Remove submodules.
pull/8/head
Greg Holmes vor 9 Jahren
Ursprung
Commit
0852af6e29
8 geänderte Dateien mit 50 neuen und 103 gelöschten Zeilen
  1. 0
    20
      .gitmodules
  2. 50
    50
      build.gradle
  3. 0
    1
      modules/defaults
  4. 0
    1
      modules/installer
  5. 0
    28
      modules/modules.iml
  6. 0
    1
      modules/parser
  7. 0
    1
      modules/plugins
  8. 0
    1
      modules/util

+ 0
- 20
.gitmodules Datei anzeigen

@@ -1,20 +0,0 @@
1
-[submodule "modules/parser"]
2
-	path = modules/parser
3
-	url = git://dmdirc.com/parser
4
-	branch = master
5
-[submodule "modules/plugins"]
6
-	path = modules/plugins
7
-	url = git://dmdirc.com/plugins
8
-	branch = master
9
-[submodule "modules/defaults"]
10
-	path = modules/defaults
11
-	url = git://dmdirc.com/defaults
12
-	branch = master
13
-[submodule "modules/util"]
14
-	path = modules/util
15
-	url = git://dmdirc.com/util
16
-	branch = master
17
-[submodule "modules/installer"]
18
-	path = modules/installer
19
-	url = git://dmdirc.com/installer
20
-	branch = master

+ 50
- 50
build.gradle Datei anzeigen

@@ -2,10 +2,13 @@ def jgit = new org.mdonoughe.JGitDescribeTask()
2 2
 jgit.dir = new File(projectDir, '.git')
3 3
 project.version = jgit.getDescription() + '-SNAPSHOT'
4 4
 
5
-apply plugin: 'maven-publish'
6
-
7 5
 group = 'com.dmdirc'
8 6
 
7
+apply plugin: 'maven-publish'
8
+apply plugin: 'java'
9
+apply plugin: 'findbugs'
10
+apply plugin: 'pmd'
11
+
9 12
 configurations {
10 13
     bundle
11 14
     plugin
@@ -14,6 +17,11 @@ configurations {
14 17
     }
15 18
 }
16 19
 
20
+configurations.all {
21
+    resolutionStrategy.cacheDynamicVersionsFor 2, 'minutes'
22
+    resolutionStrategy.cacheChangingModulesFor 2, 'minutes'
23
+}
24
+
17 25
 dependencies {
18 26
     compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'
19 27
     compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
@@ -31,6 +39,10 @@ dependencies {
31 39
     plugin group: 'com.dmdirc', name: 'parser_irc', version: '+', changing: true
32 40
     plugin group: 'com.dmdirc', name: 'tabcompleter_bash', version: '+', changing: true
33 41
     plugin group: 'com.dmdirc', name: 'tabcompleter_mirc', version: '+', changing: true
42
+
43
+    testCompile group: 'junit', name: 'junit', version: '4.11'
44
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
45
+    testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
34 46
 }
35 47
 
36 48
 publishing {
@@ -50,68 +62,56 @@ publishing {
50 62
     }
51 63
 }
52 64
 
53
-allprojects {
54
-    apply plugin: 'java'
55
-    apply plugin: 'findbugs'
56
-    apply plugin: 'pmd'
57
-
58
-    sourceSets {
59
-        main {
60
-            java {
61
-                srcDir 'src'
62
-            }
63
-            resources {
64
-                srcDir 'res'
65
-            }
65
+sourceSets {
66
+    main {
67
+        java {
68
+            srcDir 'src'
66 69
         }
67
-        test {
68
-            java {
69
-                 srcDir 'test'
70
-            }
71
-            resources {
72
-                srcDir 'test-res'
73
-            }
70
+        resources {
71
+            srcDir 'res'
74 72
         }
75 73
     }
76
-
77
-    sourceCompatibility = 1.7
78
-    targetCompatibility = 1.7
79
-
80
-    repositories {
81
-        mavenCentral()
82
-        maven {
83
-            url 'http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/'
74
+    test {
75
+        java {
76
+             srcDir 'test'
84 77
         }
85
-        maven {
86
-            url 'http://nexus.dmdirc.com/nexus/content/repositories/snapshots/'
78
+        resources {
79
+            srcDir 'test-res'
87 80
         }
88 81
     }
82
+}
89 83
 
90
-    dependencies {
91
-        testCompile group: 'junit', name: 'junit', version: '4.11'
92
-        testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
93
-        testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
94
-    }
84
+sourceCompatibility = 1.7
85
+targetCompatibility = 1.7
95 86
 
96
-    pmd {
97
-        ruleSets = []
98
-        ruleSetFiles = files("$rootDir/etc/pmd/full.xml")
87
+repositories {
88
+    mavenCentral()
89
+    maven {
90
+        url 'http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/'
99 91
     }
100
-
101
-    tasks.withType(FindBugs) {
102
-        reports {
103
-            html.enabled = true
104
-            xml.enabled = false
105
-        }
92
+    maven {
93
+        url 'http://nexus.dmdirc.com/nexus/content/repositories/snapshots/'
106 94
     }
95
+}
96
+
97
+pmd {
98
+    ruleSets = []
99
+    ruleSetFiles = files("$rootDir/etc/pmd/full.xml")
100
+}
107 101
 
108
-    findbugs {
109
-        reportLevel = 'low'
110
-        effort = 'max'
111
-        ignoreFailures = true
102
+tasks.withType(FindBugs) {
103
+    reports {
104
+        html.enabled = true
105
+        xml.enabled = false
112 106
     }
113 107
 }
114 108
 
109
+findbugs {
110
+    reportLevel = 'low'
111
+    effort = 'max'
112
+    ignoreFailures = true
113
+}
114
+
115 115
 task getCredentials << {
116 116
     def target = file('nexus-teamcity.gradle')
117 117
     if (!target.exists()) {

+ 0
- 1
modules/defaults

@@ -1 +0,0 @@
1
-Subproject commit b5082104b5d611dd44d48e5d51b6d9db32d3c764

+ 0
- 1
modules/installer

@@ -1 +0,0 @@
1
-Subproject commit 9e047f993bc80f63acc6b50d8d2ff116d43ab154

+ 0
- 28
modules/modules.iml Datei anzeigen

@@ -1,28 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<module external.linked.project.id=":modules" external.linked.project.path="$MODULE_DIR$" 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="false">
4
-    <output url="file://$MODULE_DIR$/build/classes/main" />
5
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
6
-    <exclude-output />
7
-    <content url="file://$MODULE_DIR$">
8
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
9
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
11
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
12
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
13
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
14
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
15
-      <sourceFolder url="file://$MODULE_DIR$/test-res" type="java-test-resource" />
16
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
17
-      <excludeFolder url="file://$MODULE_DIR$/build" />
18
-    </content>
19
-    <orderEntry type="inheritedJdk" />
20
-    <orderEntry type="sourceFolder" forTests="false" />
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
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
24
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:16.0.1" level="project" />
25
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
26
-  </component>
27
-</module>
28
-

+ 0
- 1
modules/parser

@@ -1 +0,0 @@
1
-Subproject commit c7a9683e05f7ae1e629342bd34e974f31ac2280d

+ 0
- 1
modules/plugins

@@ -1 +0,0 @@
1
-Subproject commit fe5c818b7d5a7dc9475ace7112e2ad2c756a2f34

+ 0
- 1
modules/util

@@ -1 +0,0 @@
1
-Subproject commit 0e02c175f6faa47d4af0dadecfa39351f53a9ece

Laden…
Abbrechen
Speichern