fix gradle

Julien LepillerTue Jun 05 22:46:02+0200 2018

272775b

fix gradle

more/packages/gradle.scm

201201 
       ("gradle-core-api" ,gradle-core-api)
202202 
       ("gradle-logging" ,gradle-logging)
203203 
       ("gradle-workers" ,gradle-workers)
204-
       ("groovy-bootstrap" ,groovy-bootstrap)
205-
       ("groovy-templates" ,groovy-templates)
204+
       ("groovy" ,groovy)
206205 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
207206 
       ("java-japicmp" ,java-japicmp)
208207 
       ("java-javax-inject" ,java-javax-inject)

…

290289 
       ("gradle-reporting" ,gradle-reporting)
291290 
       ("gradle-testing-base" ,gradle-testing-base)
292291 
       ("gradle-testing-jvm" ,gradle-testing-jvm)
293-
       ("groovy-xml" ,groovy-xml)
292+
       ("groovy" ,groovy)
294293 
       ("java-commons-lang" ,java-commons-lang)
295294 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
296295 
       ("java-japicmp" ,java-japicmp)

…

311310 
    (inputs
312311 
     `(("gradle-native" ,gradle-native)
313312 
       ("gradle-base-services" ,gradle-base-services)
314-
       ("groovy-xml" ,groovy-xml)
313+
       ("groovy" ,groovy)
315314 
       ("java-commons-io" ,java-commons-io)
316315 
       ("java-commons-lang" ,java-commons-lang)
317316 
       ("java-guava-for-gradle" ,java-guava-for-gradle)

…

362361 
(define-public gradle-base-services-groovy
363362 
  (package
364363 
    (inherit (gradle-subproject "base-services-groovy" '("gradle-base-services")
365-
                                '("groovy-bootstrap")))
364+
                                '("groovy")))
366365 
    (inputs
367366 
     `(("gradle-base-services" ,gradle-base-services)
368-
       ("groovy-bootstrap" ,groovy-bootstrap)
367+
       ("groovy" ,groovy)
369368 
       ("java-asm-6" ,java-asm-6)
370369 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
371370 
       ("java-jsr305" ,java-jsr305)))))

…

476475 
    (inherit (gradle-subproject
477476 
               "model-core"
478477 
               '("gradle-base-services-groovy" "gradle-base-services")
479-
               '("groovy-bootstrap" "java-slf4j-api" "java-guava-for-gradle"
478+
               '("groovy" "java-slf4j-api" "java-guava-for-gradle"
480479 
                 "java-jcip-annotations" "java-commons-lang" "java-asm-6")))
