GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1985 Update to JDK 23 (#1987)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-09-20 09:33:36 -04:00
committed by GitHub
parent b1229b6971
commit 5d4dff7948
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/gradle.yml vendored
View File

@@ -22,10 +22,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up JDK 22 - name: Set up JDK 23
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: '22' java-version: '23'
distribution: 'liberica' distribution: 'liberica'
java-package: 'jdk+fx' java-package: 'jdk+fx'
- name: Build with Gradle - name: Build with Gradle

4
.github/workflows/nightly.yml vendored
View File

@@ -15,10 +15,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up JDK 22 - name: Set up JDK 23
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: '22' java-version: '23'
distribution: 'liberica' distribution: 'liberica'
java-package: 'jdk+fx' java-package: 'jdk+fx'

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" /> <file type="web" url="file://$PROJECT_DIR$" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_22_PREVIEW" project-jdk-name="liberica-22" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_23_PREVIEW" project-jdk-name="liberica-23" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

8
build.gradle
View File

@@ -58,10 +58,10 @@ repositories {
//Version is defined in gradle.properties so that we can CLI override it for nightly builds. //Version is defined in gradle.properties so that we can CLI override it for nightly builds.
version = project.findProperty('projectVersion') version = project.findProperty('projectVersion')
//Java 22 is required for this version of the Project Panama preview/incubator feature //Java 23 is required for this version of the Project Panama preview/incubator feature
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(22) languageVersion = JavaLanguageVersion.of(23)
} }
} }
@@ -126,7 +126,7 @@ dependencies {
def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem
/** /**
* This is needed for the JDK22 vector API ... until it moves out of incubation or preview * This is needed for the JDK23 vector API ... until it moves out of incubation or preview
*/ */
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator
@@ -207,7 +207,7 @@ String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-22.0.2-full'
/** /**
* Download URLs to download the JDK as part of the gradle build packaging process * Download URLs to download the JDK as part of the gradle build packaging process
*/ */
def jdk_download_base = "https://download.bell-sw.com/java/22.0.2+11/bellsoft-jdk22.0.2+11-" def jdk_download_base = "https://download.bell-sw.com/java/23+38/bellsoft-jdk23+38-"
def jdk_download_suffix = "-full.tar.gz" def jdk_download_suffix = "-full.tar.gz"
def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix
def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix