Rename 'modularClasspathHandling' to 'modularity' (samples)

Updates the wrapper to latest 6.4 nightly.
dmvk · Apr 7, 2020 · c77b634 · c77b634
1 parent 8300fd4
commit c77b634
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.4-20200401220055+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.4-20200407154813+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -82,6 +82,7 @@ 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
@@ -129,6 +130,7 @@ fi
 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

diff --git a/gradlew.bat b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/...ts/docs/src/samples/java/modules-multi-project-with-integration-tests/groovy/build.gradle b/...ts/docs/src/samples/java/modules-multi-project-with-integration-tests/groovy/build.gradle
@@ -8,7 +8,7 @@ subprojects {
 
     plugins.withType(JavaPlugin).configureEach {
         java {
-            modularClasspathHandling.inferModulePath = true
+            modularity.inferModulePath = true
         }
 
         sourceSets {

diff --git a/...ocs/src/samples/java/modules-multi-project-with-integration-tests/kotlin/build.gradle.kts b/...ocs/src/samples/java/modules-multi-project-with-integration-tests/kotlin/build.gradle.kts
@@ -8,7 +8,7 @@ subprojects {
 
     plugins.withType<JavaPlugin>().configureEach {
         configure<JavaPluginExtension> {
-            modularClasspathHandling.inferModulePath.set(true)
+            modularity.inferModulePath.set(true)
         }
 
         val integrationTest by the<SourceSetContainer>().creating

diff --git a/subprojects/docs/src/samples/java/modules-multi-project/groovy/build.gradle b/subprojects/docs/src/samples/java/modules-multi-project/groovy/build.gradle
@@ -9,7 +9,7 @@ subprojects {
     // tag::inferModulePath[]
     plugins.withType(JavaPlugin).configureEach {
         java {
-            modularClasspathHandling.inferModulePath = true
+            modularity.inferModulePath = true
         }
     }
     // end::inferModulePath[]

diff --git a/subprojects/docs/src/samples/java/modules-multi-project/kotlin/build.gradle.kts b/subprojects/docs/src/samples/java/modules-multi-project/kotlin/build.gradle.kts
@@ -9,7 +9,7 @@ subprojects {
     // tag::inferModulePath[]
     plugins.withType<JavaPlugin>().configureEach {
         configure<JavaPluginExtension> {
-            modularClasspathHandling.inferModulePath.set(true)
+            modularity.inferModulePath.set(true)
         }
     }
     // end::inferModulePath[]

diff --git a/subprojects/docs/src/samples/java/modules-with-transform/groovy/build.gradle b/subprojects/docs/src/samples/java/modules-with-transform/groovy/build.gradle
@@ -27,7 +27,7 @@ subprojects {
 
     plugins.withType(JavaPlugin).configureEach {
         java {
-            modularClasspathHandling.inferModulePath = true
+            modularity.inferModulePath = true
         }
     }
 }
diff --git a/subprojects/docs/src/samples/java/modules-with-transform/kotlin/build.gradle.kts b/subprojects/docs/src/samples/java/modules-with-transform/kotlin/build.gradle.kts
@@ -27,7 +27,7 @@ subprojects {
 
     plugins.withType<JavaPlugin>().configureEach {
         configure<JavaPluginExtension> {
-            modularClasspathHandling.inferModulePath.set(true)
+            modularity.inferModulePath.set(true)
         }
     }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*

		set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


		@rem Execute Gradle
		"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

Expand Down