481480 
    (inputs
482481 
     `(("gradle-base-services" ,gradle-base-services)
483482 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
484-
       ("groovy-bootstrap" ,groovy-bootstrap)
483+
       ("groovy" ,groovy)
485484 
       ("java-asm-6" ,java-asm-6)
486485 
       ("java-commons-lang" ,java-commons-lang)
487486 
       ("java-guava-for-gradle" ,java-guava-for-gradle)

…

556555 
       ("gradle-persistent-cache" ,gradle-persistent-cache)
557556 
       ("gradle-process-services" ,gradle-process-services)
558557 
       ("gradle-resources" ,gradle-resources)
559-
       ("groovy-ant" ,groovy-ant)
560-
       ("groovy-bootstrap" ,groovy-bootstrap)
558+
       ("groovy" ,groovy)
561559 
       ("java-commons-io" ,java-commons-io)
562560 
       ("java-commons-lang" ,java-commons-lang)
563561 
       ("java-guava-for-gradle" ,java-guava-for-gradle)

…

571569 
               "model-groovy"
572570 
               '("gradle-base-services-groovy" "gradle-base-services"
573571 
                 "gradle-model-core")
574-
               '("groovy-bootstrap" "java-jcip-annotations" "java-guava-for-gradle")))
572+
               '("groovy" "java-jcip-annotations" "java-guava-for-gradle")))
575573 
    (inputs
576574 
     `(("gradle-base-services" ,gradle-base-services)
577575 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
578576 
       ("gradle-model-core" ,gradle-model-core)
579-
       ("groovy-bootstrap" ,groovy-bootstrap)
577+
       ("groovy" ,groovy)
580578 
       ("java-asm-6" ,java-asm-6)
581579 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
582580 
       ("java-jcip-annotations" ,java-jcip-annotations)

…

601599 
                  "gradle-build-option" "gradle-native" "gradle-persistent-cache"
602600 
                  "gradle-build-cache" "gradle-core-api" "gradle-process-services"
603601 
                  "gradle-jvm-services" "gradle-model-core")
604-
                '("groovy-ant" "groovy-bootstrap" "groovy-json" "groovy-templates"
605-
                  "groovy-xml" "ant" "java-guava-for-gradle"
602+
                '("groovy" "ant" "java-guava-for-gradle"
606603 
                  "java-javax-inject" "java-asm-6" "java-slf4j-api"
607604 
                  "java-commons-collections" "java-commons-io"
608605 
                  "java-commons-lang" "java-jcip-annotations" "java-jaxp"

…

659656 
         ("gradle-persistent-cache" ,gradle-persistent-cache)
660657 
         ("gradle-process-services" ,gradle-process-services)
661658 
         ("gradle-resources" ,gradle-resources)
662-
         ("groovy-ant" ,groovy-ant)
663-
         ("groovy-bootstrap" ,groovy-bootstrap)
664-
         ("groovy-json" ,groovy-json)
665-
         ("groovy-templates" ,groovy-templates)
666-
         ("groovy-xml" ,groovy-xml)
659+
         ("groovy" ,groovy)
667660 
         ("java-asm-6" ,java-asm-6)
668661 
         ("java-commons-collections" ,java-commons-collections)
669662 
         ("java-commons-compress" ,java-commons-compress)

…

723716 
         ("gradle-persistent-cache" ,gradle-persistent-cache)
724717 
         ("gradle-process-services" ,gradle-process-services)
725718 
         ("gradle-tooling-api" ,gradle-tooling-api)
726-
         ("groovy-bootstrap" ,groovy-bootstrap)
719+
         ("groovy" ,groovy)
727720 
         ("java-asm-6" ,java-asm-6)
728721 
         ("java-commons-io" ,java-commons-io)
729722 
         ("java-guava-for-gradle" ,java-guava-for-gradle)

…

772765 
    (inherit (gradle-subproject
773766 
               "reporting"
774767 
               '("gradle-core")
775-
               '("groovy-bootstrap" "java-jatl" "java-commons-lang")))
768+
               '("groovy" "java-jatl" "java-commons-lang")))
776769 
    (inputs
777770 
     `(("gradle-base-services" ,gradle-base-services)
778771 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)

…

780773 
       ("gradle-core-api" ,gradle-core-api)
781774 
       ("gradle-logging" ,gradle-logging)
782775 
       ("gradle-model-core" ,gradle-model-core)
783-
       ("groovy-bootstrap" ,groovy-bootstrap)
776+
       ("groovy" ,groovy)
784777 
       ("java-commons-lang" ,java-commons-lang)
785778 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
786779 
       ("java-jatl" ,java-jatl)

…

860853 
         ("gradle-persistent-cache" ,gradle-persistent-cache)
861854 
         ("gradle-resources" ,gradle-resources)
862855 
         ("gradle-resources-http" ,gradle-resources-http)
863-
         ("groovy-bootstrap" ,groovy-bootstrap)
856+
         ("groovy" ,groovy)
864857 
         ("java-apache-ivy" ,java-apache-ivy)
865858 
         ("java-asm-6" ,java-asm-6)
866859 
         ("java-bouncycastle" ,java-bouncycastle)

…

881874 
    (inherit (gradle-subproject
882875 
               "platform-base"
883876 
               '("gradle-core" "gradle-dependency-management" "gradle-workers")
884-
               '("java-commons-collections" "groovy-bootstrap")))
877+
               '("java-commons-collections" "groovy")))
885878 
    (inputs
886879 
     `(("gradle-base-services" ,gradle-base-services)
887880 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)

…

890883 
       ("gradle-dependency-management" ,gradle-dependency-management)
891884 
       ("gradle-model-core" ,gradle-model-core)
892885 
       ("gradle-workers" ,gradle-workers)
893-
       ("groovy-bootstrap" ,groovy-bootstrap)
886+
       ("groovy" ,groovy)
894887 
       ("java-commons-collections" ,java-commons-collections)
895888 
       ("java-commons-lang" ,java-commons-lang)
896889 
       ("java-guava-for-gradle" ,java-guava-for-gradle)

…

925918 
         ("gradle-platform-base" ,gradle-platform-base)
926919 
         ("gradle-process-services" ,gradle-process-services)
927920 
         ("gradle-reporting" ,gradle-reporting)
928-
         ("groovy-bootstrap" ,groovy-bootstrap)
921+
         ("groovy" ,groovy)
929922 
         ("java-asm-6" ,java-asm-6)
930923 
         ("java-bouncycastle" ,java-bouncycastle)
931924 
         ("java-commons-io" ,java-commons-io)

…

945938 
               "diagnostics"
946939 
               '("gradle-dependency-management" "gradle-base-services-groovy"
947940 
                 "gradle-core" "gradle-reporting" "gradle-platform-base")
948-
               '("groovy-bootstrap" "groovy-json" "java-guava-for-gradle" "java-jatl"
941+
               '("groovy" "java-guava-for-gradle" "java-jatl"
949942 
                 "java-commons-lang" "java-commons-collections")))
