From 7c7b98fd0d57e950f10e3669366859316b3ce527 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 9 Apr 2022 07:48:35 +0300
Subject: [PATCH] Fix wrong packages

---
 build.gradle                                                | 6 +++---
 .../org/koitharu/kotatsu/parsers/util/json/JSONIterator.kt  | 2 +-
 .../kotatsu/parsers/util/json/JSONStringIterator.kt         | 2 +-
 .../json/{JsonValuesIterator.kt => JSONValuesIterator.kt}   | 2 +-
 .../org/koitharu/kotatsu/parsers/util/json/JsonExt.kt       | 3 ---
 5 files changed, 6 insertions(+), 9 deletions(-)
 rename src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/{JsonValuesIterator.kt => JSONValuesIterator.kt} (85%)

diff --git a/build.gradle b/build.gradle
index 873728db..35cffc2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ compileKotlin {
 	kotlinOptions {
 		jvmTarget = '1.8'
 		freeCompilerArgs += [
-				'-Xopt-in=kotlin.contracts.ExperimentalContracts',
+				'-opt-in=kotlin.contracts.ExperimentalContracts',
 		]
 	}
 }
@@ -28,7 +28,7 @@ compileTestKotlin {
 	kotlinOptions {
 		jvmTarget = '1.8'
 		freeCompilerArgs += [
-				'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+				'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
 		]
 	}
 }
@@ -38,7 +38,7 @@ dependencies {
 	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 	implementation 'com.squareup.okio:okio:3.0.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
-	implementation 'org.json:json:20211205'
+	implementation 'org.json:json:20220320'
 	implementation 'androidx.collection:collection-ktx:1.2.0'
 
 	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONIterator.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONIterator.kt
index 9b48640e..66c05e2e 100644
--- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONIterator.kt
+++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONIterator.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.utils.json
+package org.koitharu.kotatsu.parsers.util.json
 
 import org.json.JSONArray
 import org.json.JSONObject
diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONStringIterator.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONStringIterator.kt
index dd982640..5a04afd1 100644
--- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONStringIterator.kt
+++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONStringIterator.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.utils.json
+package org.koitharu.kotatsu.parsers.util.json
 
 import org.json.JSONArray
 
diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonValuesIterator.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONValuesIterator.kt
similarity index 85%
rename from src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonValuesIterator.kt
rename to src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONValuesIterator.kt
index 6af63419..b43943f3 100644
--- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonValuesIterator.kt
+++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JSONValuesIterator.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.utils.json
+package org.koitharu.kotatsu.parsers.util.json
 
 import org.json.JSONObject
 
diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonExt.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonExt.kt
index 4e27a336..3fccf101 100644
--- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonExt.kt
+++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/json/JsonExt.kt
@@ -3,9 +3,6 @@ package org.koitharu.kotatsu.parsers.util.json
 import androidx.collection.ArraySet
 import org.json.JSONArray
 import org.json.JSONObject
-import org.koitharu.kotatsu.utils.json.JSONIterator
-import org.koitharu.kotatsu.utils.json.JSONStringIterator
-import org.koitharu.kotatsu.utils.json.JSONValuesIterator
 import java.util.*
 import kotlin.contracts.contract