add more gradle subprojects

Julien LepillerThu Dec 14 11:40:16+0100 2017

65ff419

add more gradle subprojects

more/packages/gradle.scm

2424 
  #:use-module (guix utils)
2525 
  #:use-module (guix build-system ant)
2626 
  #:use-module (gnu packages java)
27+
  #:use-module (more packages groovy)
2728 
  #:use-module (more packages java))
2829 
29-
;    (version "4.3.1")
30+
(define (gradle-subproject subproject)
31+
  (package
32+
    (name (string-append "gradle-" subproject))
33+
;    (version "2.3")
3034 
;    (source (origin
3135 
;              (method url-fetch)
32-
;              (uri (string-append "https://github.com/gradle/gradle/archive/v"
36+
;              (uri (string-append "https://github.com/gradle/gradle/archive/REL_"
3337 
;                                  version ".tar.gz"))
3438 
;              (file-name (string-append "gradle-" version ".tar.gz"))
3539 
;              (sha256
3640 
;               (base32
37-
;                "0lc093zxadzf1hbgsxrk6bpgaxws25pkja1d4xxw179x83ifib7p"))))
38-
39-
(define (gradle-subproject subproject)
40-
  (package
41-
    (name (string-append "gradle-" subproject))
42-
    (version "2.3")
41+
;                "1v65ac38fzj92jqgrpgma8kpdy974xi8aclgwxkdasy4lcr0k37g"))))
42+
    (version "4.4.0")
4343 
    (source (origin
4444 
              (method url-fetch)
45-
              (uri (string-append "https://github.com/gradle/gradle/archive/REL_"
45+
              (uri (string-append "https://github.com/gradle/gradle/archive/v"
4646 
                                  version ".tar.gz"))
4747 
              (file-name (string-append "gradle-" version ".tar.gz"))
4848 
              (sha256
4949 
               (base32
50-
                "1v65ac38fzj92jqgrpgma8kpdy974xi8aclgwxkdasy4lcr0k37g"))))
50+
                "026232dy578nl8gzj1nfc9r25p8alcwdbwb9b8s3bw4krxmy6saz"))))
5151 
    (build-system ant-build-system)
5252 
    (arguments
5353 
     `(#:jar-name (string-append "gradle-" ,subproject ".jar")
…
7171 
         #:source-dir (string-append "subprojects/" ,subproject "/src/main/groovy")
7272 
         #:test-dir (string-append "subprojects/" ,subproject "/src/test")
7373 
         #:jdk ,icedtea-8
74+
         #:tests? #f;; Ignore tests for now
7475 
         #:phases
7576 
         (modify-phases %standard-phases
7677 
           (add-before 'build 'use-groovy
…
8889 
                  "<project basedir=\".\"><taskdef name=\"groovyc\"
8990 
classname=\"org.codehaus.groovy.ant.Groovyc\" />")))))))
9091 
      (native-inputs
91-
       `(("groovy-bootstrap" ,groovy-bootstrap)
92-
         ,@(package-inputs groovy-bootstrap))))))
92+
       `(("groovy" ,groovy)
93+
         ,@(package-inputs groovy))))))
9394 
9495 
(define-public gradle-internal-testing
9596 
  (package
9697 
    (inherit (gradle-groovy-subproject "internal-testing"))
9798 
    (inputs
98-
     `(("java-junit" ,java-junit)
99-
       ("java-jsoup" ,java-jsoup)
99+
     `(("gradle-native" ,gradle-native)
100+
       ("gradle-base-services" ,gradle-base-services)
101+
       ("groovy-xml" ,groovy-xml)
102+
       ("java-commons-io" ,java-commons-io)
103+
       ("java-commons-lang" ,java-commons-lang)
100104 
       ("java-guava" ,java-guava)
105+
       ("java-hamcrest-all" ,java-hamcrest-all)
106+
       ("java-jmock" ,java-jmock)
107+
       ("java-jmock-junit4" ,java-jmock-junit4)
108+
       ("java-jmock-legacy" ,java-jmock-legacy)
109+
       ("java-jsoup" ,java-jsoup)
110+
       ("java-junit" ,java-junit)
101111 
       ("java-slf4j-api" ,java-slf4j-api)
102-
       ("java-hamcrest-core" ,java-hamcrest-core)
103-
       ("java-commons-lang" ,java-commons-lang)
104-
       ("java-commons-io" ,java-commons-io)
105-
       ("gradle-base-services-bootstrap" ,gradle-base-services-bootstrap)))))
112+
       ("java-spockframework-core" ,java-spockframework-core)))))
106113 
107114 
;; Cycle with internal-testing
108115 
(define-public gradle-base-services
…
122129 
123130 
(define-public gradle-base-services-groovy
124131 
  (package
125-
    (inherit (gradle-groovy-subproject "base-services-groovy"))
132+
    (inherit (gradle-subproject "base-services-groovy"))
126133 
    (inputs
127134 
     `(("gradle-base-services" ,gradle-base-services)
128-
       ("java-byte-buddy-dep" ,java-byte-buddy-dep)
129-
       ("java-guava" ,java-guava)))
