Bladeren bron

Split into two proper projects.

Change-Id: I217f432e0a3f86b8b774994531341fc9f29404f3
Reviewed-on: http://gerrit.dmdirc.com/4057
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
changes/57/4057/4
Chris Smith 9 jaren geleden
bovenliggende
commit
c64998498c
3 gewijzigde bestanden met toevoegingen van 71 en 38 verwijderingen
  1. 3
    0
      .gitignore
  2. 66
    38
      build.gradle
  3. 2
    0
      settings.gradle

+ 3
- 0
.gitignore Bestand weergeven

@@ -9,3 +9,6 @@ build-before-profiler.xml
9 9
 /nbproject/genfiles.properties
10 10
 /nbproject/private
11 11
 /etc/nexus-teamcity.properties
12
+/.gradle
13
+/irc
14
+/common

+ 66
- 38
build.gradle Bestand weergeven

@@ -1,54 +1,82 @@
1
-apply plugin: 'java'
1
+subprojects {
2
+    apply plugin: 'java'
2 3
 
3
-group = 'com.dmdirc'
4
+    group = 'com.dmdirc.parser'
4 5
 
5
-libsDirName = '../dist'
6
-
7
-sourceSets {
8
-    main {
9
-        java {
10
-            srcDir 'src'
11
-        }
12
-    }
13
-    test {
14
-        java {
15
-            srcDir 'test'
6
+    sourceSets {
7
+        main {
8
+            java {
9
+                srcDir '../src'
10
+            }
16 11
         }
17
-        resources {
18
-            srcDir 'test-res'
12
+        test {
13
+            java {
14
+                srcDir '../test'
15
+            }
19 16
         }
20 17
     }
21
-}
22 18
 
23
-task commonJar(type: Jar) {
24
-    archiveName = "parser.common.jar"
25
-    from(sourceSets.main.output) {
26
-        exclude "com/dmdirc/parser/irc"
27
-    }
28
-}
19
+    sourceCompatibility = 1.7
20
+    targetCompatibility = 1.7
29 21
 
30
-task ircJar(type: Jar) {
31
-    archiveName = "parser.irc.jar"
32
-    from(sourceSets.main.output) {
33
-        exclude "com/dmdirc/parser/common"
34
-        exclude "com/dmdirc/parser/interfaces"
22
+    repositories.mavenCentral()
23
+
24
+    dependencies {
25
+        testCompile group: 'junit', name: 'junit', version: '4.+'
26
+        testCompile group: 'org.mockito', name: 'mockito-all', version: '1.+'
35 27
     }
36
-}
37 28
 
38
-jar.enabled = false
39
-jar.dependsOn commonJar
40
-jar.dependsOn ircJar
29
+}
41 30
 
42
-sourceCompatibility = 1.7
43
-targetCompatibility = 1.7
31
+project("irc") {
32
+    sourceSets {
33
+        main {
34
+            java {
35
+                exclude 'com/dmdirc/parser/common/**'
36
+                exclude 'com/dmdirc/parser/interfaces/**'
37
+            }
38
+        }
39
+        test {
40
+            java {
41
+                exclude 'com/dmdirc/parser/common/**'
42
+                exclude 'com/dmdirc/parser/interfaces/**'
43
+            }
44
+        }
45
+    }
44 46
 
45
-repositories.mavenCentral()
47
+    dependencies {
48
+        compile find("common")
49
+    }
50
+}
46 51
 
47
-dependencies {
48
-    testCompile group: 'junit', name: 'junit', version: '4.+'
49
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.+'
52
+project("common") {
53
+    sourceSets {
54
+        main {
55
+            java {
56
+                exclude 'com/dmdirc/parser/irc/**'
57
+            }
58
+        }
59
+        test {
60
+            java {
61
+                exclude 'com/dmdirc/harness/**'
62
+                exclude 'com/dmdirc/parser/irc/**'
63
+            }
64
+        }
65
+    }
50 66
 }
51 67
 
52 68
 task wrapper(type: Wrapper) {
53 69
     gradleVersion = '2.1'
54
-}
70
+}
71
+
72
+def find(name) {
73
+    if (allprojects.find { it.name == name }) {
74
+        project(name)
75
+    } else if (allprojects.find { it.name == 'plugins:' + name }) {
76
+        project('parser:' + name)
77
+    } else if (allprojects.find { it.name == 'modules:plugins:' + name }) {
78
+        project('modules:parser:' + name)
79
+    } else {
80
+        println "Couldn't find project $name"
81
+    }
82
+}

+ 2
- 0
settings.gradle Bestand weergeven

@@ -0,0 +1,2 @@
1
+include 'common'
2
+include 'irc'

Laden…
Annuleren
Opslaan