refactor: Replace json.org with openjson

ktgw0316 · Mar 21, 2024 · a134c75 · a134c75
1 parent 09694d3
commit a134c75
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/debian/control b/debian/control
@@ -25,6 +25,7 @@ Build-Depends:
  liblombok-java,
  liblcms2-dev,
  liblensfun-dev (<< 0.3.95),
+ libopenjson-java,
  libraw-dev,
  libtiff-dev,
  libx11-dev,
@@ -49,6 +50,7 @@ Depends:
  libjpeg62-turbo | libjpeg-turbo8,
  liblcms2-2,
  liblensfun0 | liblensfun1 (<< 0.3.95),
+ libopenjson-java,
  libraw19 | libraw20 | libraw23,
  libtiff5 | libtiff6,
  libxml2-utils,

diff --git a/lightcrafts/build.gradle.kts b/lightcrafts/build.gradle.kts
@@ -17,8 +17,8 @@ dependencies {
     implementation("com.github.jiconfont:jiconfont-swing:1.0.1")
     implementation("com.github.jiconfont:jiconfont-font_awesome:4.7.0.0")
     implementation("com.github.jiconfont:jiconfont-google_material_design_icons:2.2.0.2")
+    implementation("com.github.openjson:openjson:1.0.13")
     implementation("org.ejml:ejml-simple:0.40")
-    implementation("org.json:json:20231013")
 }
 val os = System.getProperty("os.name").lowercase()
 val MAKE = with(os) {

diff --git a/lightcrafts/ivy.xml b/lightcrafts/ivy.xml
@@ -19,6 +19,7 @@
     <dependency name="jiconfont-swing" rev="1.0.1" org="com.github.jiconfont" conf="compile->default"/>
     <dependency name="json" rev="20231013" org="org.json" conf="compile->default"/>
     <dependency name="lombok" rev="1.18.26" org="org.projectlombok" conf="compile->default"/>
+    <dependency name="openjson" rev="1.0.13" org="com.github.openjson" conf="compile->default"/>
     <!-- Test dependencies -->
     <dependency name="junit-jupiter-api" rev="5.9.3" org="org.junit.jupiter" conf="test->default"/>
     <dependency name="junit-jupiter-params" rev="5.9.3" org="org.junit.jupiter" conf="test->default"/>

diff --git a/lightcrafts/src/main/java/com/lightcrafts/app/CheckForUpdate.java b/lightcrafts/src/main/java/com/lightcrafts/app/CheckForUpdate.java
@@ -3,6 +3,7 @@
 
 package com.lightcrafts.app;
 
+import com.github.openjson.JSONObject;
 import com.lightcrafts.platform.AlertDialog;
 import com.lightcrafts.platform.Platform;
 import com.lightcrafts.platform.ProgressDialog;
@@ -11,15 +12,13 @@
 import com.lightcrafts.utils.WebBrowser;
 import com.lightcrafts.utils.thread.ProgressThread;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.Objects;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;