groovy-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From C├ędric Champeau <cedric.champ...@gmail.com>
Subject Re: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect generic type arguments
Date Sat, 13 Jun 2015 16:20:09 GMT
Yes, because Gradle 2.4 doesn't support JDK 9.

2015-06-13 18:17 GMT+02:00 Benedikt Ritter <britter@apache.org>:

> Hello,
>
> has the change to gradle-wrapper.properties been made intentionally?
>
> Benedikt
>
> ---------- Forwarded message ----------
> From: <cchampeau@apache.org>
> Date: 2015-06-13 18:03 GMT+02:00
> Subject: [2/2] incubator-groovy git commit: Fixes for JDK 9 : incorrect
> generic type arguments
> To: commits@groovy.incubator.apache.org
>
>
> Fixes for JDK 9 : incorrect generic type arguments
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/83d68087
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/83d68087
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/83d68087
>
> Branch: refs/heads/master
> Commit: 83d680877c44072c46bdf2212303398ac3b1276e
> Parents: 33fcc56
> Author: Cedric Champeau <cchampeau@apache.org>
> Authored: Sat Jun 13 17:52:10 2015 +0200
> Committer: Cedric Champeau <cchampeau@apache.org>
> Committed: Sat Jun 13 18:02:47 2015 +0200
>
> ----------------------------------------------------------------------
>  gradle/wrapper/gradle-wrapper.properties                  |  2 +-
>  .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/gradle/wrapper/gradle-wrapper.properties
> ----------------------------------------------------------------------
> diff --git a/gradle/wrapper/gradle-wrapper.properties
> b/gradle/wrapper/gradle-wrapper.properties
> index f7f7322..d61b8d8 100644
> --- a/gradle/wrapper/gradle-wrapper.properties
> +++ b/gradle/wrapper/gradle-wrapper.properties
> @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
>  distributionPath=wrapper/dists
>  zipStoreBase=GRADLE_USER_HOME
>  zipStorePath=wrapper/dists
> -distributionUrl=https\://
> services.gradle.org/distributions/gradle-2.4-bin.zip
> +distributionUrl=
> http://services.gradle.org/distributions-snapshots/gradle-2.6-20150612220026+0000-bin.zip
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/83d68087/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> ----------------------------------------------------------------------
> diff --git
> a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> index d7e799d..db7f6ce 100644
> --- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> +++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
> @@ -7490,7 +7490,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see java.util.Collections#unmodifiableMap(java.util.Map)
>       * @since 1.0
>       */
> -    public static <K,V> Map<K,V> asImmutable(Map<? extends K, ? extends
> V> self) {
> +    public static <K,V> Map<K,V> asImmutable(Map<K,V> self) {
>          return Collections.unmodifiableMap(self);
>      }
>
> @@ -7502,7 +7502,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see
> java.util.Collections#unmodifiableSortedMap(java.util.SortedMap)
>       * @since 1.0
>       */
> -    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K, ? extends
> V> self) {
> +    public static <K,V> SortedMap<K,V> asImmutable(SortedMap<K,V>
self) {
>          return Collections.unmodifiableSortedMap(self);
>      }
>
> @@ -7514,7 +7514,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see java.util.Collections#unmodifiableList(java.util.List)
>       * @since 1.0
>       */
> -    public static <T> List<T> asImmutable(List<? extends T> self)
{
> +    public static <T> List<T> asImmutable(List<T> self) {
>          return Collections.unmodifiableList(self);
>      }
>
> @@ -7526,7 +7526,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see java.util.Collections#unmodifiableSet(java.util.Set)
>       * @since 1.0
>       */
> -    public static <T> Set<T> asImmutable(Set<? extends T> self) {
> +    public static <T> Set<T> asImmutable(Set<T> self) {
>          return Collections.unmodifiableSet(self);
>      }
>
> @@ -7559,7 +7559,7 @@ public class DefaultGroovyMethods extends
> DefaultGroovyMethodsSupport {
>       * @see
> java.util.Collections#unmodifiableCollection(java.util.Collection)
>       * @since 1.5.0
>       */
> -    public static <T> Collection<T> asImmutable(Collection<? extends
T>
> self) {
> +    public static <T> Collection<T> asImmutable(Collection<T> self)
{
>          return Collections.unmodifiableCollection(self);
>      }
>
>
>
>
>
> --
> http://people.apache.org/~britter/
> http://www.systemoutprintln.de/
> http://twitter.com/BenediktRitter
> http://github.com/britter
>

Mime
View raw message