Fix Android CI build issues (#587)

* Update JDK version to 17 in ci.yml * Update com.diffplug.spotless to 6.22.0. * Update to JDK 17 in packaging pipelines. * Fix pool name.
microsoft · Oct 31, 2023 · 2aeca72 · 2aeca72
1 parent 6469620
commit 2aeca72
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.pipelines/android_packaging.yml b/.pipelines/android_packaging.yml
@@ -17,9 +17,9 @@ jobs:
         displayName: "Use Python 3.9"
 
       - task: JavaToolInstaller@0
-        displayName: Use jdk 11
+        displayName: Use jdk 17
         inputs:
-          versionSpec: "11"
+          versionSpec: "17"
           jdkArchitectureOption: "x64"
           jdkSourceOption: "PreInstalled"
 

diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml
@@ -512,9 +512,9 @@ stages:
       displayName: "Use Python 3.9"
 
     - task: JavaToolInstaller@0
-      displayName: Use jdk 11
+      displayName: Use jdk 17
       inputs:
-        versionSpec: '11'
+        versionSpec: '17'
         jdkArchitectureOption: 'x64'
         jdkSourceOption: 'PreInstalled'
 
@@ -561,9 +561,9 @@ stages:
         displayName: "Use Python 3.9"
 
       - task: JavaToolInstaller@0
-        displayName: Use jdk 11
+        displayName: Use jdk 17
         inputs:
-          versionSpec: '11'
+          versionSpec: '17'
           jdkArchitectureOption: 'x64'
           jdkSourceOption: 'PreInstalled'
 

diff --git a/.pipelines/templates/android-shared-lib-build.yml b/.pipelines/templates/android-shared-lib-build.yml
@@ -34,9 +34,9 @@ jobs:
         displayName: "Use Python 3.9"
 
       - task: JavaToolInstaller@0
-        displayName: Use jdk 11
+        displayName: Use jdk 17
         inputs:
-          versionSpec: "11"
+          versionSpec: "17"
           jdkArchitectureOption: "x64"
           jdkSourceOption: "PreInstalled"
 

diff --git a/.pipelines/templates/build-package-for-android-aar.yml b/.pipelines/templates/build-package-for-android-aar.yml
@@ -52,9 +52,9 @@ stages:
         architecture: "x64"
       displayName: "Use Python 3.9"
     - task: JavaToolInstaller@0
-      displayName: Use jdk 11
+      displayName: Use jdk 17
       inputs:
-        versionSpec: "11"
+        versionSpec: "17"
         jdkArchitectureOption: "x64"
         jdkSourceOption: "PreInstalled"
     - task: DownloadPipelineArtifact@2

diff --git a/.pipelines/templates/build-package-for-nuget.yml b/.pipelines/templates/build-package-for-nuget.yml
@@ -55,7 +55,7 @@ stages:
   - template: build-package-for-linux.yml
     parameters:
       OrtExtensionsArch: 'aarch64'
-      PoolName: 'aiinfra-linux-ARM64-CPU-2019'
+      PoolName: 'onnxruntime-linux-ARM64-CPU-2019'
       IsReleaseBuild: ${{parameters.IsReleaseBuild}}
       OrtExtensionsCFlags: ''
       OrtExtensionsCXXFlags: ''

diff --git a/java/build.gradle b/java/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.diffplug.spotless' version '5.17.0'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 allprojects {