diff --git a/.gradle/7.3.3/checksums/checksums.lock b/.gradle/7.3.3/checksums/checksums.lock
index 3dcdc4edb6dcf923803edaafa92ff30cb54603ad..2caefc0d217c127881c05805c14d6bf2a9fdf695 100644
Binary files a/.gradle/7.3.3/checksums/checksums.lock and b/.gradle/7.3.3/checksums/checksums.lock differ
diff --git a/.gradle/7.3.3/checksums/md5-checksums.bin b/.gradle/7.3.3/checksums/md5-checksums.bin
index 83634bcd81fb0ec72b2e4dda4be0ab420075ceb3..b9798e2208c4e54b18def435c7d9ccd95aa920ff 100644
Binary files a/.gradle/7.3.3/checksums/md5-checksums.bin and b/.gradle/7.3.3/checksums/md5-checksums.bin differ
diff --git a/.gradle/7.3.3/checksums/sha1-checksums.bin b/.gradle/7.3.3/checksums/sha1-checksums.bin
index 9b41f603de94371b5de5b39fa4fcae39d38a7549..399b2fb19ce25766dfbd422980144200b1d78a60 100644
Binary files a/.gradle/7.3.3/checksums/sha1-checksums.bin and b/.gradle/7.3.3/checksums/sha1-checksums.bin differ
diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock
index ef211b11b2ec678c3c75318ccb6202612176273f..ad18cf70483c9b3dffad88dbefdf3120a9c34fc1 100644
Binary files a/.gradle/7.3.3/executionHistory/executionHistory.lock and b/.gradle/7.3.3/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin
index f0c114af55a258191541674c2f4c4708e474ad2b..440135a61d43fbee4aa0a8799cb990daf93a36b3 100644
Binary files a/.gradle/7.3.3/fileHashes/fileHashes.bin and b/.gradle/7.3.3/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock
index d52e66c73528812ab8d55f50bba9537c0d6d6a1b..05bf1f91d6c88e64cdb44179f760f20ac37efaaf 100644
Binary files a/.gradle/7.3.3/fileHashes/fileHashes.lock and b/.gradle/7.3.3/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index ed90e7da3020774d4a4d0b63368292b61345d176..4bff1ed14e521467a6812177a1ee014eeedf8402 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index f7b00fb8a096627919150a94a2564039fd99efb7..407d74a6e157dad9e2e174fd212af1e6716e0299 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml b/.idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f990e549a3df0ec923b376ce6376b32599c4e7d2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.moshi:moshi:1.13.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/da685586facab9eb5c4fb630ce248be14e7da21b/moshi-1.13.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/5a2db1031c2d2bf7b5af1575456d778727ee32f/moshi-1.13.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/e2f718e52cdb2dc17b457d75f0947e2959903959/moshi-1.13.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml b/.idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..61faa4158b7f6cebca8f2d00cc8aba5e3d4d2c51
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi-kotlin/1.13.0/5cacbc44534ccc4a04719be599fff66fb1fbdfb9/moshi-kotlin-1.13.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi-kotlin/1.13.0/6aaa79c092c28e9863c2206e9bea6f38f8381ac/moshi-kotlin-1.13.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi-kotlin/1.13.0/c35db4351cca26d3c10c3e6260cc2327a37392d8/moshi-kotlin-1.13.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml
deleted file mode 100644
index f0b1401e825ac988b7bd988eaf372f4948f18dfa..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.squareup.okio:okio:1.17.2">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/b223e35cf99bb8c3d2a5b369b6b52093a6a750c2/okio-1.17.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/331ecaeba2fd87c06a0766e8ebe718e1e294f27d/okio-1.17.2-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a05824f725a5a66724ebf956ce29fd509b75f170
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.okio:okio:2.10.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.10.0/accaddddbb597fb70290fd40358b1ce66b8c2b3d/okio-jvm-2.10.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.10.0/1dfc782569ad3d50583495fc2f9fe27f8bc1be3d/okio-2.10.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.10.0/9600a13b3037fe9548bc0af13cb6ffa7414a99a1/okio-2.10.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0249b4dd74e770354d4bea80e5013eae6f8e84b1
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-moshi/2.9.0/db0979801926e6d39bc2478736145f9761c3e034/converter-moshi-2.9.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-moshi/2.9.0/cf43081e493a6eec8e9c22e4c22790ed2ee24efc/converter-moshi-2.9.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-moshi/2.9.0/274e84654aca7c92d957aaeae21382e192a49a8/converter-moshi-2.9.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml
deleted file mode 100644
index d1fea57130d3492e83b46f27185d57acbfc4f2da..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.9.0/e9ee6f35fb7ba877a35519f9a8f55c648df820d4/converter-scalars-2.9.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.9.0/27bde53ab0ac67523ba150fc6ac671d46aef4c8a/converter-scalars-2.9.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.9.0/e85efc627a70eb797632f8d427e598d8a95ebaf/converter-scalars-2.9.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e60d6dfa3547ffe24190fd1993f65be9bebe6ad9
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.6.0/a215a7f914d5916dc5fd2d45cea16524e0220203/kotlin-reflect-1.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-reflect-1.6.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.6.0/2148ad58f5141ac0c6527bac514b8b785713708b/kotlin-reflect-1.6.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml
deleted file mode 100644
index 8ce5bf14f773473aee75918ef56e989fc42d0f93..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.31/6628d61d0f5603568e72d2d5915d2c034b4f1c55/kotlin-stdlib-1.5.31.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.31/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-1.5.31-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.31/70f4e47092d0158a39aafc634ad60b6320c3d6ce/kotlin-stdlib-1.5.31-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba50b1f0d97be7fa8e944822bf0f6744c7e23f7d
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.6.0/a40b8b22529b733892edf4b73468ce598bb17f04/kotlin-stdlib-1.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-1.6.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.6.0/a6284476c56bd752eb0020e062c78c930abdc168/kotlin-stdlib-1.6.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml
deleted file mode 100644
index 082826f729368f9063fbcdc0da3de6505df698c1..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" type="kotlin.common">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31/43331609c7de811fed085e0dfd150874b157c32/kotlin-stdlib-common-1.5.31.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-common-1.5.31-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31/ee22598c6d20e94e0fd08cc696f09f83e41b3935/kotlin-stdlib-common-1.5.31-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..92a79811d409df339ebe757e96b11b9974183d93
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" type="kotlin.common">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.0/7857e365f925cfa060f941c1357cda1f8790502c/kotlin-stdlib-common-1.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-common-1.6.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.0/241e9056f9415f6970a9d7d43de2a117b94959d0/kotlin-stdlib-common-1.6.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..935133dc222195ff461f8fb4cacce9397d2dc9ce
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.0/da6bdc87391322974a43ccc00a25536ae74dad51/kotlin-stdlib-jdk7-1.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-jdk7-1.6.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.0/ccdfdab71f0f3ba104191d8f673d0620e7ed2e46/kotlin-stdlib-jdk7-1.6.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5f93893ff9c2d2db5879320ec2434d37e276a878
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.0/baf82c475e9372c25407f3d132439e4aa803b8b8/kotlin-stdlib-jdk8-1.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-jdk8-1.6.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.0/a61c046a90a08dd30eb105b8b8530fce678ecb46/kotlin-stdlib-jdk8-1.6.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules/app/MarsPhotos.app.androidTest.iml b/.idea/modules/app/MarsPhotos.app.androidTest.iml
index 01911bce785c3b34a90ee8e7956fe8122d7ed01e..8cd9705a946828c959baf6651e747c67ed6c0572 100644
--- a/.idea/modules/app/MarsPhotos.app.androidTest.iml
+++ b/.idea/modules/app/MarsPhotos.app.androidTest.iml
@@ -31,13 +31,20 @@
<arg>$USER_HOME$/.gradle/caches/transforms-3/745a3864afa770389e88c0c27d7feee0/transformed/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/eff1ebde4fd8c4d0d286003f921a9f3f/transformed/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/837af72680ba95e39dc2a842d2d964c4/transformed/jetified-kotlinx-coroutines-android-1.4.1.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/caf139de7e20b6365b22a4bd716d75fe/transformed/jetified-moshi-kotlin-1.13.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/ecc4355351acb175a8e8b2fb4187bd80/transformed/jetified-kotlin-reflect-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/0934dd603a90fcf1273942c8265202e8/transformed/jetified-converter-moshi-2.9.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/9ae528a4f6a3367e5731e1abdb826c40/transformed/jetified-moshi-1.13.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/ca2f258da5f0b13877c315eb96b7b5a2/transformed/jetified-kotlin-stdlib-jdk8-1.6.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/d18815ae34dbece54cb2e58cc8a029b1/transformed/navigation-common-ktx-2.3.5-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/f77a71e57c1f97a636429568f0e2b65f/transformed/jetified-collection-ktx-1.1.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/c53ff331c7e8511db420d28f44e40519/transformed/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/52c6bb7e34c4780e36f2a83296962719/transformed/jetified-kotlin-stdlib-1.5.31.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/6f7d376e678fa028b52e453ccc9874f4/transformed/jetified-converter-scalars-2.9.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/6d0fc1969f98cc6f13a6878e069f30e4/transformed/jetified-okio-jvm-2.10.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/65ed3dfc4f273a334776b385f0de403b/transformed/jetified-kotlin-stdlib-jdk7-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/c2906dea34bbf28bc01d644150879019/transformed/jetified-kotlin-stdlib-1.6.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/4f67ff79be93972270067427bb87136c/transformed/jetified-viewbinding-7.2.2-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/ca7602e8544ecf5deb12bc513835bef2/transformed/jetified-lifecycle-process-2.2.0-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/5fdc6d5d731ededd5c9d7e59ab48afd8/transformed/jetified-lifecycle-service-2.2.0-api.jar</arg>
@@ -80,9 +87,7 @@
<arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/069f843916ead4071e50108505c9e15e/transformed/jetified-annotation-experimental-1.1.0-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/7562b4b8ea427c69eb732d0794a11d6a/transformed/jetified-annotations-13.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/d4e851ec70827e1b5f131be3f04db443/transformed/jetified-kotlin-stdlib-common-1.5.31.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/19c2c41bd7c5dcba9db4b14d27d0137f/transformed/jetified-okio-1.17.2.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/5e82e7bf9603922773e0af91b5bfb276/transformed/jetified-kotlin-stdlib-common-1.6.0.jar</arg>
<arg>$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-31/android.jar</arg>
<arg>$USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar</arg>
</args>
@@ -157,15 +162,20 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection-ktx:1.1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.10.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi:1.13.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:databinding-runtime:7.2.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:viewbinding:7.2.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
diff --git a/.idea/modules/app/MarsPhotos.app.main.iml b/.idea/modules/app/MarsPhotos.app.main.iml
index 48d2da69264c87aa75feaa69b38c22fb336731e6..65f88c04dd8dc95466b7c4f8e142fe094f6c7673 100644
--- a/.idea/modules/app/MarsPhotos.app.main.iml
+++ b/.idea/modules/app/MarsPhotos.app.main.iml
@@ -14,6 +14,7 @@
<stringArguments>
<stringArg name="classpath">
<args>
+ <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/e9db5c5c0739c825af784661011b0915/transformed/databinding-runtime-7.2.2-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/e249974dacb90bb898105d54a04ab873/transformed/databinding-adapters-7.2.2-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/7.2.2/cb53bd625b7a99cf218f46634d07d1886441288/databinding-common-7.2.2.jar</arg>
@@ -74,15 +75,20 @@
<arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/837af72680ba95e39dc2a842d2d964c4/transformed/jetified-kotlinx-coroutines-android-1.4.1.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/52c6bb7e34c4780e36f2a83296962719/transformed/jetified-kotlin-stdlib-1.5.31.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/caf139de7e20b6365b22a4bd716d75fe/transformed/jetified-moshi-kotlin-1.13.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/ecc4355351acb175a8e8b2fb4187bd80/transformed/jetified-kotlin-reflect-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/0934dd603a90fcf1273942c8265202e8/transformed/jetified-converter-moshi-2.9.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/9ae528a4f6a3367e5731e1abdb826c40/transformed/jetified-moshi-1.13.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/ca2f258da5f0b13877c315eb96b7b5a2/transformed/jetified-kotlin-stdlib-jdk8-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/6d0fc1969f98cc6f13a6878e069f30e4/transformed/jetified-okio-jvm-2.10.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/65ed3dfc4f273a334776b385f0de403b/transformed/jetified-kotlin-stdlib-jdk7-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/c2906dea34bbf28bc01d644150879019/transformed/jetified-kotlin-stdlib-1.6.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/7562b4b8ea427c69eb732d0794a11d6a/transformed/jetified-annotations-13.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/d4e851ec70827e1b5f131be3f04db443/transformed/jetified-kotlin-stdlib-common-1.5.31.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/5e82e7bf9603922773e0af91b5bfb276/transformed/jetified-kotlin-stdlib-common-1.6.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/069f843916ead4071e50108505c9e15e/transformed/jetified-annotation-experimental-1.1.0-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/8b616e05b06556d2825e76c8eacb3731/transformed/constraintlayout-2.1.1-api.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/6f7d376e678fa028b52e453ccc9874f4/transformed/jetified-converter-scalars-2.9.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/19c2c41bd7c5dcba9db4b14d27d0137f/transformed/jetified-okio-1.17.2.jar</arg>
<arg>$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-31/android.jar</arg>
<arg>$USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar</arg>
</args>
@@ -164,15 +170,20 @@
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection-ktx:1.1.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
- <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
- <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.10.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.13.0" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:7.2.2@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:7.2.2@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
diff --git a/.idea/modules/app/MarsPhotos.app.unitTest.iml b/.idea/modules/app/MarsPhotos.app.unitTest.iml
index fca1b2dd5f6d841e5b2152aa19315c933ceabdc2..059a42f6960dab588107f8fbaa8d53ad6a91ae10 100644
--- a/.idea/modules/app/MarsPhotos.app.unitTest.iml
+++ b/.idea/modules/app/MarsPhotos.app.unitTest.iml
@@ -14,6 +14,7 @@
<stringArguments>
<stringArg name="classpath">
<args>
+ <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/e9db5c5c0739c825af784661011b0915/transformed/databinding-runtime-7.2.2-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/e249974dacb90bb898105d54a04ab873/transformed/databinding-adapters-7.2.2-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/7.2.2/cb53bd625b7a99cf218f46634d07d1886441288/databinding-common-7.2.2.jar</arg>
@@ -74,15 +75,20 @@
<arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/837af72680ba95e39dc2a842d2d964c4/transformed/jetified-kotlinx-coroutines-android-1.4.1.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/52c6bb7e34c4780e36f2a83296962719/transformed/jetified-kotlin-stdlib-1.5.31.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/caf139de7e20b6365b22a4bd716d75fe/transformed/jetified-moshi-kotlin-1.13.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/ecc4355351acb175a8e8b2fb4187bd80/transformed/jetified-kotlin-reflect-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/0934dd603a90fcf1273942c8265202e8/transformed/jetified-converter-moshi-2.9.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/9ae528a4f6a3367e5731e1abdb826c40/transformed/jetified-moshi-1.13.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/ca2f258da5f0b13877c315eb96b7b5a2/transformed/jetified-kotlin-stdlib-jdk8-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/6d0fc1969f98cc6f13a6878e069f30e4/transformed/jetified-okio-jvm-2.10.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/65ed3dfc4f273a334776b385f0de403b/transformed/jetified-kotlin-stdlib-jdk7-1.6.0.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/c2906dea34bbf28bc01d644150879019/transformed/jetified-kotlin-stdlib-1.6.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/7562b4b8ea427c69eb732d0794a11d6a/transformed/jetified-annotations-13.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/d4e851ec70827e1b5f131be3f04db443/transformed/jetified-kotlin-stdlib-common-1.5.31.jar</arg>
+ <arg>$USER_HOME$/.gradle/caches/transforms-3/5e82e7bf9603922773e0af91b5bfb276/transformed/jetified-kotlin-stdlib-common-1.6.0.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/069f843916ead4071e50108505c9e15e/transformed/jetified-annotation-experimental-1.1.0-api.jar</arg>
<arg>$USER_HOME$/.gradle/caches/transforms-3/8b616e05b06556d2825e76c8eacb3731/transformed/constraintlayout-2.1.1-api.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/6f7d376e678fa028b52e453ccc9874f4/transformed/jetified-converter-scalars-2.9.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
- <arg>$USER_HOME$/.gradle/caches/transforms-3/19c2c41bd7c5dcba9db4b14d27d0137f/transformed/jetified-okio-1.17.2.jar</arg>
<arg>$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-31/android.jar</arg>
<arg>$USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar</arg>
</args>
@@ -152,15 +158,20 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection-ktx:1.1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.10.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi:1.13.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:databinding-runtime:7.2.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:viewbinding:7.2.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 4eead143057d14be2e471bdbe80ccdbf8842ef2f..339ccbb0ea72c04da12d46c9565ff38adea07d45 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,8 +63,9 @@ dependencies {
implementation 'com.google.android.material:material:1.4.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- // Retrofit
- implementation "com.squareup.retrofit2:retrofit:2.9.0"
- // Retrofit with Scalar Converter
- implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
+ // Retrofit with Moshi Converter
+ implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
+
+ // Moshi
+ implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt b/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt
index 33fe5163906d7effe0ea441c75a48dfb2444e494..3a251cf76da249172801a863539d3e7990d077fa 100644
--- a/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt
+++ b/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt
@@ -1,18 +1,21 @@
package com.example.android.marsphotos.network
-
+import com.squareup.moshi.Moshi
import retrofit2.Retrofit
-import retrofit2.converter.scalars.ScalarsConverterFactory
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import retrofit2.converter.moshi.MoshiConverterFactory
import retrofit2.http.GET
-
+private val moshi = Moshi.Builder()
+ .add(KotlinJsonAdapterFactory())
+ .build()
private const val BASE_URL =
"https://android-kotlin-fun-mars-server.appspot.com"
private val retrofit = Retrofit.Builder()
- .addConverterFactory(ScalarsConverterFactory.create())
+ .addConverterFactory(MoshiConverterFactory.create(moshi))
.baseUrl(BASE_URL)
.build()
interface MarsApiService {
@GET("photos")
- suspend fun getPhotos(): String
+ suspend fun getPhotos(): List<MarsPhoto>
}
object MarsApi {
val retrofitService : MarsApiService by lazy {
diff --git a/app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt b/app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt
new file mode 100644
index 0000000000000000000000000000000000000000..ed37404f41ca2aa212a68a8eb58459e02214eaae
--- /dev/null
+++ b/app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt
@@ -0,0 +1,7 @@
+package com.example.android.marsphotos.network
+
+import com.squareup.moshi.Json
+
+data class MarsPhoto(
+ val id: String, @Json(name = "img_src") val imgSrcUrl: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt b/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt
index 8902214c975030f90c9baa0d91d50a8687d81bd4..ce974e6f59fd5bf0ce51516986217cb1003ffe36 100644
--- a/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt
+++ b/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt
@@ -48,7 +48,7 @@ class OverviewViewModel : ViewModel() {
viewModelScope.launch {
try {
val listResult = MarsApi.retrofitService.getPhotos()
- _status.value = listResult
+ _status.value = "Success: ${listResult.size} Mars photos retrieved"
} catch (e: Exception) {
_status.value = "Failure: ${e.message}"
}