File tree Expand file tree Collapse file tree 5 files changed +17
-13
lines changed Expand file tree Collapse file tree 5 files changed +17
-13
lines changed Original file line number Diff line number Diff line change @@ -409,7 +409,6 @@ configure(javaProjects) { subproject ->
409409        }
410410    }
411411
412-     //  Process only the modules that require kotlin docs
413412    if  (file(' src/main/kotlin' 
414413        apply plugin : ' org.jetbrains.dokka' 
415414        dokka {
@@ -1118,9 +1117,18 @@ tasks.register('schemaZip', Zip) {
11181117            shortName =  ' ' 
11191118        }
11201119
1121-         subproject. sourceSets. main. resources. find {
1122-             it. path. endsWith(" META-INF${ File.separator} " 
1123-         }?. withInputStream { schemas. load(it) }
1120+ 		/*  TODO until Gradle 9.1.1 or 9.2
1121+ 		subproject.sourceSets.main.resources.find { 
1122+ 			it.path.endsWith("META-INF${File.separator}spring.schemas") 
1123+ 		}?.withInputStream { schemas.load(it) }*/  
1124+ 
1125+ 		File  schemasFile =  subproject. sourceSets. main. resources. find  {
1126+ 			it. path. endsWith(" META-INF${ File.separator} " 
1127+ 		}
1128+ 
1129+ 		if  (schemasFile) {
1130+ 			schemasFile. withInputStream { schemas. load(it) }
1131+ 		}
11241132
11251133        for  (def  key  : schemas. keySet()) {
11261134            File  xsdFile =  subproject. sourceSets. main. resources. find {
@@ -1166,7 +1174,7 @@ tasks.register('docsZip', Zip) {
11661174        into ' api' 
11671175    }
11681176
1169-     from(file(' build/ kdoc' 
1177+     from(project . layout . buildDirectory . file(' kdoc' 
11701178        into ' kdoc-api' 
11711179    }
11721180}
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionSha256Sum =bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 
4- distributionUrl =https\://services.gradle.org/distributions/gradle-8.14.3 -bin.zip
3+ distributionSha256Sum =a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 
4+ distributionUrl =https\://services.gradle.org/distributions/gradle-9.1.0 -bin.zip
55networkTimeout =10000
66validateDistributionUrl =true
77zipStoreBase =GRADLE_USER_HOME
Original file line number Diff line number Diff line change 11#! /bin/sh
22
33# 
4- #  Copyright © 2015-2021  the original authors.
4+ #  Copyright © 2015 the original authors.
55# 
66#  Licensed under the Apache License, Version 2.0 (the "License");
77#  you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
114114  NONSTOP*  )        nonstop=true ;;
115115esac 
116116
117- CLASSPATH=" \\\"\\\" " 
118117
119118
120119#  Determine the Java command to use to start the JVM.
172171#  For Cygwin or MSYS, switch paths to Windows format before running java
173172if  " $cygwin " ||  " $msys " ;  then 
174173    APP_HOME=$(  cygpath --path --mixed " $APP_HOME " ) 
175-     CLASSPATH=$(  cygpath --path --mixed " $CLASSPATH " ) 
176174
177175    JAVACMD=$(  cygpath --unix " $JAVACMD " ) 
178176
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210
213211set  -- \
214212        " -Dorg.gradle.appname=$APP_BASE_NAME " 
215-         -classpath " $CLASSPATH " 
216213        -jar " $APP_HOME /gradle/wrapper/gradle-wrapper.jar" 
217214        " $@ " 
218215
Original file line number Diff line number Diff line change @@ -70,11 +70,10 @@ goto fail
7070:execute 
7171@ rem  Setup the command line
7272
73- set  CLASSPATH = 
7473
7574
7675@ rem  Execute Gradle
77- " %JAVA_EXE% " %DEFAULT_JVM_OPTS%  %JAVA_OPTS%  %GRADLE_OPTS%  " -Dorg.gradle.appname=%APP_BASE_NAME% " classpath  " %CLASSPATH% "  - jar " %APP_HOME% \gradle\wrapper\gradle-wrapper.jar" %* 
76+ " %JAVA_EXE% " %DEFAULT_JVM_OPTS%  %JAVA_OPTS%  %GRADLE_OPTS%  " -Dorg.gradle.appname=%APP_BASE_NAME% " " %APP_HOME% \gradle\wrapper\gradle-wrapper.jar" %* 
7877
7978:end 
8079@ rem  End local scope for the variables with windows NT shell
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments