svn commit: r1907809 - in /poi/trunk: build.gradle gradle/wrapper/gradle-wrapper.properties poi-integration/build.gradle poi-ooxml-lite-agent/build.gradle poi-ooxml-lite/build.gradle

[fanningpj]

Author: fanningpj
Date: Wed Feb 22 20:31:47 2023
New Revision: 1907809

URL: http://svn.apache.org/viewvc?rev=1907809&view=rev
Log:
try to fix gradle issues

Modified:
    poi/trunk/build.gradle
    poi/trunk/gradle/wrapper/gradle-wrapper.properties
    poi/trunk/poi-integration/build.gradle
    poi/trunk/poi-ooxml-lite-agent/build.gradle
    poi/trunk/poi-ooxml-lite/build.gradle

Modified: poi/trunk/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1907809&r1=1907808&r2=1907809&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Wed Feb 22 20:31:47 2023
@@ -182,8 +182,8 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-            if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+            languageVersion = JavaLanguageVersion.of(jdkVersion)
+            if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
         }
         withJavadocJar()
         withSourcesJar()
@@ -268,8 +268,8 @@ subprojects {
         }
 
         javaLauncher = javaToolchains.launcherFor {
-            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-            if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+            languageVersion = JavaLanguageVersion.of(jdkVersion)
+            if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
         }
 
         // Exclude some tests that are not actually tests or do not run 
cleanly on purpose

Modified: poi/trunk/gradle/wrapper/gradle-wrapper.properties
URL: 
http://svn.apache.org/viewvc/poi/trunk/gradle/wrapper/gradle-wrapper.properties?rev=1907809&r1=1907808&r2=1907809&view=diff
==============================================================================
--- poi/trunk/gradle/wrapper/gradle-wrapper.properties (original)
+++ poi/trunk/gradle/wrapper/gradle-wrapper.properties Wed Feb 22 20:31:47 2023
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Modified: poi/trunk/poi-integration/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-integration/build.gradle?rev=1907809&r1=1907808&r2=1907809&view=diff
==============================================================================
--- poi/trunk/poi-integration/build.gradle (original)
+++ poi/trunk/poi-integration/build.gradle Wed Feb 22 20:31:47 2023
@@ -92,8 +92,8 @@ final String OOXML_LITE_INCLUDES = "^(co
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-        if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
 }
 

Modified: poi/trunk/poi-ooxml-lite-agent/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/build.gradle?rev=1907809&r1=1907808&r2=1907809&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite-agent/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite-agent/build.gradle Wed Feb 22 20:31:47 2023
@@ -31,8 +31,8 @@ final MODULE_NAME = 'org.apache.poi.ooxm
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-        if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
 }
 

Modified: poi/trunk/poi-ooxml-lite/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite/build.gradle?rev=1907809&r1=1907808&r2=1907809&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite/build.gradle Wed Feb 22 20:31:47 2023
@@ -83,8 +83,8 @@ task compileOoxmlLite(type: Copy) {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-        if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org