Merge pull request #37 from cicoyle/fix-release-1.5.8

cicoyle · web-flow · commit 02950a896d37 · 2025-07-31T15:44:53.000-05:00
Fix release pipeline: use java 11 everywhere
diff --git a/azurefunctions/build.gradle b/azurefunctions/build.gradle
@@ -24,8 +24,8 @@ dependencies {
     compileOnly "com.microsoft.azure.functions:azure-functions-java-spi:1.0.0"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 publishing {
     repositories {
diff --git a/azuremanaged/build.gradle b/azuremanaged/build.gradle
@@ -49,15 +49,13 @@ dependencies {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 compileTestJava {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
-    options.fork = true
-    options.forkOptions.executable = "${PATH_TO_TEST_JAVA_RUNTIME}/bin/javac"
 }
 
 test {
diff --git a/endtoendtests/build.gradle b/endtoendtests/build.gradle
@@ -26,8 +26,8 @@ dependencies {
 
 }
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+sourceCompatibility = '11'
+targetCompatibility = '11'
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/samples-azure-functions/build.gradle b/samples-azure-functions/build.gradle
@@ -26,8 +26,8 @@ dependencies {
 
 }
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+sourceCompatibility = '11'
+targetCompatibility = '11'
 
 compileJava.options.encoding = 'UTF-8'
 

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ dependencies {`
`24`	`24`	`compileOnly "com.microsoft.azure.functions:azure-functions-java-spi:1.0.0"`
`25`	`25`	`}`
`26`	`26`
`27`		`-sourceCompatibility = JavaVersion.VERSION_1_8`
`28`		`-targetCompatibility = JavaVersion.VERSION_1_8`
	`27`	`+sourceCompatibility = JavaVersion.VERSION_11`
	`28`	`+targetCompatibility = JavaVersion.VERSION_11`
`29`	`29`
`30`	`30`	`publishing {`
`31`	`31`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,13 @@ dependencies {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`compileJava {`
`52`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`53`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`52`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`53`	`+ targetCompatibility = JavaVersion.VERSION_11`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`compileTestJava {`
`57`	`57`	`sourceCompatibility = JavaVersion.VERSION_11`
`58`	`58`	`targetCompatibility = JavaVersion.VERSION_11`
`59`		`- options.fork = true`
`60`		`- options.forkOptions.executable = "${PATH_TO_TEST_JAVA_RUNTIME}/bin/javac"`
`61`	`59`	`}`
`62`	`60`
`63`	`61`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ dependencies {`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
`29`		`-sourceCompatibility = '1.8'`
`30`		`-targetCompatibility = '1.8'`
	`29`	`+sourceCompatibility = '11'`
	`30`	`+targetCompatibility = '11'`
`31`	`31`
`32`	`32`	`compileJava.options.encoding = 'UTF-8'`
`33`	`33`