130-
    (arguments
131-
      (substitute-keyword-arguments (package-arguments java-javacc)
132-
        ((#:phases phases)
133-
         `(modify-phases ,phases
134-
            (add-before 'build 'add-bytebuddy
135-
              (lambda _
136-
                (substitute* "subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/AstUtils.java"
137-
                  (("package org.gradle.groovy.scripts.internal;")
138-
                   "package org.gradle.groovy.scripts.internal;
139-
import net.bytebuddy.implementation.MethodCall;"))
140-
                #t))))))))
141-
142-
;(define-public gradle-build-option
143-
;  (package
144-
;    (inherit (gradle-subproject "build-option"))
145-
;    (inputs
146-
;     `(("gradle-cli" ,gradle-cli)
147-
;       ("java-commons-lang" ,java-commons-lang)
148-
;       ("java-jsr305" ,java-jsr305)))))
135+
       ("groovy-bootstrap" ,groovy-bootstrap)
136+
       ("java-asm" ,java-asm)
137+
       ("java-guava" ,java-guava)
138+
       ("java-jsr305" ,java-jsr305)))))
139+
140+
(define-public gradle-build-option
141+
  (package
142+
    (inherit (gradle-subproject "build-option"))
143+
    (inputs
144+
     `(("gradle-cli" ,gradle-cli)
145+
       ("java-commons-lang" ,java-commons-lang)
146+
       ("java-jsr305" ,java-jsr305)))))
149147 
150148 
(define-public gradle-cli
151149 
  (package
…
173171 
           (add-before 'build 'fix-kryo
174172 
             (lambda _
175173 
               ;; gradle depends on kryo-2.20 from 2013, we packaged version 4.
176-
               (substitute* "subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoBackedEncoder.java"
174+
               (substitute* "subprojects/messaging/src/main/java/org/gradle/internal/serialize/kryo/KryoBackedEncoder.java"
177175 
                 (("public int getWritePosition")
178176 
                  "public long getWritePosition"))
179177 
               #t)))
180178 
         ,@(package-arguments base)))
181179 
      (inputs
182180 
       `(("gradle-base-services" ,gradle-base-services)
181+
         ("gradle-base-services-groovy" ,gradle-base-services-groovy)
182+
         ("java-commons-lang" ,java-commons-lang)
183183 
         ("java-guava" ,java-guava)
184184 
         ("java-jsr305" ,java-jsr305)
185185 
         ("java-kryo" ,java-kryo)
186186 
         ("java-slf4j-api" ,java-slf4j-api))))))
