diff --git a/.gitattributes b/.gitattributes
index d72b02d6..db282ac7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,12 +1,10 @@
# Declare files that will always have CRLF line endings on checkout.
-gpl-3.0.txt text eol=lf
-LICENSE_windows.txt text eol=crlf
-libraries_used.txt text eol=lf
-libraries_used_windows.txt text eol=crlf
+/dist/windows/files/LICENSE text eol=crlf
+/libraries_used.txt text eol=lf
+/dist/windows/files/libraries_used.txt text eol=crlf
gradlew.bat text eol=crlf
gradlew text eol=lf
# Tell GitHub’s linguist which files to ignore
-gradle/InnoSetup6/* linguist-vendored
gradlew linguist-vendored
gradlew.bat linguist-vendored
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e723966..241dbbb2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
- java-version: '20'
+ java-version: '21'
distribution: 'zulu'
- name: Install Linux dependencies
run: sudo apt-get install libplist-dev libimobiledevice-dev libirecovery-1.0-dev
@@ -24,6 +24,7 @@ jobs:
uses: gradle/gradle-build-action@v2
with:
arguments: build --no-daemon --scan
+ dependency-graph: generate-and-submit
- uses: initdc/upload-artifact@feat/artifact-per-file
with:
artifact-per-file: true
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index bb6722a9..cb507494 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,11 +2,11 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cc2a995c..87077e4e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/Main__Linux_.xml b/.idea/runConfigurations/Main__Linux_.xml
index 58818437..fc9e596b 100644
--- a/.idea/runConfigurations/Main__Linux_.xml
+++ b/.idea/runConfigurations/Main__Linux_.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/.idea/runConfigurations/Main__Windows_.xml b/.idea/runConfigurations/Main__Windows_.xml
index 2f83c151..7a86b146 100644
--- a/.idea/runConfigurations/Main__Windows_.xml
+++ b/.idea/runConfigurations/Main__Windows_.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/.idea/runConfigurations/Main__macOS_.xml b/.idea/runConfigurations/Main__macOS_.xml
index bcfe439b..3ec0e5db 100644
--- a/.idea/runConfigurations/Main__macOS_.xml
+++ b/.idea/runConfigurations/Main__macOS_.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/README.md b/README.md
index 87a21d51..d03ac897 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ bugs/problems or have a feature request.
## Built With
-- JDK 20
+- JDK 21
- [IntelliJ Idea](https://www.jetbrains.com/idea/)
- [Gradle](https://gradle.org/)
- [JLink Plugin](https://github.com/beryx/badass-jlink-plugin)
diff --git a/build.gradle b/build.gradle
index 4ff7274d..2b0124aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,9 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
plugins {
id 'application'
- id 'com.github.ben-manes.versions' version '0.46.0'
- id 'org.beryx.jlink' version '2.26.0'
+ id 'com.github.ben-manes.versions' version '0.48.0'
+ id 'org.beryx.jlink' version '3.0.0'
id 'org.openjfx.javafxplugin' version '0.1.0'
- id 'org.javamodularity.moduleplugin' version '1.8.12'
id 'idea'
}
@@ -37,11 +36,11 @@ version = '3.5.2'
description = 'A cross-platform GUI and CLI app for saving SHSH blobs'
String appIdentifier = 'airsquared.blobsaver.app'
String copyright = 'Copyright (c) 2023 airsquared'
-def os = DefaultNativePlatform.currentOperatingSystem
+var os = DefaultNativePlatform.currentOperatingSystem
startScripts.enabled = distZip.enabled = distTar.enabled = false
-java.toolchain.languageVersion = JavaLanguageVersion.of(20)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
repositories {
mavenCentral()
@@ -57,28 +56,29 @@ dependencies {
implementation 'info.picocli:picocli:4.7.5'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'org.testfx:openjfx-monocle:jdk-12.0.1+2'
}
javafx {
- version = '20'
+ version = '21'
modules = [ 'javafx.controls', 'javafx.fxml' ]
}
-def addExports = ['--add-exports=javafx.graphics/com.sun.javafx.css=airsquared.blobsaver', '--add-exports=java.base/jdk.internal.misc=airsquared.blobsaver']
+var addExports = '--add-exports=javafx.graphics/com.sun.javafx.css=airsquared.blobsaver'
compileJava {
- options.compilerArgs.addAll addExports
+ options.compilerArgs.add addExports
}
application {
mainModule = 'airsquared.blobsaver'
mainClass = 'airsquared.blobsaver.app.Main'
- applicationDefaultJvmArgs.addAll addExports
+ applicationDefaultJvmArgs.add addExports
}
private String getJarDirectory() {
- String dir = ''
+ var dir = ''
if (DefaultNativePlatform.currentOperatingSystem.isMacOsX()) dir = 'macos/Contents'
else if (DefaultNativePlatform.currentOperatingSystem.isWindows()) dir = 'windows/files'
else if (DefaultNativePlatform.currentOperatingSystem.isLinux()) dir = 'linux'
@@ -86,14 +86,12 @@ private String getJarDirectory() {
}
run {
- systemProperty 'jar.directory', getJarDirectory()
+ systemProperty 'jar.directory', jarDirectory
}
test {
useJUnitPlatform()
- systemProperty 'jar.directory', getJarDirectory()
- jvmArgs addExports
- jvmArgs '--add-exports=javafx.graphics/com.sun.glass.ui=org.testfx.monocle'
+ systemProperty 'jar.directory', jarDirectory
}
jlink {
@@ -102,8 +100,7 @@ jlink {
'--dedup-legal-notices=error-if-not-same-content'
}
launcher {
- jvmArgs = [ '-Djar.directory={{BIN_DIR}}' ]
- jvmArgs.addAll addExports
+ jvmArgs = [ '-Djar.directory={{BIN_DIR}}', addExports ]
if (findProperty('noConsole') != 'false') {
noConsole = true
}
@@ -116,29 +113,29 @@ jlink {
if (os.isMacOsX()) {
installerType = 'dmg'
- String arch = DefaultNativePlatform.currentArchitecture.amd64 ? 'intel' : 'arm'
+ var arch = DefaultNativePlatform.currentArchitecture.amd64 ? 'intel' : 'arm'
installerName = "${name}-${arch}"
- imageOptions.addAll '--mac-package-identifier', appIdentifier
+ //noinspection GroovyAssignabilityCheck
+ imageOptions.addAll '--mac-package-identifier', appIdentifier,
+ '--app-content', "${projectDir}/dist/macos/Contents/Frameworks," +
+ "${projectDir}/dist/macos/Contents/MacOS"
icon = "${projectDir}/dist/macos/Contents/Resources/blob.icns"
} else if (os.isWindows()) {
installerOptions.addAll '--win-dir-chooser', '--win-menu', '--win-shortcut'
icon = "${projectDir}/dist/windows/blob.ico"
+ imageOptions.addAll '--app-content', fileTree("${projectDir}/dist/windows/files").join(',')
} else {
installerOptions.addAll '--linux-shortcut', '--linux-menu-group', 'Utility;Archiving;Java',
'--linux-rpm-license-type', 'GPLv3'
- icon = "${projectDir}/src/main/resources/airsquared/blobsaver/app/blob_emoji.png"
+ icon = "${projectDir}/src/main/resources/airsquared/blobsaver/app/blob.png"
+ imageOptions.addAll '--app-content', fileTree("${projectDir}/dist/linux").join(',') + ',' +
+ "${projectDir}/LICENSE,${projectDir}/libraries_used.txt"
}
if (findProperty('installerType') != null) {
installerType = findProperty('installerType')
}
}
if (os.isMacOsX()) jpackageImage.doLast {
- copy {
- from "${projectDir}/dist/macos/Contents/MacOS" into layout.buildDirectory.dir('jpackage/blobsaver.app/Contents/MacOS')
- }
- copy {
- from "${projectDir}/dist/macos/Contents/Frameworks" into layout.buildDirectory.dir('jpackage/blobsaver.app/Contents/Frameworks')
- }
copy {
from "${projectDir}/LICENSE", "${projectDir}/libraries_used.txt"
into layout.buildDirectory.dir('jpackage/blobsaver.app/Contents/Resources')
@@ -146,18 +143,6 @@ jlink {
exec { // needed to prevent "application is damaged" error when opening quarantined app
commandLine 'codesign', '--force', '--deep', '--sign', '-', "${layout.buildDirectory.get()}/jpackage/blobsaver.app"
}
- } else if (os.isWindows()) jpackageImage.doLast {
- copy {
- from "${projectDir}/dist/windows/files", layout.buildDirectory.dir('jpackage/blobsaver/runtime/bin/zip.dll')
- rename 'LICENSE_windows', 'LICENSE'
- rename 'libraries_used_windows.txt', 'libraries_used.txt'
- into layout.buildDirectory.dir('jpackage/blobsaver')
- }
- } else jpackageImage.doLast {
- copy {
- from "${projectDir}/dist/linux", "${projectDir}/LICENSE", "${projectDir}/libraries_used.txt"
- into layout.buildDirectory.dir('jpackage/blobsaver/lib')
- }
}
}
diff --git a/dist/windows/files/LICENSE_windows b/dist/windows/files/LICENSE
similarity index 100%
rename from dist/windows/files/LICENSE_windows
rename to dist/windows/files/LICENSE
diff --git a/dist/windows/files/libraries_used_windows.txt b/dist/windows/files/libraries_used.txt
similarity index 100%
rename from dist/windows/files/libraries_used_windows.txt
rename to dist/windows/files/libraries_used.txt
diff --git a/gradle/InnoSetup6/Default.isl b/gradle/InnoSetup6/Default.isl
deleted file mode 100644
index fe047d89..00000000
--- a/gradle/InnoSetup6/Default.isl
+++ /dev/null
@@ -1,364 +0,0 @@
-; *** Inno Setup version 6.0.3+ English messages ***
-;
-; To download user-contributed translations of this file, go to:
-; https://jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=English
-LanguageID=$0409
-LanguageCodePage=0
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
-;DialogFontSize=8
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Setup
-SetupWindowTitle=Setup - %1
-UninstallAppTitle=Uninstall
-UninstallAppFullTitle=%1 Uninstall
-
-; *** Misc. common
-InformationTitle=Information
-ConfirmTitle=Confirm
-ErrorTitle=Error
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=This will install %1. Do you wish to continue?
-LdrCannotCreateTemp=Unable to create a temporary file. Setup aborted
-LdrCannotExecTemp=Unable to execute file in the temporary directory. Setup aborted
-HelpTextNote=
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nError %2: %3
-SetupFileMissing=The file %1 is missing from the installation directory. Please correct the problem or obtain a new copy of the program.
-SetupFileCorrupt=The setup files are corrupted. Please obtain a new copy of the program.
-SetupFileCorruptOrWrongVer=The setup files are corrupted, or are incompatible with this version of Setup. Please correct the problem or obtain a new copy of the program.
-InvalidParameter=An invalid parameter was passed on the command line:%n%n%1
-SetupAlreadyRunning=Setup is already running.
-WindowsVersionNotSupported=This program does not support the version of Windows your computer is running.
-WindowsServicePackRequired=This program requires %1 Service Pack %2 or later.
-NotOnThisPlatform=This program will not run on %1.
-OnlyOnThisPlatform=This program must be run on %1.
-OnlyOnTheseArchitectures=This program can only be installed on versions of Windows designed for the following processor architectures:%n%n%1
-WinVersionTooLowError=This program requires %1 version %2 or later.
-WinVersionTooHighError=This program cannot be installed on %1 version %2 or later.
-AdminPrivilegesRequired=You must be logged in as an administrator when installing this program.
-PowerUserPrivilegesRequired=You must be logged in as an administrator or as a member of the Power Users group when installing this program.
-SetupAppRunningError=Setup has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
-UninstallAppRunningError=Uninstall has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
-
-; *** Startup questions
-PrivilegesRequiredOverrideTitle=Select Setup Install Mode
-PrivilegesRequiredOverrideInstruction=Select install mode
-PrivilegesRequiredOverrideText1=%1 can be installed for all users (requires administrative privileges), or for you only.
-PrivilegesRequiredOverrideText2=%1 can be installed for you only, or for all users (requires administrative privileges).
-PrivilegesRequiredOverrideAllUsers=Install for &all users
-PrivilegesRequiredOverrideAllUsersRecommended=Install for &all users (recommended)
-PrivilegesRequiredOverrideCurrentUser=Install for &me only
-PrivilegesRequiredOverrideCurrentUserRecommended=Install for &me only (recommended)
-
-; *** Misc. errors
-ErrorCreatingDir=Setup was unable to create the directory "%1"
-ErrorTooManyFilesInDir=Unable to create a file in the directory "%1" because it contains too many files
-
-; *** Setup common messages
-ExitSetupTitle=Exit Setup
-ExitSetupMessage=Setup is not complete. If you exit now, the program will not be installed.%n%nYou may run Setup again at another time to complete the installation.%n%nExit Setup?
-AboutSetupMenuItem=&About Setup...
-AboutSetupTitle=About Setup
-AboutSetupMessage=%1 version %2%n%3%n%n%1 home page:%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< &Back
-ButtonNext=&Next >
-ButtonInstall=&Install
-ButtonOK=OK
-ButtonCancel=Cancel
-ButtonYes=&Yes
-ButtonYesToAll=Yes to &All
-ButtonNo=&No
-ButtonNoToAll=N&o to All
-ButtonFinish=&Finish
-ButtonBrowse=&Browse...
-ButtonWizardBrowse=B&rowse...
-ButtonNewFolder=&Make New Folder
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Select Setup Language
-SelectLanguageLabel=Select the language to use during the installation.
-
-; *** Common wizard text
-ClickNext=Click Next to continue, or Cancel to exit Setup.
-BeveledLabel=
-BrowseDialogTitle=Browse For Folder
-BrowseDialogLabel=Select a folder in the list below, then click OK.
-NewFolderName=New Folder
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Welcome to the [name] Setup Wizard
-WelcomeLabel2=This will install [name/ver] on your computer.%n%nIt is recommended that you close all other applications before continuing.
-
-; *** "Password" wizard page
-WizardPassword=Password
-PasswordLabel1=This installation is password protected.
-PasswordLabel3=Please provide the password, then click Next to continue. Passwords are case-sensitive.
-PasswordEditLabel=&Password:
-IncorrectPassword=The password you entered is not correct. Please try again.
-
-; *** "License Agreement" wizard page
-WizardLicense=License Agreement
-LicenseLabel=Please read the following important information before continuing.
-LicenseLabel3=Please read the following License Agreement. You must accept the terms of this agreement before continuing with the installation.
-LicenseAccepted=I &accept the agreement
-LicenseNotAccepted=I &do not accept the agreement
-
-; *** "Information" wizard pages
-WizardInfoBefore=Information
-InfoBeforeLabel=Please read the following important information before continuing.
-InfoBeforeClickLabel=When you are ready to continue with Setup, click Next.
-WizardInfoAfter=Information
-InfoAfterLabel=Please read the following important information before continuing.
-InfoAfterClickLabel=When you are ready to continue with Setup, click Next.
-
-; *** "User Information" wizard page
-WizardUserInfo=User Information
-UserInfoDesc=Please enter your information.
-UserInfoName=&User Name:
-UserInfoOrg=&Organization:
-UserInfoSerial=&Serial Number:
-UserInfoNameRequired=You must enter a name.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Select Destination Location
-SelectDirDesc=Where should [name] be installed?
-SelectDirLabel3=Setup will install [name] into the following folder.
-SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
-DiskSpaceGBLabel=At least [gb] GB of free disk space is required.
-DiskSpaceMBLabel=At least [mb] MB of free disk space is required.
-CannotInstallToNetworkDrive=Setup cannot install to a network drive.
-CannotInstallToUNCPath=Setup cannot install to a UNC path.
-InvalidPath=You must enter a full path with drive letter; for example:%n%nC:\APP%n%nor a UNC path in the form:%n%n\\server\share
-InvalidDrive=The drive or UNC share you selected does not exist or is not accessible. Please select another.
-DiskSpaceWarningTitle=Not Enough Disk Space
-DiskSpaceWarning=Setup requires at least %1 KB of free space to install, but the selected drive only has %2 KB available.%n%nDo you want to continue anyway?
-DirNameTooLong=The folder name or path is too long.
-InvalidDirName=The folder name is not valid.
-BadDirName32=Folder names cannot include any of the following characters:%n%n%1
-DirExistsTitle=Folder Exists
-DirExists=The folder:%n%n%1%n%nalready exists. Would you like to install to that folder anyway?
-DirDoesntExistTitle=Folder Does Not Exist
-DirDoesntExist=The folder:%n%n%1%n%ndoes not exist. Would you like the folder to be created?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Select Components
-SelectComponentsDesc=Which components should be installed?
-SelectComponentsLabel2=Select the components you want to install; clear the components you do not want to install. Click Next when you are ready to continue.
-FullInstallation=Full installation
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Compact installation
-CustomInstallation=Custom installation
-NoUninstallWarningTitle=Components Exist
-NoUninstallWarning=Setup has detected that the following components are already installed on your computer:%n%n%1%n%nDeselecting these components will not uninstall them.%n%nWould you like to continue anyway?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceGBLabel=Current selection requires at least [gb] GB of disk space.
-ComponentsDiskSpaceMBLabel=Current selection requires at least [mb] MB of disk space.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Select Additional Tasks
-SelectTasksDesc=Which additional tasks should be performed?
-SelectTasksLabel2=Select the additional tasks you would like Setup to perform while installing [name], then click Next.
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Select Start Menu Folder
-SelectStartMenuFolderDesc=Where should Setup place the program's shortcuts?
-SelectStartMenuFolderLabel3=Setup will create the program's shortcuts in the following Start Menu folder.
-SelectStartMenuFolderBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
-MustEnterGroupName=You must enter a folder name.
-GroupNameTooLong=The folder name or path is too long.
-InvalidGroupName=The folder name is not valid.
-BadGroupName=The folder name cannot include any of the following characters:%n%n%1
-NoProgramGroupCheck2=&Don't create a Start Menu folder
-
-; *** "Ready to Install" wizard page
-WizardReady=Ready to Install
-ReadyLabel1=Setup is now ready to begin installing [name] on your computer.
-ReadyLabel2a=Click Install to continue with the installation, or click Back if you want to review or change any settings.
-ReadyLabel2b=Click Install to continue with the installation.
-ReadyMemoUserInfo=User information:
-ReadyMemoDir=Destination location:
-ReadyMemoType=Setup type:
-ReadyMemoComponents=Selected components:
-ReadyMemoGroup=Start Menu folder:
-ReadyMemoTasks=Additional tasks:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Preparing to Install
-PreparingDesc=Setup is preparing to install [name] on your computer.
-PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
-CannotContinue=Setup cannot continue. Please click Cancel to exit.
-ApplicationsFound=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications.
-ApplicationsFound2=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications. After the installation has completed, Setup will attempt to restart the applications.
-CloseApplications=&Automatically close the applications
-DontCloseApplications=&Do not close the applications
-ErrorCloseApplications=Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
-PrepareToInstallNeedsRestart=Setup must restart your computer. After restarting your computer, run Setup again to complete the installation of [name].%n%nWould you like to restart now?
-
-; *** "Installing" wizard page
-WizardInstalling=Installing
-InstallingLabel=Please wait while Setup installs [name] on your computer.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Completing the [name] Setup Wizard
-FinishedLabelNoIcons=Setup has finished installing [name] on your computer.
-FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed shortcuts.
-ClickFinish=Click Finish to exit Setup.
-FinishedRestartLabel=To complete the installation of [name], Setup must restart your computer. Would you like to restart now?
-FinishedRestartMessage=To complete the installation of [name], Setup must restart your computer.%n%nWould you like to restart now?
-ShowReadmeCheck=Yes, I would like to view the README file
-YesRadio=&Yes, restart the computer now
-NoRadio=&No, I will restart the computer later
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Run %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=View %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Setup Needs the Next Disk
-SelectDiskLabel2=Please insert Disk %1 and click OK.%n%nIf the files on this disk can be found in a folder other than the one displayed below, enter the correct path or click Browse.
-PathLabel=&Path:
-FileNotInDir2=The file "%1" could not be located in "%2". Please insert the correct disk or select another folder.
-SelectDirectoryLabel=Please specify the location of the next disk.
-
-; *** Installation phase messages
-SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
-AbortRetryIgnoreSelectAction=Select action
-AbortRetryIgnoreRetry=&Try again
-AbortRetryIgnoreIgnore=&Ignore the error and continue
-AbortRetryIgnoreCancel=Cancel installation
-
-; *** Installation status messages
-StatusClosingApplications=Closing applications...
-StatusCreateDirs=Creating directories...
-StatusExtractFiles=Extracting files...
-StatusCreateIcons=Creating shortcuts...
-StatusCreateIniEntries=Creating INI entries...
-StatusCreateRegistryEntries=Creating registry entries...
-StatusRegisterFiles=Registering files...
-StatusSavingUninstall=Saving uninstall information...
-StatusRunProgram=Finishing installation...
-StatusRestartingApplications=Restarting applications...
-StatusRollback=Rolling back changes...
-
-; *** Misc. errors
-ErrorInternal2=Internal error: %1
-ErrorFunctionFailedNoCode=%1 failed
-ErrorFunctionFailed=%1 failed; code %2
-ErrorFunctionFailedWithMessage=%1 failed; code %2.%n%3
-ErrorExecutingProgram=Unable to execute file:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Error opening registry key:%n%1\%2
-ErrorRegCreateKey=Error creating registry key:%n%1\%2
-ErrorRegWriteKey=Error writing to registry key:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Error creating INI entry in file "%1".
-
-; *** File copying errors
-FileAbortRetryIgnoreSkipNotRecommended=&Skip this file (not recommended)
-FileAbortRetryIgnoreIgnoreNotRecommended=&Ignore the error and continue (not recommended)
-SourceIsCorrupted=The source file is corrupted
-SourceDoesntExist=The source file "%1" does not exist
-ExistingFileReadOnly2=The existing file could not be replaced because it is marked read-only.
-ExistingFileReadOnlyRetry=&Remove the read-only attribute and try again
-ExistingFileReadOnlyKeepExisting=&Keep the existing file
-ErrorReadingExistingDest=An error occurred while trying to read the existing file:
-FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
-ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?
-ErrorChangingAttr=An error occurred while trying to change the attributes of the existing file:
-ErrorCreatingTemp=An error occurred while trying to create a file in the destination directory:
-ErrorReadingSource=An error occurred while trying to read the source file:
-ErrorCopying=An error occurred while trying to copy a file:
-ErrorReplacingExistingFile=An error occurred while trying to replace the existing file:
-ErrorRestartReplace=RestartReplace failed:
-ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
-ErrorRegisterServer=Unable to register the DLL/OCX: %1
-ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
-ErrorRegisterTypeLib=Unable to register the type library: %1
-
-; *** Uninstall display name markings
-; used for example as 'My Program (32-bit)'
-UninstallDisplayNameMark=%1 (%2)
-; used for example as 'My Program (32-bit, All users)'
-UninstallDisplayNameMarks=%1 (%2, %3)
-UninstallDisplayNameMark32Bit=32-bit
-UninstallDisplayNameMark64Bit=64-bit
-UninstallDisplayNameMarkAllUsers=All users
-UninstallDisplayNameMarkCurrentUser=Current user
-
-; *** Post-installation errors
-ErrorOpeningReadme=An error occurred while trying to open the README file.
-ErrorRestartingComputer=Setup was unable to restart the computer. Please do this manually.
-
-; *** Uninstaller messages
-UninstallNotFound=File "%1" does not exist. Cannot uninstall.
-UninstallOpenError=File "%1" could not be opened. Cannot uninstall
-UninstallUnsupportedVer=The uninstall log file "%1" is in a format not recognized by this version of the uninstaller. Cannot uninstall
-UninstallUnknownEntry=An unknown entry (%1) was encountered in the uninstall log
-ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
-UninstallOnlyOnWin64=This installation can only be uninstalled on 64-bit Windows.
-OnlyAdminCanUninstall=This installation can only be uninstalled by a user with administrative privileges.
-UninstallStatusLabel=Please wait while %1 is removed from your computer.
-UninstalledAll=%1 was successfully removed from your computer.
-UninstalledMost=%1 uninstall complete.%n%nSome elements could not be removed. These can be removed manually.
-UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
-UninstallDataCorrupted="%1" file is corrupted. Cannot uninstall
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Remove Shared File?
-ConfirmDeleteSharedFile2=The system indicates that the following shared file is no longer in use by any programs. Would you like for Uninstall to remove this shared file?%n%nIf any programs are still using this file and it is removed, those programs may not function properly. If you are unsure, choose No. Leaving the file on your system will not cause any harm.
-SharedFileNameLabel=File name:
-SharedFileLocationLabel=Location:
-WizardUninstalling=Uninstall Status
-StatusUninstalling=Uninstalling %1...
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=Installing %1.
-ShutdownBlockReasonUninstallingApp=Uninstalling %1.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 version %2
-AdditionalIcons=Additional shortcuts:
-CreateDesktopIcon=Create a &desktop shortcut
-CreateQuickLaunchIcon=Create a &Quick Launch shortcut
-ProgramOnTheWeb=%1 on the Web
-UninstallProgram=Uninstall %1
-LaunchProgram=Launch %1
-AssocFileExtension=&Associate %1 with the %2 file extension
-AssocingFileExtension=Associating %1 with the %2 file extension...
-AutoStartProgramGroupDescription=Startup:
-AutoStartProgram=Automatically start %1
-AddonHostProgramNotFound=%1 could not be located in the folder you selected.%n%nDo you want to continue anyway?
diff --git a/gradle/InnoSetup6/ISCC.exe b/gradle/InnoSetup6/ISCC.exe
deleted file mode 100755
index 8ad70921..00000000
Binary files a/gradle/InnoSetup6/ISCC.exe and /dev/null differ
diff --git a/gradle/InnoSetup6/ISCmplr.dll b/gradle/InnoSetup6/ISCmplr.dll
deleted file mode 100644
index 72ded47a..00000000
Binary files a/gradle/InnoSetup6/ISCmplr.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/ISCrypt.dll b/gradle/InnoSetup6/ISCrypt.dll
deleted file mode 100644
index 9d1a9760..00000000
Binary files a/gradle/InnoSetup6/ISCrypt.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/ISPP.chm b/gradle/InnoSetup6/ISPP.chm
deleted file mode 100644
index 2633a04d..00000000
Binary files a/gradle/InnoSetup6/ISPP.chm and /dev/null differ
diff --git a/gradle/InnoSetup6/ISPP.dll b/gradle/InnoSetup6/ISPP.dll
deleted file mode 100644
index 1780afc5..00000000
Binary files a/gradle/InnoSetup6/ISPP.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/ISPPBuiltins.iss b/gradle/InnoSetup6/ISPPBuiltins.iss
deleted file mode 100644
index cf8a40f7..00000000
--- a/gradle/InnoSetup6/ISPPBuiltins.iss
+++ /dev/null
@@ -1,382 +0,0 @@
-; BEGIN ISPPBUILTINS.ISS
-//
-// Inno Setup Preprocessor
-//
-// Inno Setup (C) 1997-2020 Jordan Russell. All Rights Reserved.
-// Portions Copyright (C) 2000-2020 Martijn Laan. All Rights Reserved.
-// Portions Copyright (C) 2001-2004 Alex Yackimoff. All Rights Reserved.
-//
-#if defined(ISPP_INVOKED) && !defined(_BUILTINS_ISS_)
-//
-#if PREPROCVER < 0x01000000
-# error Inno Setup Preprocessor version is outdated
-#endif
-//
-#define _BUILTINS_ISS_
-//
-// ===========================================================================
-//
-// Default states for options.
-//
-//#pragma parseroption -b+ ; short circuit boolean evaluation: on
-//#pragma parseroption -m- ; short circuit multiplication evaluation (0 * A will not eval A): off
-//#pragma parseroption -p+ ; string literals without escape sequences: on
-//#pragma parseroption -u- ; allow undeclared identifiers: off
-//#pragma option -c+ ; pass script to the compiler: on
-//#pragma option -e- ; emit empty lines to translation: off
-//#pragma option -v- ; verbose mode: off
-//
-// ---------------------------------------------------------------------------
-//
-// Verbose levels:
-// 0 - #include and #file acknowledgements
-// 1 - information about any temp files created by #file
-// 2 - #insert and #append acknowledgements
-// 3 - reserved
-// 4 - #dim, #define and #undef acknowledgements
-// 5 - reserved
-// 6 - conditional inclusion acknowledgements
-// 7 - reserved
-// 8 - show strings emitted with #emit directive
-// 9 - macro and functions successful call acknowledgements
-//10 - Local macro array allocation acknowledgements
-//
-//#pragma verboselevel 0
-//
-#ifndef __POPT_P__
-# define private CStrings
-#else
-# pragma parseroption -p-
-#endif
-//
-#define NewLine "\n"
-#define Tab "\t"
-//
-#pragma parseroption -p+
-//
-#pragma spansymbol "\"
-//
-#define True 1
-#define False 0
-#define Yes True
-#define No False
-//
-#define MaxInt 0x7FFFFFFFL
-#define MinInt 0x80000000L
-//
-#define NULL
-#define void
-//
-// TypeOf constants
-//
-#define TYPE_ERROR 0
-#define TYPE_NULL 1
-#define TYPE_INTEGER 2
-#define TYPE_STRING 3
-#define TYPE_MACRO 4
-#define TYPE_FUNC 5
-#define TYPE_ARRAY 6
-//
-// Helper macro to find out the type of an array element or expression. TypeOf
-// standard function only allows identifier as its parameter. Use this macro
-// to convert an expression to identifier.
-//
-#define TypeOf2(any Expr) TypeOf(Expr)
-//
-// ReadReg constants
-//
-#define HKEY_CLASSES_ROOT 0x80000000UL
-#define HKEY_CURRENT_USER 0x80000001UL
-#define HKEY_LOCAL_MACHINE 0x80000002UL
-#define HKEY_USERS 0x80000003UL
-#define HKEY_CURRENT_CONFIG 0x80000005UL
-#define HKEY_CLASSES_ROOT_64 0x82000000UL
-#define HKEY_CURRENT_USER_64 0x82000001UL
-#define HKEY_LOCAL_MACHINE_64 0x82000002UL
-#define HKEY_USERS_64 0x82000003UL
-#define HKEY_CURRENT_CONFIG_64 0x82000005UL
-//
-#define HKCR HKEY_CLASSES_ROOT
-#define HKCU HKEY_CURRENT_USER
-#define HKLM HKEY_LOCAL_MACHINE
-#define HKU HKEY_USERS
-#define HKCC HKEY_CURRENT_CONFIG
-#define HKCR64 HKEY_CLASSES_ROOT_64
-#define HKCU64 HKEY_CURRENT_USER_64
-#define HKLM64 HKEY_LOCAL_MACHINE_64
-#define HKU64 HKEY_USERS_64
-#define HKCC64 HKEY_CURRENT_CONFIG_64
-//
-// Exec constants
-//
-#define SW_HIDE 0
-#define SW_SHOWNORMAL 1
-#define SW_NORMAL 1
-#define SW_SHOWMINIMIZED 2
-#define SW_SHOWMAXIMIZED 3
-#define SW_MAXIMIZE 3
-#define SW_SHOWNOACTIVATE 4
-#define SW_SHOW 5
-#define SW_MINIMIZE 6
-#define SW_SHOWMINNOACTIVE 7
-#define SW_SHOWNA 8
-#define SW_RESTORE 9
-#define SW_SHOWDEFAULT 10
-#define SW_MAX 10
-//
-// Find constants
-//
-#define FIND_MATCH 0x00
-#define FIND_BEGINS 0x01
-#define FIND_ENDS 0x02
-#define FIND_CONTAINS 0x03
-#define FIND_CASESENSITIVE 0x04
-#define FIND_SENSITIVE FIND_CASESENSITIVE
-#define FIND_AND 0x00
-#define FIND_OR 0x08
-#define FIND_NOT 0x10
-#define FIND_TRIM 0x20
-//
-// FindFirst constants
-//
-#define faReadOnly 0x00000001
-#define faHidden 0x00000002
-#define faSysFile 0x00000004
-#define faVolumeID 0x00000008
-#define faDirectory 0x00000010
-#define faArchive 0x00000020
-#define faSymLink 0x00000040
-#define faAnyFile 0x0000003F
-//
-// GetStringFileInfo standard names
-//
-#define COMPANY_NAME "CompanyName"
-#define FILE_DESCRIPTION "FileDescription"
-#define FILE_VERSION "FileVersion"
-#define INTERNAL_NAME "InternalName"
-#define LEGAL_COPYRIGHT "LegalCopyright"
-#define ORIGINAL_FILENAME "OriginalFilename"
-#define PRODUCT_NAME "ProductName"
-#define PRODUCT_VERSION "ProductVersion"
-//
-// GetStringFileInfo helpers
-//
-#define GetFileCompany(str FileName) GetStringFileInfo(FileName, COMPANY_NAME)
-#define GetFileDescription(str FileName) GetStringFileInfo(FileName, FILE_DESCRIPTION)
-#define GetFileVersionString(str FileName) GetStringFileInfo(FileName, FILE_VERSION)
-#define GetFileCopyright(str FileName) GetStringFileInfo(FileName, LEGAL_COPYRIGHT)
-#define GetFileOriginalFilename(str FileName) GetStringFileInfo(FileName, ORIGINAL_FILENAME)
-#define GetFileProductVersion(str FileName) GetStringFileInfo(FileName, PRODUCT_VERSION)
-//
-// ParseVersion
-//
-// Macro internally calls GetFileVersion function and parses string returned
-// by that function (in form "0.0.0.0"). All four version elements are stored
-// in by-reference parameters Major, Minor, Rev, and Build. Macro returns
-// string returned by GetFileVersion.
-//
-#define DeleteToFirstPeriod(str *S) \
- Local[1] = Copy(S, 1, (Local[0] = Pos(".", S)) - 1), \
- S = Copy(S, Local[0] + 1), \
- Local[1]
-//
-#define ParseVersion(str FileName, *Major, *Minor, *Rev, *Build) \
- Local[1] = Local[0] = GetFileVersion(FileName), \
- Local[1] == "" ? "" : ( \
- Major = Int(DeleteToFirstPeriod(Local[1])), \
- Minor = Int(DeleteToFirstPeriod(Local[1])), \
- Rev = Int(DeleteToFirstPeriod(Local[1])), \
- Build = Int(Local[1]), \
- Local[0])
-//
-// EncodeVer
-//
-// Encodes given four version elements to a 32 bit integer number (8 bits for
-// each element, i.e. elements must be within 0...255 range).
-//
-#define EncodeVer(int Major, int Minor, int Revision = 0, int Build = -1) \
- Major << 24 | (Minor & 0xFF) << 16 | (Revision & 0xFF) << 8 | (Build >= 0 ? Build & 0xFF : 0)
-//
-// DecodeVer
-//
-// Decodes given 32 bit integer encoded version to its string representation,
-// Digits parameter indicates how many elements to show (if the fourth element
-// is 0, it won't be shown anyway).
-//
-#define DecodeVer(int Ver, int Digits = 3) \
- Str(Ver >> 0x18 & 0xFF) + (Digits > 1 ? "." : "") + \
- (Digits > 1 ? \
- Str(Ver >> 0x10 & 0xFF) + (Digits > 2 ? "." : "") : "") + \
- (Digits > 2 ? \
- Str(Ver >> 0x08 & 0xFF) + (Digits > 3 && (Local = Ver & 0xFF) ? "." : "") : "") + \
- (Digits > 3 && Local ? \
- Str(Ver & 0xFF) : "")
-//
-// FindSection
-//
-// Returns index of the line following the header of the section. This macro
-// is intended to be used with #insert directive.
-//
-#define FindSection(str Section = "Files") \
- Find(0, "[" + Section + "]", FIND_MATCH | FIND_TRIM) + 1
-//
-// FindSectionEnd
-//
-// Returns index of the line following last entry of the section. This macro
-// is intended to be used with #insert directive.
-//
-#if VER >= 0x03000000
-# define FindNextSection(int Line) \
- Find(Line, "[", FIND_BEGINS | FIND_TRIM, "]", FIND_ENDS | FIND_AND)
-# define FindSectionEnd(str Section = "Files") \
- FindNextSection(FindSection(Section))
-#else
-# define FindSectionEnd(str Section = "Files") \
- FindSection(Section) + EntryCount(Section)
-#endif
-//
-// FindCode
-//
-// Returns index of the line (of translation) following either [Code] section
-// header, or "program" keyword, if any.
-//
-#define FindCode() \
- Local[1] = FindSection("Code"), \
- Local[0] = Find(Local[1] - 1, "program", FIND_BEGINS, ";", FIND_ENDS | FIND_AND), \
- (Local[0] < 0 ? Local[1] : Local[0] + 1)
-//
-// ExtractFilePath
-//
-// Returns directory portion of the given filename without backslash (unless
-// it is a root directory). If PathName doesn't contain directory portion,
-// the result is an empty string.
-//
-#define ExtractFilePath(str PathName) \
- (Local[0] = \
- !(Local[1] = RPos("\", PathName)) ? \
- "" : \
- Copy(PathName, 1, Local[1] - 1)), \
- Local[0] + \
- ((Local[2] = Len(Local[0])) == 2 && Copy(Local[0], Local[2]) == ":" ? \
- "\" : \
- "")
-#define ExtractFileDir(str PathName) \
- RemoveBackslash(ExtractFilePath(PathName))
-
-#define ExtractFileExt(str PathName) \
- Local[0] = RPos(".", PathName), \
- Copy(PathName, Local[0] + 1)
-//
-// ExtractFileName
-//
-// Returns name portion of the given filename. If PathName ends with
-// a backslash, the result is an empty string.
-//
-#define ExtractFileName(str PathName) \
- !(Local[0] = RPos("\", PathName)) ? \
- PathName : \
- Copy(PathName, Local[0] + 1)
-//
-// ChangeFileExt
-//
-// Changes extension in FileName with NewExt. NewExt must not contain
-// period.
-//
-#define ChangeFileExt(str FileName, str NewExt) \
- !(Local[0] = RPos(".", FileName)) ? \
- FileName + "." + NewExt : \
- Copy(FileName, 1, Local[0]) + NewExt
-//
-// RemoveFileExt
-//
-// Removes extension in FileName.
-//
-#define RemoveFileExt(str FileName) \
- !(Local[0] = RPos(".", FileName)) ? \
- FileName : \
- Copy(FileName, 1, Local[0] - 1)
-//
-// AddBackslash
-//
-// Adds a backslash to the string, if it's not already there.
-//
-#define AddBackslash(str S) \
- Copy(S, Len(S)) == "\" ? S : S + "\"
-//
-// RemoveBackslash
-//
-// Removes trailing backslash from the string unless the string points to
-// a root directory.
-//
-#define RemoveBackslash(str S) \
- Local[0] = Len(S), \
- Local[0] > 0 ? \
- Copy(S, Local[0]) == "\" ? \
- (Local[0] == 3 && Copy(S, 2, 1) == ":" ? \
- S : \
- Copy(S, 1, Local[0] - 1)) : \
- S : \
- ""
-//
-// Delete
-//
-// Deletes specified number of characters beginning with Index from S. S is
-// passed by reference (therefore is modified). Acts like Delete function in
-// Delphi (from System unit).
-//
-#define Delete(str *S, int Index, int Count = MaxInt) \
- S = Copy(S, 1, Index - 1) + Copy(S, Index + Count)
-//
-// Insert
-//
-// Inserts specified Substr at Index'th character into S. S is passed by
-// reference (therefore is modified).
-//
-#define Insert(str *S, int Index, str Substr) \
- Index > Len(S) + 1 ? \
- S : \
- S = Copy(S, 1, Index - 1) + SubStr + Copy(S, Index)
-//
-// YesNo, IsDirSet
-//
-// Returns nonzero value if given string is "yes", "true" or "1". Intended to
-// be used with SetupSetting function. This macro replaces YesNo function
-// available in previous releases.
-//
-#define YesNo(str S) \
- (S = LowerCase(S)) == "yes" || S == "true" || S == "1"
-//
-#define IsDirSet(str SetupDirective) \
- YesNo(SetupSetting(SetupDirective))
-//
-//
-#define Power(int X, int P = 2) \
- !P ? 1 : X * Power(X, P - 1)
-//
-#define Min(int A, int B, int C = MaxInt) \
- A < B ? A < C ? Int(A) : Int(C) : Int(B)
-//
-#define Max(int A, int B, int C = MinInt) \
- A > B ? A > C ? Int(A) : Int(C) : Int(B)
-//
-// SameText
-//
-// Returns True if the given strings are identical, ignoring case.
-//
-#define SameText(str S1, str S2) \
- LowerCase(S1) == LowerCase(S2)
-//
-// SameStr
-//
-// Returns True if the given strings are identical, with case-sensitivity.
-//
-#define SameStr(str S1, str S2) \
- S1 == S2
-//
-
-#ifdef CStrings
-# pragma parseroption -p-
-#endif
-#endif
-; END ISPPBUILTINS.ISS
-
diff --git a/gradle/InnoSetup6/ISetup.chm b/gradle/InnoSetup6/ISetup.chm
deleted file mode 100644
index aa3a9881..00000000
Binary files a/gradle/InnoSetup6/ISetup.chm and /dev/null differ
diff --git a/gradle/InnoSetup6/Setup.e32 b/gradle/InnoSetup6/Setup.e32
deleted file mode 100644
index 0fcc5f9a..00000000
Binary files a/gradle/InnoSetup6/Setup.e32 and /dev/null differ
diff --git a/gradle/InnoSetup6/SetupLdr.e32 b/gradle/InnoSetup6/SetupLdr.e32
deleted file mode 100644
index efbce118..00000000
Binary files a/gradle/InnoSetup6/SetupLdr.e32 and /dev/null differ
diff --git a/gradle/InnoSetup6/WizModernImage-IS.bmp b/gradle/InnoSetup6/WizModernImage-IS.bmp
deleted file mode 100644
index cf844e09..00000000
Binary files a/gradle/InnoSetup6/WizModernImage-IS.bmp and /dev/null differ
diff --git a/gradle/InnoSetup6/WizModernImage.bmp b/gradle/InnoSetup6/WizModernImage.bmp
deleted file mode 100644
index cb05a063..00000000
Binary files a/gradle/InnoSetup6/WizModernImage.bmp and /dev/null differ
diff --git a/gradle/InnoSetup6/WizModernSmallImage-IS.bmp b/gradle/InnoSetup6/WizModernSmallImage-IS.bmp
deleted file mode 100644
index 1e8e4979..00000000
Binary files a/gradle/InnoSetup6/WizModernSmallImage-IS.bmp and /dev/null differ
diff --git a/gradle/InnoSetup6/WizModernSmallImage.bmp b/gradle/InnoSetup6/WizModernSmallImage.bmp
deleted file mode 100644
index 63f42104..00000000
Binary files a/gradle/InnoSetup6/WizModernSmallImage.bmp and /dev/null differ
diff --git a/gradle/InnoSetup6/isbunzip.dll b/gradle/InnoSetup6/isbunzip.dll
deleted file mode 100644
index 7e10d1ce..00000000
Binary files a/gradle/InnoSetup6/isbunzip.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/isbzip.dll b/gradle/InnoSetup6/isbzip.dll
deleted file mode 100644
index 3f1abb02..00000000
Binary files a/gradle/InnoSetup6/isbzip.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/islzma.dll b/gradle/InnoSetup6/islzma.dll
deleted file mode 100644
index 18365df0..00000000
Binary files a/gradle/InnoSetup6/islzma.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/islzma64.exe b/gradle/InnoSetup6/islzma64.exe
deleted file mode 100755
index 6f15f4db..00000000
Binary files a/gradle/InnoSetup6/islzma64.exe and /dev/null differ
diff --git a/gradle/InnoSetup6/isscint.dll b/gradle/InnoSetup6/isscint.dll
deleted file mode 100644
index f16a2bc8..00000000
Binary files a/gradle/InnoSetup6/isscint.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/isunzlib.dll b/gradle/InnoSetup6/isunzlib.dll
deleted file mode 100644
index 587b4e2e..00000000
Binary files a/gradle/InnoSetup6/isunzlib.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/iszlib.dll b/gradle/InnoSetup6/iszlib.dll
deleted file mode 100644
index 77efd92b..00000000
Binary files a/gradle/InnoSetup6/iszlib.dll and /dev/null differ
diff --git a/gradle/InnoSetup6/license.txt b/gradle/InnoSetup6/license.txt
deleted file mode 100644
index 1a75f6ca..00000000
--- a/gradle/InnoSetup6/license.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Inno Setup License
-==================
-
-Except where otherwise noted, all of the documentation and software included in the Inno Setup
-package is copyrighted by Jordan Russell.
-
-Copyright (C) 1997-2020 Jordan Russell. All rights reserved.
-Portions Copyright (C) 2000-2020 Martijn Laan. All rights reserved.
-
-This software is provided "as-is," without any express or implied warranty. In no event shall the
-author be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial
-applications, and to alter and redistribute it, provided that the following conditions are met:
-
-1. All redistributions of source code files must retain all copyright notices that are currently in
- place, and this list of conditions without modification.
-
-2. All redistributions in binary form must retain all occurrences of the above copyright notice and
- web site addresses that are currently in place (for example, in the About boxes).
-
-3. The origin of this software must not be misrepresented; you must not claim that you wrote the
- original software. If you use this software to distribute a product, an acknowledgment in the
- product documentation would be appreciated but is not required.
-
-4. Modified versions in source or binary form must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
-
-Jordan Russell
-jr-2010 AT jrsoftware.org
-https://jrsoftware.org/
\ No newline at end of file
diff --git a/src/main/java/airsquared/blobsaver/app/Main.java b/src/main/java/airsquared/blobsaver/app/Main.java
index a9b0396e..268dfe1b 100644
--- a/src/main/java/airsquared/blobsaver/app/Main.java
+++ b/src/main/java/airsquared/blobsaver/app/Main.java
@@ -25,7 +25,7 @@
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.stage.Stage;
-import jdk.internal.misc.Unsafe;
+import sun.misc.Unsafe;
import java.io.File;
import java.io.IOException;
@@ -98,21 +98,22 @@ static void setJNALibraryPath() {
*s
* Writing to private static final fields is from https://stackoverflow.com/a/61150853/5938387
*/
- @SuppressWarnings({"removal", "Java9ReflectionClassVisibility"})
+ @SuppressWarnings({"Java9ReflectionClassVisibility", "deprecation"})
static void fixCertificateError() {
try {
- final var unsafe = Unsafe.getUnsafe();
+ var theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
+ theUnsafe.setAccessible(true);
+ final var unsafe = (Unsafe) theUnsafe.get(null);
var field = Class.forName("sun.security.validator.SymantecTLSPolicy").getDeclaredField("EXEMPT_SUBCAS");
- var staticFieldBase = unsafe.staticFieldBase(field);
- long staticFieldOffset = unsafe.staticFieldOffset(field);
- unsafe.putObject(staticFieldBase, staticFieldOffset, Map.of( // Copied from SymantecTLSPolicy.EXEMPT_SUBCAS
+ unsafe.putObject(unsafe.staticFieldBase(field), unsafe.staticFieldOffset(field),
+ Map.of( // Copied from SymantecTLSPolicy.EXEMPT_SUBCAS
"AC2B922ECFD5E01711772FEA8ED372DE9D1E2245FCE3F57A9CDBEC77296A424B",
LocalDate.MAX,
"A4FE7C7F15155F3F0AEF7AAA83CF6E06DEB97CA3F909DF920AC1490882D488ED",
LocalDate.MAX
));
- } catch (ClassNotFoundException | NoSuchFieldException e) {
+ } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}
}
@@ -144,7 +145,7 @@ public void start(Stage primaryStage) {
primaryStage.setTitle("blobsaver");
primaryStage.setScene(new Scene(root));
if (isWindows()) {
- primaryStage.getIcons().setAll(new Image(Main.class.getResourceAsStream("blob_emoji.png")));
+ primaryStage.getIcons().setAll(new Image(Main.class.getResourceAsStream("blob.png")));
}
primaryStage.setResizable(false);
Utils.checkForUpdates(false);
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 90b9be50..231bd51c 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -4,6 +4,7 @@
requires javafx.controls;
requires javafx.fxml;
requires jdk.crypto.ec; // needed for ssl support in jlink'd image
+ requires jdk.unsupported; // for Unsafe
requires com.sun.jna;
requires nsmenufx;
diff --git a/src/main/resources/airsquared/blobsaver/app/blob_emoji.png b/src/main/resources/airsquared/blobsaver/app/blob.png
similarity index 100%
rename from src/main/resources/airsquared/blobsaver/app/blob_emoji.png
rename to src/main/resources/airsquared/blobsaver/app/blob.png