diff --git a/CHANGELOG.md b/CHANGELOG.md index 3449771e..2214ce35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mock SQL tables - Mock batch file I/O - +## \[0.2.17\] 2025-04-02 +- Made sure we are using the correct encoding ## \[0.2.16\] 2024-12-05 - Fixed a bug an extra space would be added to the list of mocks, which would create issues when looking for mocks. diff --git a/build.gradle b/build.gradle index c898ec02..5561c538 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'jacoco' } -def productVersion = '0.2.16' +def productVersion = '0.2.17' def productName = 'cobol-check' group = 'org.openmainframeproject' description = 'Unit testing framework for Cobol' diff --git a/build/distributions/cobol-check-0.2.17.zip b/build/distributions/cobol-check-0.2.17.zip new file mode 100644 index 00000000..0665270d Binary files /dev/null and b/build/distributions/cobol-check-0.2.17.zip differ diff --git a/src/main/java/org/openmainframeproject/cobolcheck/services/cobolLogic/replace/Replace.java b/src/main/java/org/openmainframeproject/cobolcheck/services/cobolLogic/replace/Replace.java index f1674429..7b547e41 100644 --- a/src/main/java/org/openmainframeproject/cobolcheck/services/cobolLogic/replace/Replace.java +++ b/src/main/java/org/openmainframeproject/cobolcheck/services/cobolLogic/replace/Replace.java @@ -1,5 +1,6 @@ package org.openmainframeproject.cobolcheck.services.cobolLogic.replace; +import org.openmainframeproject.cobolcheck.services.filehelpers.EncodingIO; import org.openmainframeproject.cobolcheck.services.log.Log; import org.openmainframeproject.cobolcheck.services.log.LogLevel; @@ -162,9 +163,9 @@ public static String replaceInProgram(File program) { String newFileName = program+"_MOD"; Log.warn("Replace.replaceInProgram(): Writing the COBOL program file: " + newFileName); try { - BufferedWriter writer = new BufferedWriter(new FileWriter(newFileName)); + BufferedWriter writer = (BufferedWriter) EncodingIO.getWriterWithCorrectEncoding(newFileName); // read the program one line at the time - BufferedReader reader = new BufferedReader(new FileReader(program)); + BufferedReader reader = (BufferedReader) EncodingIO.getReaderWithCorrectEncoding(String.valueOf(program)); //for every line in the program, replace and write to output file String line; int lineCount = 0; diff --git a/src/main/java/org/openmainframeproject/cobolcheck/workers/Initializer.java b/src/main/java/org/openmainframeproject/cobolcheck/workers/Initializer.java index 185d37d8..293c51cf 100644 --- a/src/main/java/org/openmainframeproject/cobolcheck/workers/Initializer.java +++ b/src/main/java/org/openmainframeproject/cobolcheck/workers/Initializer.java @@ -21,7 +21,7 @@ public class Initializer { private StatusController statusController; public Initializer(String[] args) { - Log.info(Messages.get("INF000", "0.2.14")); + Log.info(Messages.get("INF000", "0.2.17")); argumentController = new ArgumentHandlerController(args); environmentController = new EnvironmentSetupController(); statusController = new StatusController(); diff --git a/vs-code-extension/CHANGELOG.md b/vs-code-extension/CHANGELOG.md index 6a210e97..4b87d578 100644 --- a/vs-code-extension/CHANGELOG.md +++ b/vs-code-extension/CHANGELOG.md @@ -2,7 +2,8 @@ All notable changes to the "cobol-unit-test" extension will be documented in this file. Versioning according to SemVer: https://semver.org/ - +## [0.4.11] 02.04.2025 +- Now using COBOL Check version 0.2.17 ## [0.4.10] 26.02.2025 - Now using COBOL Check version 0.2.16 diff --git a/vs-code-extension/Cobol-check/bin/cobol-check-0.2.17.jar b/vs-code-extension/Cobol-check/bin/cobol-check-0.2.17.jar new file mode 100644 index 00000000..de7a4353 Binary files /dev/null and b/vs-code-extension/Cobol-check/bin/cobol-check-0.2.17.jar differ diff --git a/vs-code-extension/client/src/extension.ts b/vs-code-extension/client/src/extension.ts index 1a0480ec..4a369719 100644 --- a/vs-code-extension/client/src/extension.ts +++ b/vs-code-extension/client/src/extension.ts @@ -20,7 +20,7 @@ import { getContentFromFilesystem, MarkdownTestData, TestCase, testData, TestFil let externalVsCodeInstallationDir = vscode.extensions.getExtension("openmainframeproject.cobol-check-extension").extensionPath; let configPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/config.properties'); let defaultConfigPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/default.properties'); -let cobolCheckJarPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/bin/cobol-check-0.2.16.jar'); +let cobolCheckJarPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/bin/cobol-check-0.2.17.jar'); let currentPlatform = getOS(); diff --git a/vs-code-extension/client/src/services/TestTree.ts b/vs-code-extension/client/src/services/TestTree.ts index 586f2e87..cf039d15 100644 --- a/vs-code-extension/client/src/services/TestTree.ts +++ b/vs-code-extension/client/src/services/TestTree.ts @@ -10,7 +10,7 @@ import { handleCobolCheckOut } from '../Helpers/ExtensionHelper'; const textDecoder = new TextDecoder('utf-8'); let externalVsCodeInstallationDir = vscode.extensions.getExtension("openmainframeproject.cobol-check-extension").extensionPath; let configPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/config.properties'); -let cobolCheckJarPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/bin/cobol-check-0.2.16.jar'); +let cobolCheckJarPath = appendPath(externalVsCodeInstallationDir, 'Cobol-check/bin/cobol-check-0.2.17.jar'); diff --git a/vs-code-extension/package.json b/vs-code-extension/package.json index af42e521..9d625278 100644 --- a/vs-code-extension/package.json +++ b/vs-code-extension/package.json @@ -8,7 +8,7 @@ "Snippets" ], "description": "Extension for running unit tests in Cobol", - "version": "0.4.10", + "version": "0.4.11", "icon": "images/cobol-check-logo-small.png", "repository": { "type": "git", @@ -40,7 +40,7 @@ } ], "description": "Extension for running unit tests in Cobol", - "version": "0.4.10", + "version": "0.4.11", "icon": "images/cobol-check-logo-small.png", "repository": { "type": "git",