From 55c7a96687907b44e15d0179f95a23b7ca1b8388 Mon Sep 17 00:00:00 2001 From: Joel Anderson Date: Fri, 19 Dec 2025 21:10:39 -0500 Subject: [PATCH 1/3] upgrade dependencies and fix help --- CHANGELOG.md | 7 +++++++ build.gradle | 10 +++++----- src/main/help/help/TOC_Source.xml | 12 ++++++------ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4c7e43..560ec30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [5.1.0] - 2025-12-20 +### Changed + - Upgrade to JRuby 10.0.2.0 (Ruby 3.4.2) + - Upgrade to Clojure 1.12.4 + - Upgrade to Groovy 4.0.29 + - Upgrade to Kotlin 2.3.0 + ## [5.0.0] - 2025-04-25 ### Changed - Upgrade to JRuby 10.0.0.0 (Ruby 3.4.2) diff --git a/build.gradle b/build.gradle index f75d810..8269a07 100644 --- a/build.gradle +++ b/build.gradle @@ -19,12 +19,12 @@ plugins { } dependencies { - implementation('org.jruby:jruby-complete:10.0.0.0') - implementation('org.clojure:clojure:1.12.0') - implementation('org.apache.groovy:groovy:4.0.26') - implementation('org.apache.groovy:groovy-groovysh:4.0.26') + implementation('org.jruby:jruby-complete:10.0.2.0') + implementation('org.clojure:clojure:1.12.4') + implementation('org.apache.groovy:groovy:4.0.29') + implementation('org.apache.groovy:groovy-groovysh:4.0.29') testImplementation('junit:junit:4.13.2') - runtimeOnly('org.jetbrains.kotlin:kotlin-scripting-jsr223:2.1.20') + runtimeOnly('org.jetbrains.kotlin:kotlin-scripting-jsr223:2.3.0') } test { diff --git a/src/main/help/help/TOC_Source.xml b/src/main/help/help/TOC_Source.xml index 4415b50..3f30ed3 100644 --- a/src/main/help/help/TOC_Source.xml +++ b/src/main/help/help/TOC_Source.xml @@ -51,13 +51,13 @@ - + - - - - - + + + + + From 8068c67eef0bec536fda8b3c9482f9e1d88f3adb Mon Sep 17 00:00:00 2001 From: Joel Anderson Date: Sat, 20 Dec 2025 05:45:01 -0500 Subject: [PATCH 2/3] update ghidra and actions in ci --- .github/workflows/build.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ad4c02..1884aed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,30 +12,20 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - ghidra: ["11.3", "11.3.1", "11.3.2"] + ghidra: ["12.0"] include: - - ghidra: "11.3" - ghidra-url: "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.3_build/ghidra_11.3_PUBLIC_20250205.zip" - ghidra-sha256: "73b42cec587f370bfef49809ae55d2c7a3db689e8f164a1e7d7b8de295b6359f" - ghidra-filename: "ghidra_11.3_PUBLIC_20250205.zip" - ghidra-folder: "ghidra_11.3_PUBLIC" - - ghidra: "11.3.1" - ghidra-url: "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.3.1_build/ghidra_11.3.1_PUBLIC_20250219.zip" - ghidra-sha256: "bcda0a9de8993444766cc255964c65c042b291ddaf6c50d654e316e442b441fa" - ghidra-filename: "ghidra_11.3.1_PUBLIC_20250219.zip" - ghidra-folder: "ghidra_11.3.1_PUBLIC" - - ghidra: "11.3.2" - ghidra-url: "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.3.2_build/ghidra_11.3.2_PUBLIC_20250415.zip" - ghidra-sha256: "99d45035bdcc3d6627e7b1232b7b379905a9fad76c772c920602e2b5d8b2dac2" - ghidra-filename: "ghidra_11.3.2_PUBLIC_20250415.zip" - ghidra-folder: "ghidra_11.3.2_PUBLIC" + - ghidra: "12.0" + ghidra-url: "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_12.0_build/ghidra_12.0_PUBLIC_20251205.zip" + ghidra-sha256: "af43e8cfb2fa4490cf6020c3a2bde25c159d83f45236a0542688a024e8fc1941" + ghidra-filename: "ghidra_12.0_PUBLIC_20251205.zip" + ghidra-folder: "ghidra_12.0_PUBLIC" env: GHIDRA_INSTALL_DIR: /home/runner/ghidra/${{ matrix.ghidra-folder }} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Cache Ghidra - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1 id: cache-ghidra with: path: ~/ghidra @@ -46,7 +36,7 @@ jobs: wget -q ${{ matrix.ghidra-url }} echo "${{ matrix.ghidra-sha256 }} ${{ matrix.ghidra-filename }}" | sha256sum -c unzip ${{ matrix.ghidra-filename }} -d ~/ghidra - - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 + - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0 with: distribution: "temurin" java-version: "21" From b85126ab234ab69c57efb1d5b916828de48832b2 Mon Sep 17 00:00:00 2001 From: Joel Anderson Date: Sat, 20 Dec 2025 05:52:35 -0500 Subject: [PATCH 3/3] update expected output --- src/test/resources/expected/GhidraBasicsScript.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/expected/GhidraBasicsScript.txt b/src/test/resources/expected/GhidraBasicsScript.txt index 0fe6f70..7124b59 100644 --- a/src/test/resources/expected/GhidraBasicsScript.txt +++ b/src/test/resources/expected/GhidraBasicsScript.txt @@ -18,7 +18,7 @@ Catch_All@004011b0 FUN_004011d0 FUN_00401230 FUN_004012a0 -FUN_004012ea +__security_check_cookie FUN_004013bd entry FUN_00401549