Browse Source

Add dependency on Dagger.

Add Dagger as an Ivy dependency, update the build file to bundle
the dagger runtime libraries with the client, and include Dagger's
license (Apache 2) so it's displayed in the UI.

Change-Id: Ie147032cd16a753868ad52b55f3406091cb672a6
Reviewed-on: http://gerrit.dmdirc.com/2643
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.8rc1
Chris Smith 10 years ago
parent
commit
61938b593f
3 changed files with 24 additions and 1 deletions
  1. 8
    1
      build.xml
  2. 3
    0
      ivy.xml
  3. 13
    0
      src/com/dmdirc/licences/Dagger - Apache 2.0

+ 8
- 1
build.xml View File

@@ -53,9 +53,16 @@
53 53
         </jar>
54 54
     </target>
55 55
 
56
+    <target name="-bundle-dagger">
57
+        <jar destfile="${dist.jar}" update="true">
58
+            <zipfileset src="lib/dagger-1.1.0.jar" includes="dagger/**"/>
59
+            <zipfileset src="lib/javax.inject-1.jar" includes="javax/inject/*"/>
60
+        </jar>
61
+    </target>
62
+
56 63
     <target name="-pre-init" depends="-init-dependencies,-init-private-properties"/>
57 64
     <target name="-post-compile" depends="-write-version, build-plugins"/>
58 65
     <target name="-post-test-run" depends="-do-test-reports"/>
59
-    <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j"/>
66
+    <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j,-bundle-dagger"/>
60 67
 
61 68
 </project>

+ 3
- 0
ivy.xml View File

@@ -19,6 +19,9 @@
19 19
 
20 20
         <dependency org="com.github.peichhorn" name="lombok-pg" rev="latest.release" conf="compile->default" />
21 21
 
22
+        <dependency org="com.squareup.dagger" name="dagger" rev="1.1.+" conf="compile->default" />
23
+        <dependency org="com.squareup.dagger" name="dagger-compiler" rev="1.1.+" conf="compile->default" />
24
+
22 25
         <dependency org="pmd" name="pmd" rev="4.+" conf="test->default" />
23 26
         <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
24 27
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />

+ 13
- 0
src/com/dmdirc/licences/Dagger - Apache 2.0 View File

@@ -0,0 +1,13 @@
1
+Copyright 2013 Square, Inc.
2
+
3
+Licensed under the Apache License, Version 2.0 (the "License");
4
+you may not use this file except in compliance with the License.
5
+You may obtain a copy of the License at
6
+
7
+   http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+Unless required by applicable law or agreed to in writing, software
10
+distributed under the License is distributed on an "AS IS" BASIS,
11
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+See the License for the specific language governing permissions and
13
+limitations under the License.

Loading…
Cancel
Save