- 
        Couldn't load subscription status. 
- Fork 35
chore: Update to Gradle 8 #867
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Draft
      
        
      
            jbelkins
  wants to merge
  13
  commits into
  main
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
jbe/gradle_8
  
      
      
   
  
    
  
  
  
 
  
      
    base: main
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
  
     Draft
                    Changes from 3 commits
      Commits
    
    
            Show all changes
          
          
            13 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      cb98857
              
                chore: Update to Gradle 8
              
              
                jbelkins 402da3b
              
                Fix jacoco test report task
              
              
                jbelkins cfde0ec
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins f376640
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins 304aef6
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins c61bcbe
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins a6b9323
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins fb3d536
              
                Update to smithy-gradle 1.2.0
              
              
                jbelkins 99f8add
              
                Merge remote-tracking branch 'origin/main' into jbe/gradle_8
              
              
                jbelkins 22628e4
              
                Merge branch 'jbe/gradle_8' of github.com:smithy-lang/smithy-swift in…
              
              
                jbelkins c13cb37
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins f7a46b7
              
                Merge remote-tracking branch 'origin/main' into jbe/gradle_8
              
              
                jbelkins 211322e
              
                Merge branch 'main' into jbe/gradle_8
              
              
                jbelkins File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
            Binary file not shown.
          
    
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| #!/usr/bin/env sh | ||
| #!/bin/sh | ||
| There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Automatically generated by Gradle upgrade command | ||
|  | ||
| # | ||
| # Copyright 2015 the original author or authors. | ||
| # Copyright © 2015-2021 the original authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
|  | @@ -17,78 +17,113 @@ | |
| # | ||
|  | ||
| ############################################################################## | ||
| ## | ||
| ## Gradle start up script for UN*X | ||
| ## | ||
| # | ||
| # Gradle start up script for POSIX generated by Gradle. | ||
| # | ||
| # Important for running: | ||
| # | ||
| # (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is | ||
| # noncompliant, but you have some other compliant shell such as ksh or | ||
| # bash, then to run this script, type that shell name before the whole | ||
| # command line, like: | ||
| # | ||
| # ksh Gradle | ||
| # | ||
| # Busybox and similar reduced shells will NOT work, because this script | ||
| # requires all of these POSIX shell features: | ||
| # * functions; | ||
| # * expansions «$var», «${var}», «${var:-default}», «${var+SET}», | ||
| # «${var#prefix}», «${var%suffix}», and «$( cmd )»; | ||
| # * compound commands having a testable exit status, especially «case»; | ||
| # * various built-in commands including «command», «set», and «ulimit». | ||
| # | ||
| # Important for patching: | ||
| # | ||
| # (2) This script targets any POSIX shell, so it avoids extensions provided | ||
| # by Bash, Ksh, etc; in particular arrays are avoided. | ||
| # | ||
| # The "traditional" practice of packing multiple parameters into a | ||
| # space-separated string is a well documented source of bugs and security | ||
| # problems, so this is (mostly) avoided, by progressively accumulating | ||
| # options in "$@", and eventually passing that to Java. | ||
| # | ||
| # Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, | ||
| # and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; | ||
| # see the in-line comments for details. | ||
| # | ||
| # There are tweaks for specific operating systems such as AIX, CygWin, | ||
| # Darwin, MinGW, and NonStop. | ||
| # | ||
| # (3) This script is generated from the Groovy template | ||
| # https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt | ||
| # within the Gradle project. | ||
| # | ||
| # You can find Gradle at https://github.com/gradle/gradle/. | ||
| # | ||
| ############################################################################## | ||
|  | ||
| # Attempt to set APP_HOME | ||
|  | ||
| # Resolve links: $0 may be a link | ||
| PRG="$0" | ||
| # Need this for relative symlinks. | ||
| while [ -h "$PRG" ] ; do | ||
| ls=`ls -ld "$PRG"` | ||
| link=`expr "$ls" : '.*-> \(.*\)$'` | ||
| if expr "$link" : '/.*' > /dev/null; then | ||
| PRG="$link" | ||
| else | ||
| PRG=`dirname "$PRG"`"/$link" | ||
| fi | ||
| app_path=$0 | ||
|  | ||
| # Need this for daisy-chained symlinks. | ||
| while | ||
| APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path | ||
| [ -h "$app_path" ] | ||
| do | ||
| ls=$( ls -ld "$app_path" ) | ||
| link=${ls#*' -> '} | ||
| case $link in #( | ||
| /*) app_path=$link ;; #( | ||
| *) app_path=$APP_HOME$link ;; | ||
| esac | ||
| done | ||
| SAVED="`pwd`" | ||
| cd "`dirname \"$PRG\"`/" >/dev/null | ||
| APP_HOME="`pwd -P`" | ||
| cd "$SAVED" >/dev/null | ||
|  | ||
| APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit | ||
|  | ||
| APP_NAME="Gradle" | ||
| APP_BASE_NAME=`basename "$0"` | ||
| APP_BASE_NAME=${0##*/} | ||
|  | ||
| # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | ||
| DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | ||
|  | ||
| # Use the maximum available, or set MAX_FD != -1 to use that value. | ||
| MAX_FD="maximum" | ||
| MAX_FD=maximum | ||
|  | ||
| warn () { | ||
| echo "$*" | ||
| } | ||
| } >&2 | ||
|  | ||
| die () { | ||
| echo | ||
| echo "$*" | ||
| echo | ||
| exit 1 | ||
| } | ||
| } >&2 | ||
|  | ||
| # OS specific support (must be 'true' or 'false'). | ||
| cygwin=false | ||
| msys=false | ||
| darwin=false | ||
| nonstop=false | ||
| case "`uname`" in | ||
| CYGWIN* ) | ||
| cygwin=true | ||
| ;; | ||
| Darwin* ) | ||
| darwin=true | ||
| ;; | ||
| MINGW* ) | ||
| msys=true | ||
| ;; | ||
| NONSTOP* ) | ||
| nonstop=true | ||
| ;; | ||
| case "$( uname )" in #( | ||
| CYGWIN* ) cygwin=true ;; #( | ||
| Darwin* ) darwin=true ;; #( | ||
| MSYS* | MINGW* ) msys=true ;; #( | ||
| NONSTOP* ) nonstop=true ;; | ||
| esac | ||
|  | ||
| CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | ||
|  | ||
|  | ||
| # Determine the Java command to use to start the JVM. | ||
| if [ -n "$JAVA_HOME" ] ; then | ||
| if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | ||
| # IBM's JDK on AIX uses strange locations for the executables | ||
| JAVACMD="$JAVA_HOME/jre/sh/java" | ||
| JAVACMD=$JAVA_HOME/jre/sh/java | ||
| else | ||
| JAVACMD="$JAVA_HOME/bin/java" | ||
| JAVACMD=$JAVA_HOME/bin/java | ||
| fi | ||
| if [ ! -x "$JAVACMD" ] ; then | ||
| die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME | ||
|  | @@ -97,87 +132,103 @@ Please set the JAVA_HOME variable in your environment to match the | |
| location of your Java installation." | ||
| fi | ||
| else | ||
| JAVACMD="java" | ||
| JAVACMD=java | ||
| which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | ||
|  | ||
| Please set the JAVA_HOME variable in your environment to match the | ||
| location of your Java installation." | ||
| fi | ||
|  | ||
| # Increase the maximum file descriptors if we can. | ||
| if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then | ||
| MAX_FD_LIMIT=`ulimit -H -n` | ||
| if [ $? -eq 0 ] ; then | ||
| if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then | ||
| MAX_FD="$MAX_FD_LIMIT" | ||
| fi | ||
| ulimit -n $MAX_FD | ||
| if [ $? -ne 0 ] ; then | ||
| warn "Could not set maximum file descriptor limit: $MAX_FD" | ||
| fi | ||
| else | ||
| warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" | ||
| fi | ||
| if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then | ||
| case $MAX_FD in #( | ||
| max*) | ||
| MAX_FD=$( ulimit -H -n ) || | ||
| warn "Could not query maximum file descriptor limit" | ||
| esac | ||
| case $MAX_FD in #( | ||
| '' | soft) :;; #( | ||
| *) | ||
| ulimit -n "$MAX_FD" || | ||
| warn "Could not set maximum file descriptor limit to $MAX_FD" | ||
| esac | ||
| fi | ||
|  | ||
| # For Darwin, add options to specify how the application appears in the dock | ||
| if $darwin; then | ||
| GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" | ||
| fi | ||
| # Collect all arguments for the java command, stacking in reverse order: | ||
| # * args from the command line | ||
| # * the main class name | ||
| # * -classpath | ||
| # * -D...appname settings | ||
| # * --module-path (only if needed) | ||
| # * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. | ||
|  | ||
| # For Cygwin or MSYS, switch paths to Windows format before running java | ||
| if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then | ||
| APP_HOME=`cygpath --path --mixed "$APP_HOME"` | ||
| CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` | ||
| JAVACMD=`cygpath --unix "$JAVACMD"` | ||
|  | ||
| # We build the pattern for arguments to be converted via cygpath | ||
| ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` | ||
| SEP="" | ||
| for dir in $ROOTDIRSRAW ; do | ||
| ROOTDIRS="$ROOTDIRS$SEP$dir" | ||
| SEP="|" | ||
| done | ||
| OURCYGPATTERN="(^($ROOTDIRS))" | ||
| # Add a user-defined pattern to the cygpath arguments | ||
| if [ "$GRADLE_CYGPATTERN" != "" ] ; then | ||
| OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" | ||
| fi | ||
| if "$cygwin" || "$msys" ; then | ||
| APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) | ||
| CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) | ||
|  | ||
| JAVACMD=$( cygpath --unix "$JAVACMD" ) | ||
|  | ||
| # Now convert the arguments - kludge to limit ourselves to /bin/sh | ||
| i=0 | ||
| for arg in "$@" ; do | ||
| CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` | ||
| CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option | ||
|  | ||
| if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition | ||
| eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` | ||
| else | ||
| eval `echo args$i`="\"$arg\"" | ||
| for arg do | ||
| if | ||
| case $arg in #( | ||
| -*) false ;; # don't mess with options #( | ||
| /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath | ||
| [ -e "$t" ] ;; #( | ||
| *) false ;; | ||
| esac | ||
| then | ||
| arg=$( cygpath --path --ignore --mixed "$arg" ) | ||
| fi | ||
| i=`expr $i + 1` | ||
| # Roll the args list around exactly as many times as the number of | ||
| # args, so each arg winds up back in the position where it started, but | ||
| # possibly modified. | ||
| # | ||
| # NB: a `for` loop captures its iteration list before it begins, so | ||
| # changing the positional parameters here affects neither the number of | ||
| # iterations, nor the values presented in `arg`. | ||
| shift # remove old arg | ||
| set -- "$@" "$arg" # push replacement arg | ||
| done | ||
| case $i in | ||
| 0) set -- ;; | ||
| 1) set -- "$args0" ;; | ||
| 2) set -- "$args0" "$args1" ;; | ||
| 3) set -- "$args0" "$args1" "$args2" ;; | ||
| 4) set -- "$args0" "$args1" "$args2" "$args3" ;; | ||
| 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | ||
| 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | ||
| 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | ||
| 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | ||
| 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | ||
| esac | ||
| fi | ||
|  | ||
| # Escape application args | ||
| save () { | ||
| for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done | ||
| echo " " | ||
| } | ||
| APP_ARGS=`save "$@"` | ||
| # Collect all arguments for the java command; | ||
| # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of | ||
| # shell script including quotes and variable substitutions, so put them in | ||
| # double quotes to make sure that they get re-expanded; and | ||
| # * put everything else in single quotes, so that it's not re-expanded. | ||
|  | ||
| set -- \ | ||
| "-Dorg.gradle.appname=$APP_BASE_NAME" \ | ||
| -classpath "$CLASSPATH" \ | ||
| org.gradle.wrapper.GradleWrapperMain \ | ||
| "$@" | ||
|  | ||
| # Use "xargs" to parse quoted args. | ||
| # | ||
| # With -n1 it outputs one arg per line, with the quotes and backslashes removed. | ||
| # | ||
| # In Bash we could simply go: | ||
| # | ||
| # readarray ARGS < <( xargs -n1 <<<"$var" ) && | ||
| # set -- "${ARGS[@]}" "$@" | ||
| # | ||
| # but POSIX shell has neither arrays nor command substitution, so instead we | ||
| # post-process each arg (as a line of input to sed) to backslash-escape any | ||
| # character that might be a shell metacharacter, then use eval to reverse | ||
| # that process (while maintaining the separation between arguments), and wrap | ||
| # the whole thing up as a single "set" statement. | ||
| # | ||
| # This will of course break if any of these variables contains a newline or | ||
| # an unmatched quote. | ||
| # | ||
|  | ||
| # Collect all arguments for the java command, following the shell quoting and substitution rules | ||
| eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" | ||
| eval "set -- $( | ||
| printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | | ||
| xargs -n1 | | ||
| sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | | ||
| tr '\n' ' ' | ||
| )" '"$@"' | ||
|  | ||
| exec "$JAVACMD" "$@" | ||
      
      Oops, something went wrong.
        
    
  
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Automatically generated by Gradle upgrade command