950943 
    (inputs
951944 
     `(("gradle-base-services" ,gradle-base-services)

…

957950 
       ("gradle-model-core" ,gradle-model-core)
958951 
       ("gradle-platform-base" ,gradle-platform-base)
959952 
       ("gradle-reporting" ,gradle-reporting)
960-
       ("groovy-bootstrap" ,groovy-bootstrap)
961-
       ("groovy-json" ,groovy-json)
953+
       ("groovy" ,groovy)
962954 
       ("java-commons-collections" ,java-commons-collections)
963955 
       ("java-commons-lang" ,java-commons-lang)
964956 
       ("java-guava-for-gradle" ,java-guava-for-gradle)

…

985977 
       ("gradle-native" ,gradle-native)
986978 
       ("gradle-platform-base" ,gradle-platform-base)
987979 
       ("gradle-process-services" ,gradle-process-services)
988-
       ("groovy-bootstrap" ,groovy-bootstrap)
980+
       ("groovy" ,groovy)
989981 
       ("java-asm-6" ,java-asm-6)
990982 
       ("java-commons-io" ,java-commons-io)
991983 
       ("java-commons-lang" ,java-commons-lang)

…

10171009 
       ("gradle-process-services" ,gradle-process-services)
10181010 
       ("gradle-reporting" ,gradle-reporting)
10191011 
       ("gradle-testing-base" ,gradle-testing-base)
1020-
       ("groovy-bootstrap" ,groovy-bootstrap)
1021-
       ("groovy-xml" ,groovy-xml)
1012+
       ("groovy" ,groovy)
10221013 
       ("java-asm-6" ,java-asm-6)
10231014 
       ("java-bsh" ,java-bsh)
10241015 
       ("java-commons-io" ,java-commons-io)

…

10371028 
    (inherit (gradle-subproject
10381029 
               "platform-native"
10391030 
               '("gradle-core" "gradle-platform-base" "gradle-diagnostics")
1040-
               '("groovy-bootstrap" "java-commons-io")))
1031+
               '("groovy" "java-commons-io")))
10411032 
    (inputs
10421033 
     `(("gradle-base-services" ,gradle-base-services)
10431034 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)

…

10501041 
       ("gradle-platform-base" ,gradle-platform-base)
10511042 
       ("gradle-process-services" ,gradle-process-services)
10521043 
       ("gradle-workers" ,gradle-workers)
1053-
       ("groovy-bootstrap" ,groovy-bootstrap)
1044+
       ("groovy" ,groovy)
10541045 
       ("java-commons-io" ,java-commons-io)
10551046 
       ("java-commons-lang" ,java-commons-lang)
10561047 
       ("java-gson" ,java-gson)

…

10751066 
       ("gradle-launcher" ,gradle-launcher)
10761067 
       ("gradle-logging" ,gradle-logging)
10771068 
       ("gradle-model-core" ,gradle-model-core)
1078-
       ("groovy-bootstrap" ,groovy-bootstrap)
1069+
       ("groovy" ,groovy)
10791070 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
10801071 
       ("java-javax-inject" ,java-javax-inject)
10811072 
       ("java-slf4j-api" ,java-slf4j-api)))))

