From d5a747f6f824bbd74f209ee20552b50c974dc136 Mon Sep 17 00:00:00 2001 From: airsquared <36649395+airsquared@users.noreply.github.com> Date: Fri, 29 Sep 2023 00:37:59 -0700 Subject: [PATCH] Java 21, build cleanup - Minimum macOS now 11/Big Sur --- .gitattributes | 8 +- .github/workflows/main.yml | 3 +- .idea/compiler.xml | 4 +- .idea/misc.xml | 2 +- .idea/runConfigurations/Main__Linux_.xml | 2 +- .idea/runConfigurations/Main__Windows_.xml | 2 +- .idea/runConfigurations/Main__macOS_.xml | 2 +- README.md | 2 +- build.gradle | 59 +-- .../files/{LICENSE_windows => LICENSE} | 0 ...es_used_windows.txt => libraries_used.txt} | 0 gradle/InnoSetup6/Default.isl | 364 ----------------- gradle/InnoSetup6/ISCC.exe | Bin 872568 -> 0 bytes gradle/InnoSetup6/ISCmplr.dll | Bin 1414776 -> 0 bytes gradle/InnoSetup6/ISCrypt.dll | Bin 2560 -> 0 bytes gradle/InnoSetup6/ISPP.chm | Bin 67938 -> 0 bytes gradle/InnoSetup6/ISPP.dll | Bin 1012344 -> 0 bytes gradle/InnoSetup6/ISPPBuiltins.iss | 382 ------------------ gradle/InnoSetup6/ISetup.chm | Bin 377938 -> 0 bytes gradle/InnoSetup6/Setup.e32 | Bin 2570752 -> 0 bytes gradle/InnoSetup6/SetupLdr.e32 | Bin 780288 -> 0 bytes gradle/InnoSetup6/WizModernImage-IS.bmp | Bin 52574 -> 0 bytes gradle/InnoSetup6/WizModernImage.bmp | Bin 26494 -> 0 bytes gradle/InnoSetup6/WizModernSmallImage-IS.bmp | Bin 4158 -> 0 bytes gradle/InnoSetup6/WizModernSmallImage.bmp | Bin 1658 -> 0 bytes gradle/InnoSetup6/isbunzip.dll | Bin 30376 -> 0 bytes gradle/InnoSetup6/isbzip.dll | Bin 33968 -> 0 bytes gradle/InnoSetup6/islzma.dll | Bin 85160 -> 0 bytes gradle/InnoSetup6/islzma64.exe | Bin 110760 -> 0 bytes gradle/InnoSetup6/isscint.dll | Bin 285352 -> 0 bytes gradle/InnoSetup6/isunzlib.dll | Bin 24240 -> 0 bytes gradle/InnoSetup6/iszlib.dll | Bin 29352 -> 0 bytes gradle/InnoSetup6/license.txt | 32 -- .../java/airsquared/blobsaver/app/Main.java | 17 +- src/main/java/module-info.java | 1 + .../app/{blob_emoji.png => blob.png} | Bin 36 files changed, 44 insertions(+), 836 deletions(-) rename dist/windows/files/{LICENSE_windows => LICENSE} (100%) rename dist/windows/files/{libraries_used_windows.txt => libraries_used.txt} (100%) delete mode 100644 gradle/InnoSetup6/Default.isl delete mode 100755 gradle/InnoSetup6/ISCC.exe delete mode 100644 gradle/InnoSetup6/ISCmplr.dll delete mode 100644 gradle/InnoSetup6/ISCrypt.dll delete mode 100644 gradle/InnoSetup6/ISPP.chm delete mode 100644 gradle/InnoSetup6/ISPP.dll delete mode 100644 gradle/InnoSetup6/ISPPBuiltins.iss delete mode 100644 gradle/InnoSetup6/ISetup.chm delete mode 100644 gradle/InnoSetup6/Setup.e32 delete mode 100644 gradle/InnoSetup6/SetupLdr.e32 delete mode 100644 gradle/InnoSetup6/WizModernImage-IS.bmp delete mode 100644 gradle/InnoSetup6/WizModernImage.bmp delete mode 100644 gradle/InnoSetup6/WizModernSmallImage-IS.bmp delete mode 100644 gradle/InnoSetup6/WizModernSmallImage.bmp delete mode 100644 gradle/InnoSetup6/isbunzip.dll delete mode 100644 gradle/InnoSetup6/isbzip.dll delete mode 100644 gradle/InnoSetup6/islzma.dll delete mode 100755 gradle/InnoSetup6/islzma64.exe delete mode 100644 gradle/InnoSetup6/isscint.dll delete mode 100644 gradle/InnoSetup6/isunzlib.dll delete mode 100644 gradle/InnoSetup6/iszlib.dll delete mode 100644 gradle/InnoSetup6/license.txt rename src/main/resources/airsquared/blobsaver/app/{blob_emoji.png => blob.png} (100%) 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 @@