187187 
188-
(define-public gradle-core
188+
(define-public gradle-persistent-cache
189+
  (package
190+
    (inherit (gradle-subproject "persistent-cache"))
191+
    (inputs
192+
     `(("gradle-base-services" ,gradle-base-services)
193+
       ("gradle-messaging" ,gradle-messaging)
194+
       ("gradle-native" ,gradle-native)
195+
       ("java-commons-collections" ,java-commons-collections)
196+
       ("java-commons-io" ,java-commons-io)
197+
       ("java-commons-lang" ,java-commons-lang)
198+
       ("java-guava" ,java-guava)
199+
       ("java-jcip-annotations" ,java-jcip-annotations)
200+
       ("java-jsr305" ,java-jsr305)
201+
       ("java-slf4j-api" ,java-slf4j-api)))))
202+
203+
(define-public gradle-logging
189204 
  (package
190-
    (inherit (gradle-groovy-subproject "core"))
205+
    (inherit (gradle-subproject "logging"))
191206 
    (inputs
192207 
     `(("gradle-base-services" ,gradle-base-services)
208+
       ("gradle-build-option" ,gradle-build-option)
193209 
       ("gradle-cli" ,gradle-cli)
194210 
       ("gradle-messaging" ,gradle-messaging)
195211 
       ("gradle-native" ,gradle-native)
212+
       ("java-commons-lang" ,java-commons-lang)
213+
       ("java-guava" ,java-guava)
214+
       ("java-jansi" ,java-jansi)
215+
       ("java-jansi-native" ,java-jansi-native)
216+
       ("java-jcip-annotations" ,java-jcip-annotations)
217+
       ("java-jsr305" ,java-jsr305)
218+
       ("java-slf4j-api" ,java-slf4j-api)
219+
       ("java-jul-to-slf4j" ,java-jul-to-slf4j)))))
220+
221+
(define-public gradle-model-core
222+
  (package
223+
    (inherit (gradle-subproject "model-core"))
224+
    (inputs
225+
     `(("gradle-base-services" ,gradle-base-services)
226+
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
227+
       ("groovy-bootstrap" ,groovy-bootstrap)
228+
       ("java-asm" ,java-asm)
229+
       ("java-commons-lang" ,java-commons-lang)
230+
       ("java-guava" ,java-guava)
231+
       ("java-jcip-annotations" ,java-jcip-annotations)
232+
       ("java-jsr305" ,java-jsr305)
233+
       ("java-slf4j-api" ,java-slf4j-api)))))
234+
235+
(define-public gradle-resources
236+
  (package
237+
    (inherit (gradle-subproject "resources"))
238+
    (inputs
239+
     `(("gradle-base-services" ,gradle-base-services)
240+
       ("gradle-model-core" ,gradle-model-core)
241+
       ("gradle-native" ,gradle-native)
196242 
       ("java-commons-io" ,java-commons-io)
243+
       ("java-guava" ,java-guava)
244+
       ("java-jsr305" ,java-jsr305)))))
245+
246+
(define-public gradle-build-cache
247+
  (package
248+
    (inherit (gradle-subproject "build-cache"))
249+
    (inputs
250+
     `(("gradle-base-services" ,gradle-base-services)
251+
       ("gradle-logging" ,gradle-logging)
252+
       ("gradle-persistent-cache" ,gradle-persistent-cache)
253+
       ("gradle-resources" ,gradle-resources)
254+
       ("java-commons-io" ,java-commons-io)
255+
       ("java-guava" ,java-guava)
256+
       ("java-javax-inject" ,java-javax-inject)
257+
       ("java-jsr305" ,java-jsr305)
258+
       ("java-slf4j-api" ,java-slf4j-api)))))
259+
260+
(define-public gradle-process-services
261+
  (package
262+
    (inherit (gradle-subproject "process-services"))
263+
    (inputs
264+
     `(("gradle-base-services" ,gradle-base-services)
265+
       ("gradle-messaging" ,gradle-messaging)
266+
       ("gradle-native" ,gradle-native)
267+
       ("java-guava" ,java-guava)
268+
       ("java-jsr305" ,java-jsr305)
269+
       ("java-native-platform" ,java-native-platform)
270+
       ("java-slf4j-api" ,java-slf4j-api)))))
271+
272+
(define-public gradle-core-api
273+
  (package
274+
    (inherit (gradle-subproject "core-api"))
275+
    (inputs
276+
     `(("gradle-base-services" ,gradle-base-services)
277+
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
278+
       ("gradle-build-cache" ,gradle-build-cache)
279+
       ("gradle-logging" ,gradle-logging)
280+
       ("gradle-model-core" ,gradle-model-core)
281+
       ("gradle-persistent-cache" ,gradle-persistent-cache)
282+
       ("gradle-process-services" ,gradle-process-services)
283+
       ("gradle-resources" ,gradle-resources)
284+
       ("groovy-ant" ,groovy-ant)
285+
       ("groovy-bootstrap" ,groovy-bootstrap)
197286 
       ("java-commons-lang" ,java-commons-lang)
198287 
       ("java-guava" ,java-guava)
288+
       ("java-jsr305" ,java-jsr305)
289+
       ("java-slf4j-api" ,java-slf4j-api)))))
290+
291+
(define-public gradle-model-groovy
292+
  (package
293+
    (inherit (gradle-subproject "model-groovy"))
294+
    (inputs
295+
     `(("gradle-base-services" ,gradle-base-services)
296+
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
297+
       ("gradle-model-core" ,gradle-model-core)
298+
       ("groovy-bootstrap" ,groovy-bootstrap)
299+
       ("java-asm" ,java-asm)
300+
       ("java-guava" ,java-guava)
301+
       ("java-jcip-annotations" ,java-jcip-annotations)
302+
       ("java-jsr305" ,java-jsr305)))))
303+
304+
(define-public gradle-jvm-services
305+
  (package
306+
    (inherit (gradle-subproject "jvm-services"))
307+
    (inputs
308+
     `(("gradle-base-services" ,gradle-base-services)
309+
       ("gradle-process-services" ,gradle-process-services)))))
310+
311+
(define java-guava-for-gradle
312+
  (package
313+
    (inherit java-guava)
314+
    (version "17.0")
315+
    (source (origin
316+
              (method url-fetch)
317+
              (uri (string-append "https://github.com/google/guava/"
318+
                                  "archive/v" version ".tar.gz"))
319+
              (sha256
320+
               (base32
321+
                "0kg2n0dfdncbm3kgf8fa6kig8djfhar24vf0yf287x27w5sqzhnb"))))
322+
    (arguments
323+
     `(#:jar-name "guava.jar"
324+
       #:source-dir "guava/src/"
325+
       #:tests? #f)))); Not in a "java" subdirectory
326+
327+
(define-public gradle-core
328+
  (package
329+
    (inherit (gradle-subproject "core"))
330+
    (inputs
331+
     `(("gradle-base-services" ,gradle-base-services)
332+
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
333+
       ("gradle-build-cache" ,gradle-build-cache)
334+
       ("gradle-build-option" ,gradle-build-option)
335+
       ("gradle-cli" ,gradle-cli)
336+
       ("gradle-core-api" ,gradle-core-api)
337+
       ("gradle-jvm-services" ,gradle-jvm-services)
338+
       ("gradle-logging" ,gradle-logging)
339+
       ("gradle-messaging" ,gradle-messaging)
340+
       ("gradle-model-core" ,gradle-model-core)
341+
       ("gradle-model-groovy" ,gradle-model-groovy)
342+
       ("gradle-native" ,gradle-native)
343+
       ("gradle-persistent-cache" ,gradle-persistent-cache)
344+
       ("gradle-process-services" ,gradle-process-services)
345+
       ("gradle-resources" ,gradle-resources)
346+
       ("groovy-ant" ,groovy-ant)
347+
       ("groovy-bootstrap" ,groovy-bootstrap)
348+
       ("groovy-json" ,groovy-json)
349+
       ("groovy-templates" ,groovy-templates)
350+
       ("groovy-xml" ,groovy-xml)
351+
       ("java-asm-6" ,java-asm-6)
352+
       ("java-commons-collections" ,java-commons-collections)
353+
       ("java-commons-compress" ,java-commons-compress)
354+
       ("java-commons-io" ,java-commons-io)
355+
       ("java-commons-lang" ,java-commons-lang)
356+
       ("java-guava-for-gradle" ,java-guava-for-gradle)
199357 
       ("java-javax-inject" ,java-javax-inject)
200358 
       ("java-jcip-annotations" ,java-jcip-annotations)
201-
       ("java-slf4j-api" ,java-slf4j-api)))))
359+
       ("java-jsr305" ,java-jsr305)
360+
       ("java-native-platform" ,java-native-platform)
361+
       ("java-slf4j-api" ,java-slf4j-api)
362+
       ("groovy" ,groovy)))))
more/packages/java.scm
335335 
    (description "")
336336 
    (license license:asl2.0)))
337337 
338+
(define-public java-intellij-annotation
339+
  (package
340+
    (name "java-intellij-annotation")
341+
    (version "181-1945")
342+
    (source (origin
343+
              (method url-fetch)
344+
              (uri (string-append "https://github.com/JetBrains/intellij-community/"
345+
                                  "archive/idea/" version ".tar.gz"))
346+
              (file-name (string-append name "-" version ".tar.gz"))
347+
              (sha256
348+
               (base32
349+
                "1mvixizk75pvhaibdy8lriy5prasg0pap80vak6vfj67kw8lmksk"))))
350+
    (build-system ant-build-system)
351+
    (arguments
352+
     `(#:jar-name "java-intellij-annotation.jar"
353+
       #:source-dir "platform/annotations/src"
354+
       #:tests? #f)); no tests
355+
    (home-page "http://jetbrains.org")
356+
    (synopsis "")
357+
    (description "")
358+
    (license license:asl2.0)))
359+
338360 
(define-public java-spockframework-core
339361 
  (package
340362 
    (name "java-spockframework-core")
…
350372 
    (arguments
351373 
     `(#:jar-name "spock-core.jar"
352374 
       #:source-dir "spock-core/src/main/java"
375+
       #:jdk ,icedtea-8
353376 
       #:tests? #f)); No tests
354377 
    (inputs
355378 
     `(("groovy" ,groovy)
356379 
       ("java-asm" ,java-asm)
357380 
       ("java-cglib" ,java-cglib)
358381 
       ("java-hamcrest-core" ,java-hamcrest-core)
382+
       ("java-intellij-annotation" ,java-intellij-annotation)
359383 
       ("java-junit" ,java-junit)
360-
       ("java-objenesis" ,java-objenesis)))
384+
       ("java-objenesis" ,java-objenesis)
385+
       ("java-byte-buddy-dep" ,java-byte-buddy-dep)
386+
       ,@(package-inputs groovy)))
361387 
    (home-page "http://spockframework.org/")
362388 
    (synopsis "")
363389 
    (description "")
…
45154541 
    (inputs '())
45164542 
    (native-inputs '())))
45174543 
4518-
;(define-public java-qdox
4519-
;  (package
4520-
;    (name "java-qdox")
4521-
;    (version "2.0-M5")
4522-
;    (source
4523-
;     (origin
4524-
;       (method url-fetch)
4525-
;       ;; 2.0-M4, -M5 at https://github.com/paul-hammant/qdox
4526-
;       ;; Older releases at https://github.com/codehaus/qdox/
4527-
;       (uri (string-append "http://central.maven.org/maven2/"
4528-
;                           "com/thoughtworks/qdox/qdox/" version
4529-
;                           "/qdox-" version "-sources.jar"))
4530-
;       (sha256
4531-
;        (base32 "10ny800qmfishrqdxmngv0jylhaxjh340bia8csghl9a9cbxfrjs"))))
4532-
;    (build-system ant-build-system)
4533-
;    (arguments
4534-
;     `(#:jar-name "qdox.jar"))
4535-
;    (home-page "http://qdox.codehaus.org/")
4536-
;    (synopsis "Parse definitions from Java source files")
4537-
;    (description "QDox is a high speed, small footprint parser for extracting
4538-
;class/interface/method definitions from source files complete with JavaDoc
4539-
;@code{@@tags}.  It is designed to be used by active code generators or
4540-
;documentation tools.")
4541-
;    (license license:asl2.0)))
4542-
45434544 
(define-public java-qdox
45444545 
  (package
45454546 
    (name "java-qdox")
…
45674568 
documentation tools.")
45684569 
    (license license:asl2.0)))
45694570 
4570-
(define-public java-qdox-1.12
4571-
  (package
4572-
    (inherit java-qdox)
4573-
    (version "1.12.1")
4574-
    (source
4575-
     (origin
4576-
       (method url-fetch)
4577-
       (uri (string-append "http://central.maven.org/maven2/"
4578-
                           "com/thoughtworks/qdox/qdox/" version
4579-
                           "/qdox-" version "-sources.jar"))
4580-
       (sha256
4581-
        (base32 "0hlfbqq2avf5s26wxkksqmkdyk6zp9ggqn37c468m96mjv0n9xfl"))))
4582-
    (arguments
4583-
     `(#:jar-name "qdox.jar"
4584-
       #:phases
4585-
       (modify-phases %standard-phases
4586-
         (add-after 'unpack 'delete-tests
4587-
           (lambda _
4588-
             (delete-file-recursively "src/com/thoughtworks/qdox/junit")
4589-
             #t)))))))
4590-
45914571 
(define-public java-plexus-cli
45924572 
  (package
45934573 
    (name "java-plexus-cli")