GP-4122: Switching to JDK 21

This commit is contained in:
Ryan Kurtz 2024-04-18 08:28:52 -04:00
parent 8b03bd1962
commit 966e6fddf3
4 changed files with 14 additions and 13 deletions

View File

@ -2,8 +2,8 @@ application.name=Ghidra
application.version=11.2 application.version=11.2
application.release.name=DEV application.release.name=DEV
application.layout.version=2 application.layout.version=2
application.gradle.min=7.3 application.gradle.min=8.5
application.gradle.max= application.gradle.max=
application.java.min=17 application.java.min=21
application.java.max= application.java.max=
application.java.compiler=17 application.java.compiler=21

View File

@ -19,7 +19,7 @@
<h1>Ghidra Installation Guide</h1> <h1>Ghidra Installation Guide</h1>
<p> <p>
The installation information provided is effective as of Ghidra 11.1 and is subject to change with The installation information provided is effective as of Ghidra 11.2 and is subject to change with
future releases. future releases.
</p> </p>
@ -84,16 +84,16 @@ Ghidra team if you have a specific need.</p></blockquote>
</ul> </ul>
<h3>Software</h3> <h3>Software</h3>
<ul> <ul>
<li>Java 17 64-bit Runtime and Development Kit (JDK) (see <a href="#JavaNotes">Java Notes</a>)</li> <li>Java 21 64-bit Runtime and Development Kit (JDK) (see <a href="#JavaNotes">Java Notes</a>)</li>
<ul> <ul>
<li>Free long term support (LTS) versions of JDK 17 are provided by:</li> <li>Free long term support (LTS) versions of JDK 21 are provided by:</li>
<ul> <ul>
<li> <li>
<a href="https://adoptium.net/temurin/releases"> <a href="https://adoptium.net/temurin/releases">
Adoptium Temurin</a> Adoptium Temurin</a>
</li> </li>
<li> <li>
<a href="https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html"> <a href="https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/downloads-list.html">
Amazon Corretto</a> Amazon Corretto</a>
</li> </li>
</ul> </ul>
@ -335,7 +335,7 @@ In order to build native binaries for your platform, you will need the following
system:</p> system:</p>
<ul> <ul>
<li>A <a href="#Requirements">supported</a> version of a Java Development Kit</li> <li>A <a href="#Requirements">supported</a> version of a Java Development Kit</li>
<li><a href="https://gradle.org/releases/">Gradle 7.3+</a></li> <li><a href="https://gradle.org/releases/">Gradle 8.5+</a></li>
<li>Software C/C++ build tools and library packages</li> <li>Software C/C++ build tools and library packages</li>
<ul> <ul>
<li>macOS: <I>Xcode</I> or the abbreviated <I>Command Line Tools for Xcode</I> will supply the <li>macOS: <I>Xcode</I> or the abbreviated <I>Command Line Tools for Xcode</I> will supply the

View File

@ -29,7 +29,7 @@ of how you might be impacted.
## Install ## Install
To install an official pre-built multi-platform Ghidra release: To install an official pre-built multi-platform Ghidra release:
* Install [JDK 17 64-bit][jdk17] * Install [JDK 21 64-bit][jdk]
* Download a Ghidra [release file][releases] * Download a Ghidra [release file][releases]
- **NOTE:** The official multi-platform release file is named - **NOTE:** The official multi-platform release file is named
`ghidra_<version>_<release>_<date>.zip` which can be found under the "Assets" drop-down. `ghidra_<version>_<release>_<date>.zip` which can be found under the "Assets" drop-down.
@ -46,8 +46,8 @@ directory.
To create the latest development build for your platform from this source repository: To create the latest development build for your platform from this source repository:
##### Install build tools: ##### Install build tools:
* [JDK 17 64-bit][jdk17] * [JDK 21 64-bit][jdk]
* [Gradle 7.3+][gradle] * [Gradle 8.5+][gradle]
* [Python3][python3] (version 3.7 to 3.12) with bundled pip * [Python3][python3] (version 3.7 to 3.12) with bundled pip
* make, gcc, and g++ (Linux/macOS-only) * make, gcc, and g++ (Linux/macOS-only)
* [Microsoft Visual Studio][vs] 2017+ or [Microsoft C++ Build Tools][vcbuildtools] with the * [Microsoft Visual Studio][vs] 2017+ or [Microsoft C++ Build Tools][vcbuildtools] with the
@ -127,7 +127,7 @@ source project.
[known-issues]: DevGuide.md#known-issues [known-issues]: DevGuide.md#known-issues
[career]: https://www.intelligencecareers.gov/nsa [career]: https://www.intelligencecareers.gov/nsa
[releases]: https://github.com/NationalSecurityAgency/ghidra/releases [releases]: https://github.com/NationalSecurityAgency/ghidra/releases
[jdk17]: https://adoptium.net/temurin/releases [jdk]: https://adoptium.net/temurin/releases
[gradle]: https://gradle.org/releases/ [gradle]: https://gradle.org/releases/
[python3]: https://www.python.org/downloads/ [python3]: https://www.python.org/downloads/
[vs]: https://visualstudio.microsoft.com/vs/community/ [vs]: https://visualstudio.microsoft.com/vs/community/

View File

@ -21,9 +21,10 @@ apply from: "gradle/support/loadApplicationProperties.gradle"
/*************************************************************************************** /***************************************************************************************
* Print current Gradle version and make sure the correct version of gradle is being used * Print current Java and Gradle version and make sure the correct version of gradle is being used
***************************************************************************************/ ***************************************************************************************/
import org.gradle.util.GradleVersion; import org.gradle.util.GradleVersion;
println "Java: " + JavaVersion.current()
println "Gradle: " + GradleVersion.current().version println "Gradle: " + GradleVersion.current().version
checkGradleVersion() checkGradleVersion()