File tree Expand file tree Collapse file tree 1 file changed +13
-6
lines changed Expand file tree Collapse file tree 1 file changed +13
-6
lines changed Original file line number Diff line number Diff line change 2323 swift_version : ['6.1.2']
2424 os_version : ['jammy']
2525 jdk_vendor : ['corretto']
26- jdk_version : ['21']
26+ jdk_version : | # install JDK21 for Gradle to use, and 24 for our runtime; 21 must be last to be "default" JAVA_HOME
27+ 24
28+ 21
2729 container :
2830 image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
2931 env :
4951 swift_version : ['6.1.2']
5052 os_version : ['macos']
5153 jdk_vendor : ['corretto']
52- jdk_version : ['21']
54+ jdk_version : ['24']
55+ jdk_version_gradle : ['21']
5356 env :
5457 JAVA_HOME : " /usr/lib/jvm/default-jdk"
5558 SWIFT_JAVA_VERBOSE : true
7376 swift_version : ['6.1.2']
7477 os_version : ['jammy']
7578 jdk_vendor : ['corretto']
76- jdk_version : ['21']
79+ jdk_version : ['24']
80+ jdk_version_gradle : ['21']
7781 container :
7882 image : ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
7983 env :
97101 swift_version : ['6.1.2']
98102 os_version : ['macos']
99103 jdk_vendor : ['corretto']
100- jdk_version : ['21']
104+ jdk_version : ['24']
105+ jdk_version_gradle : ['21']
101106 env :
102107 JAVA_HOME : " /usr/lib/jvm/default-jdk"
103108 SWIFT_JAVA_VERBOSE : true
@@ -119,7 +124,8 @@ jobs:
119124 swift_version : ['6.1.2']
120125 os_version : ['jammy']
121126 jdk_vendor : ['corretto']
122- jdk_version : ['21']
127+ jdk_version : ['24']
128+ jdk_version_gradle : ['21']
123129 sample_app : [
124130 ' JavaDependencySampleApp' ,
125131 ' JavaKitSampleApp' ,
@@ -148,7 +154,8 @@ jobs:
148154 swift_version : ['6.1.2']
149155 os_version : ['macos']
150156 jdk_vendor : ['corretto']
151- jdk_version : ['21']
157+ jdk_version : ['24']
158+ jdk_version_gradle : ['21']
152159 sample_app : [
153160 ' JavaDependencySampleApp' ,
154161 ' JavaKitSampleApp' ,
You can’t perform that action at this time.
0 commit comments