Remove last remnants of org.json

diff --git a/build.gradle b/build.gradle
index 9fa51e1a2bff5c42351b492309ed0afa55d5717b..907fb8f702c657e478eb3ec4af77c7609a304cf3 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,6 @@ repositories {
 dependencies {
     compile 'org.whispersystems:textsecure-java:1.8.1'
     compile 'com.madgag.spongycastle:prov:1.52.0.0'
 dependencies {
     compile 'org.whispersystems:textsecure-java:1.8.1'
     compile 'com.madgag.spongycastle:prov:1.52.0.0'

-    compile 'org.json:json:20150729'

     compile 'commons-io:commons-io:2.4'
     compile 'net.sourceforge.argparse4j:argparse4j:0.5.0'
 }
     compile 'commons-io:commons-io:2.4'
     compile 'net.sourceforge.argparse4j:argparse4j:0.5.0'
 }

diff --git a/src/main/java/cli/JsonAxolotlStore.java b/src/main/java/cli/JsonAxolotlStore.java
index 57282f129d1bc5a87f11cc1957b28f534dd49769..cfed0cd8c81bd48d8d486b4faf8fcec2776f73ab 100644 (file)
--- a/src/main/java/cli/JsonAxolotlStore.java
+++ b/src/main/java/cli/JsonAxolotlStore.java
@@ -3,7 +3,6 @@ package cli;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

-import org.json.JSONObject;

 import org.whispersystems.libaxolotl.*;
 import org.whispersystems.libaxolotl.state.AxolotlStore;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;
 import org.whispersystems.libaxolotl.*;
 import org.whispersystems.libaxolotl.state.AxolotlStore;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;