Java 20

airsquared · airsquared · commit 0c377838c7b8 · 2023-08-20T16:52:41.000-07:00
diff --git 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: '19'
+          java-version: '20'
           distribution: 'zulu'
       - name: Install Linux dependencies
         run: sudo apt-get install libplist-dev libimobiledevice-dev libirecovery-1.0-dev
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/icon.svg b/.idea/icon.svg
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ bugs/problems or have a feature request.
 
 ## Built With
 
-- JDK 19
+- JDK 20
 - [IntelliJ Idea](https://www.jetbrains.com/idea/)
 - [Gradle](https://gradle.org/)
 - [JLink Plugin](https://github.com/beryx/badass-jlink-plugin)
-- [Inno Setup](http://www.jrsoftware.org/isinfo.php) (Windows installer)
+- [Inno Setup](http://www.jrsoftware.org/isinfo.php) (Windows)
 
 See the full credits [here](libraries_used.txt).
 
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ def os = DefaultNativePlatform.currentOperatingSystem
 
 startScripts.enabled = distZip.enabled = distTar.enabled = false
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(19)
+java.toolchain.languageVersion = JavaLanguageVersion.of(20)
 
 repositories {
     mavenCentral()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/libraries_used.txt b/libraries_used.txt
@@ -2,7 +2,7 @@ Libraries used by blobsaver:
 
 ============================================================================
 
-tsschecker (https://github.com/tihmstar/tsschecker)
+tsschecker (https://github.com/1Conan/tsschecker)
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -25,6 +25,36 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ============================================================================
 
+Java Native Access (https://github.com/java-native-access/jna)
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+Java Native Access (JNA) is licensed under the LGPL, version 2.1
+or later, or (from version 4.0 onward) the Apache License,
+version 2.0.
+
+You can freely decide which license you want to apply to the project.
+
+You may obtain a copy of the LGPL License at:
+
+http://www.gnu.org/licenses/licenses.html
+
+A copy is also included in the downloadable source code package
+containing JNA, in file "LGPL2.1", under the same directory
+as this file.
+
+You may obtain a copy of the Apache License at:
+
+http://www.apache.org/licenses/
+
+A copy is also included in the downloadable source code package
+containing JNA, in file "AL2.0", under the same directory
+as this file.
+
+============================================================================
+
+============================================================================
+
 libimobiledevice (https://github.com/libimobiledevice)
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -48,31 +78,23 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ============================================================================
 
-JSON in Java (https://github.com/stleary/JSON-java)
+Gson (https://github.com/google/gson)
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Copyright 2008 Google Inc.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-The Software shall be used for Good, not Evil.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 ============================================================================
 
@@ -109,3 +131,85 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ============================================================================
 
+============================================================================
+
+Apache Commons Compress (https://github.com/apache/commons-compress)
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+Copyright 2002-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+---
+
+The files in the package org.apache.commons.compress.archivers.sevenz
+were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/),
+which has been placed in the public domain:
+
+"LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html)
+
+---
+
+The test file lbzip2_32767.bz2 has been copied from libbzip2's source
+repository:
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2019 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must
+   not claim that you wrote the original software.  If you use this
+   software in a product, an acknowledgment in the product
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@acm.org
+
+============================================================================
+
+============================================================================
+
+Picocli (https://github.com/remkop/picocli)
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+============================================================================
diff --git a/src/main/java/airsquared/blobsaver/app/Controller.java b/src/main/java/airsquared/blobsaver/app/Controller.java
@@ -296,7 +296,7 @@ public void darkModeHandler(ObservableValue<?> a, RadioMenuItem old, RadioMenuIt
         Prefs.setDarkMode((Prefs.DarkMode) darkMode.getUserData());
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("DataFlowIssue")
     private void updateDarkMode(boolean enable) {
         if (enable) {
             // eventually replace with https://github.com/openjdk/jfx/pull/511 once released
diff --git a/src/main/java/airsquared/blobsaver/app/Main.java b/src/main/java/airsquared/blobsaver/app/Main.java
@@ -131,7 +131,7 @@ public JavaFxApplication() {
         }
 
         @Override
-        @SuppressWarnings("ConstantConditions")
+        @SuppressWarnings("DataFlowIssue")
         public void start(Stage primaryStage) {
             Main.primaryStage = primaryStage;
             Parent root = null;
diff --git a/src/main/java/airsquared/blobsaver/app/TSS.java b/src/main/java/airsquared/blobsaver/app/TSS.java
@@ -23,10 +23,8 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -265,10 +263,10 @@ private void checkInputs() throws TSSException {
         if (manualIpswURL != null) { // check URL
             try {
                 if (!ipswURLPattern.matcher(manualIpswURL).matches()) {
-                    throw new MalformedURLException("Doesn't match ipsw URL regex");
+                    throw new URISyntaxException(manualIpswURL, "Doesn't match ipsw URL regex");
                 }
-                new URL(manualIpswURL); // check URL
-            } catch (MalformedURLException e) {
+                new URI(manualIpswURL); // check URL
+            } catch (URISyntaxException e) {
                 throw new TSSException("The IPSW URL is not valid.\n\nMake sure it's a valid URL that ends with \".ipsw\" or \".plist\"", false, e);
             }
             if (manualIpswURL.startsWith("file:")) try {
@@ -456,7 +454,7 @@ public TSS build() {
     /**
      * Checked exception for all TSS related errors.
      */
-    static class TSSException extends Exception {
+    public static class TSSException extends Exception {
 
         public final String tssLog;
         public final boolean isReportable;
diff --git a/src/main/java/airsquared/blobsaver/app/Utils.java b/src/main/java/airsquared/blobsaver/app/Utils.java
@@ -37,7 +37,6 @@
 import java.io.StringWriter;
 import java.io.UncheckedIOException;
 import java.net.URI;
-import java.net.URL;
 import java.nio.ByteOrder;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Files;
@@ -411,11 +410,12 @@ record IOSVersion(String versionString, String buildid, String ipswURL, Boolean
         }
     }
 
+    // assumes that ipswUrl has been checked with `new URI(ipswUrl)`
     static Path extractBuildManifest(String ipswUrl) throws IOException {
         Path buildManifest = Files.createTempFile("BuildManifest", ".plist");
         buildManifest.toFile().deleteOnExit();
         if (ipswUrl.matches("https?://.*apple.*\\.ipsw")) {
-            var fileName = Path.of(new URL(ipswUrl).getPath()).getFileName().toString();
+            var fileName = Path.of(URI.create(ipswUrl).getPath()).getFileName().toString();
             var manifestURL = ipswUrl.replace(fileName, "BuildManifest.plist");
             try {
                 return Network.downloadFile(manifestURL, buildManifest).body().toRealPath();
@@ -442,7 +442,7 @@ static Path extractBuildManifest(String ipswUrl) throws IOException {
     private static void extractManifestFromZip(String ipswUrl, Path extractTo) throws IOException {
         SeekableByteChannel channel = ipswUrl.startsWith("file:")
                 ? Files.newByteChannel(Path.of(URI.create(ipswUrl)), StandardOpenOption.READ)
-                : new Network.HttpChannel(new URL(ipswUrl));
+                : new Network.HttpChannel(URI.create(ipswUrl).toURL());
         try (channel; var ipsw = new ZipFile(channel, "ipsw", "UTF8", true, true);
              var stream = ipsw.getInputStream(ipsw.getEntry("BuildManifest.plist"))) {
             Files.copy(stream, extractTo, StandardCopyOption.REPLACE_EXISTING);
diff --git a/src/main/java/airsquared/blobsaver/app/natives/Libirecovery.java b/src/main/java/airsquared/blobsaver/app/natives/Libirecovery.java
@@ -26,7 +26,8 @@
 /**
  * https://github.com/libimobiledevice/libirecovery/blob/master/src/libirecovery.c
  */
-public class Libirecovery {
+@SuppressWarnings("UnusedReturnValue")
+public final class Libirecovery {
 
     public static int open(PointerByReference irecv_client) {
         return irecv_open_with_ecid(irecv_client, 0);