…

10971088 
       ("gradle-platform-jvm" ,gradle-platform-jvm)
10981089 
       ("gradle-process-services" ,gradle-process-services)
10991090 
       ("gradle-workers" ,gradle-workers)
1100-
       ("groovy-bootstrap" ,groovy-bootstrap)
1091+
       ("groovy" ,groovy)
11011092 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
11021093 
       ("java-javax-inject" ,java-javax-inject)
11031094 
       ("java-jsr305" ,java-jsr305)))))

…

11241115 
       ("gradle-platform-jvm" ,gradle-platform-jvm)
11251116 
       ("gradle-process-services" ,gradle-process-services)
11261117 
       ("gradle-workers" ,gradle-workers)
1127-
       ("groovy-bootstrap" ,groovy-bootstrap)
1118+
       ("groovy" ,groovy)
11281119 
       ("java-asm-6" ,java-asm-6)
11291120 
       ("java-commons-lang" ,java-commons-lang)
11301121 
       ("java-guava-for-gradle" ,java-guava-for-gradle)

…

11511142 
       ("gradle-platform-jvm" ,gradle-platform-jvm)
11521143 
       ("gradle-process-services" ,gradle-process-services)
11531144 
       ("gradle-workers" ,gradle-workers)
1154-
       ("groovy-bootstrap" ,groovy-bootstrap)
1145+
       ("groovy" ,groovy)
11551146 
       ("java-asm-6" ,java-asm-6)
11561147 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
11571148 
       ("java-javax-inject" ,java-javax-inject)

…

11671158 
                 "gradle-platform-jvm" "gradle-language-jvm"
11681159 
                 "gradle-language-java" "gradle-language-groovy"
11691160 
                 "gradle-diagnostics" "gradle-testing-jvm")
1170-
               '("groovy-bootstrap" "ant" "java-asm-6" "java-commons-io"
1161+
               '("groovy" "ant" "java-asm-6" "java-commons-io"
11711162 
                 "java-commons-lang" "java-commons-cli" "java-slf4j-api")))
11721163 
    (inputs
11731164 
     `(("gradle-base-services" ,gradle-base-services)

…

11911182 
       ("gradle-testing-jvm" ,gradle-testing-jvm)
11921183 
       ("gradle-process-services" ,gradle-process-services)
11931184 
       ("gradle-workers" ,gradle-workers)
1194-
       ("groovy-ant" ,groovy-ant)
1195-
       ("groovy-bootstrap" ,groovy-bootstrap)
1196-
       ("groovy-templates" ,groovy-templates)
1185+
       ("groovy" ,groovy)
11971186 
       ("java-asm-6" ,java-asm-6)
11981187 
       ("java-commons-cli" ,java-commons-cli)
11991188 
       ("java-commons-io" ,java-commons-io)

…

27502739 
                             "gradle-build-cache"
27512740 
                             "gradle-base-services-groovy"
27522741 
                             "gradle-base-services"
2753-
                             "groovy-ant"
2754-
                             "groovy-bootstrap"
2755-
                             "groovy-json"
2756-
                             "groovy-templates"
2757-
                             "groovy-xml"
2742+
                             "groovy"
27582743 
                             "java-asm-6"
27592744 
                             "java-commons-compress"
27602745 
                             "java-commons-collections"

…

28522837 
       ("gradle-build-cache"           ,gradle-build-cache)
28532838 
       ("gradle-base-services-groovy"  ,gradle-base-services-groovy)
28542839 
       ("gradle-base-services"         ,gradle-base-services)
2855-
       ("groovy-ant" ,groovy-ant)
2856-
       ("groovy-bootstrap" ,groovy-bootstrap)
2857-
       ("groovy-json" ,groovy-json)
2858-
       ("groovy-templates" ,groovy-templates)
2859-
       ("groovy-xml" ,groovy-xml)
2840+
       ("groovy" ,groovy)
28602841 
       ("icedtea-8" ,icedtea-8)
28612842 
       ("java-asm-6" ,java-asm-6)
28622843 
       ("java-commons-compress" ,java-commons-compress)