소스 검색

Pull DMDirc from nexus.

Change-Id: I927fe011c2e3675fc1e93624f8fc679a03d19077
Reviewed-on: http://gerrit.dmdirc.com/3901
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
changes/01/3901/4
Chris Smith 9 년 전
부모
커밋
a3c6b8cddf
4개의 변경된 파일18개의 추가작업 그리고 14개의 파일을 삭제
  1. 7
    2
      build.gradle
  2. 6
    8
      build.xml
  3. 3
    0
      identd/build.gradle
  4. 2
    4
      parser_irc/build.gradle

+ 7
- 2
build.gradle 파일 보기

39
         maven {
39
         maven {
40
             url 'http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/'
40
             url 'http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/'
41
         }
41
         }
42
+        maven {
43
+            url 'http://nexus.dmdirc.com/nexus/content/repositories/snapshots/'
44
+        }
45
+        maven {
46
+            url 'http://nexus.dmdirc.com/nexus/content/repositories/releases/'
47
+        }
42
     }
48
     }
43
 
49
 
44
     dependencies {
50
     dependencies {
45
-        compile files("$dmdircOutput")
46
-        compile fileTree(dir: '../../../lib/bundled/', include: '*.jar')
51
+        compile group: 'com.dmdirc', name: 'client', version: '+', changing: true
47
 
52
 
48
         compile group: 'com.google.code.findbugs', name: 'jsr305', version: '2.+'
53
         compile group: 'com.google.code.findbugs', name: 'jsr305', version: '2.+'
49
         compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
54
         compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'

+ 6
- 8
build.xml 파일 보기

9
 
9
 
10
     <target name="compile">
10
     <target name="compile">
11
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
11
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
12
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
13
             <arg value="--parallel"/>
12
             <arg value="--parallel"/>
13
+            <arg value="--refresh-dependencies"/>
14
             <arg value="compileJava"/>
14
             <arg value="compileJava"/>
15
         </exec>
15
         </exec>
16
 
16
 
17
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
17
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
18
             <arg value="/c"/>
18
             <arg value="/c"/>
19
             <arg value="gradlew.bat"/>
19
             <arg value="gradlew.bat"/>
20
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
21
             <arg value="--parallel"/>
20
             <arg value="--parallel"/>
21
+            <arg value="--refresh-dependencies"/>
22
             <arg value="compileJava"/>
22
             <arg value="compileJava"/>
23
         </exec>
23
         </exec>
24
     </target>
24
     </target>
25
 
25
 
26
     <target name="jar">
26
     <target name="jar">
27
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
27
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
28
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
29
             <arg value="--parallel"/>
28
             <arg value="--parallel"/>
29
+            <arg value="--refresh-dependencies"/>
30
             <arg value="jar"/>
30
             <arg value="jar"/>
31
         </exec>
31
         </exec>
32
 
32
 
33
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
33
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
34
             <arg value="/c"/>
34
             <arg value="/c"/>
35
             <arg value="gradlew.bat"/>
35
             <arg value="gradlew.bat"/>
36
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
37
             <arg value="--parallel"/>
36
             <arg value="--parallel"/>
37
+            <arg value="--refresh-dependencies"/>
38
             <arg value="jar"/>
38
             <arg value="jar"/>
39
         </exec>
39
         </exec>
40
 
40
 
48
 
48
 
49
     <target name="clean">
49
     <target name="clean">
50
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
50
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
51
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
52
             <arg value="--parallel"/>
51
             <arg value="--parallel"/>
53
             <arg value="clean"/>
52
             <arg value="clean"/>
54
         </exec>
53
         </exec>
56
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
55
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
57
             <arg value="/c"/>
56
             <arg value="/c"/>
58
             <arg value="gradlew.bat"/>
57
             <arg value="gradlew.bat"/>
59
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
60
             <arg value="--parallel"/>
58
             <arg value="--parallel"/>
61
             <arg value="clean"/>
59
             <arg value="clean"/>
62
         </exec>
60
         </exec>
66
 
64
 
67
     <target name="compile-for-tests" depends="compile">
65
     <target name="compile-for-tests" depends="compile">
68
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
66
         <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
69
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
70
             <arg value="--parallel"/>
67
             <arg value="--parallel"/>
68
+            <arg value="--refresh-dependencies"/>
71
             <arg value="compileTestJava"/>
69
             <arg value="compileTestJava"/>
72
         </exec>
70
         </exec>
73
 
71
 
74
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
72
         <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
75
             <arg value="/c"/>
73
             <arg value="/c"/>
76
             <arg value="gradlew.bat"/>
74
             <arg value="gradlew.bat"/>
77
-            <arg value="-PdmdircOutput=${dmdircOutput}"/>
78
             <arg value="--parallel"/>
75
             <arg value="--parallel"/>
76
+            <arg value="--refresh-dependencies"/>
79
             <arg value="compileTestJava"/>
77
             <arg value="compileTestJava"/>
80
         </exec>
78
         </exec>
81
     </target>
79
     </target>

+ 3
- 0
identd/build.gradle 파일 보기

1
+dependencies {
2
+    compile group: 'com.dmdirc.parser', name: 'irc', version: '+', changing: true
3
+}

+ 2
- 4
parser_irc/build.gradle 파일 보기

1
-jar {
2
-    from ('../../../build/production/parser/') {
3
-        include 'com/dmdirc/parser/irc/**'
4
-    }
1
+dependencies {
2
+    bundle group: 'com.dmdirc.parser', name: 'irc', version: '+', changing: true
5
 }
3
 }

Loading…
취소
저장