--- a/manage_feeds/build.gradle.kts Wed Aug 19 22:30:45 2020 -0400
+++ b/manage_feeds/build.gradle.kts Thu Aug 20 14:23:44 2020 -0400
@@ -87,7 +87,7 @@
//geekdroid
implementation("com.geekorum.geekdroid:geekdroid:geekttrss-1.5.2")
- implementation(enforcedPlatform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.7"))
+ implementation(enforcedPlatform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.9"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")
--- a/webapi/build.gradle.kts Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/build.gradle.kts Thu Aug 20 14:23:44 2020 -0400
@@ -30,10 +30,10 @@
implementation("androidx.annotation:annotation:1.1.0")
implementation("javax.inject:javax.inject:1")
- implementation("com.squareup.retrofit2:retrofit:2.6.1")
+ implementation("com.squareup.retrofit2:retrofit:2.8.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC")
- implementation(enforcedPlatform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.6"))
+ implementation(enforcedPlatform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.9"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
--- a/webapi/src/main/kotlin/model/Articles.kt Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/src/main/kotlin/model/Articles.kt Thu Aug 20 14:23:44 2020 -0400
@@ -18,9 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
*/
+@file:OptIn(ExperimentalSerializationApi::class)
package com.geekorum.ttrss.webapi.model
import androidx.annotation.Keep
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
--- a/webapi/src/main/kotlin/model/BaseProtocol.kt Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/src/main/kotlin/model/BaseProtocol.kt Thu Aug 20 14:23:44 2020 -0400
@@ -18,11 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
*/
-@file:OptIn(InternalSerializationApi::class)
+@file:OptIn(ExperimentalSerializationApi::class)
package com.geekorum.ttrss.webapi.model
import androidx.annotation.Keep
-import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@@ -193,7 +193,7 @@
@Serializer(ListResponsePayload::class)
internal class OwnSerializer<E>(
- val contentSerializer: KSerializer<E>
+ private val contentSerializer: KSerializer<E>
) : KSerializer<ListResponsePayload<E>> {
override val descriptor: SerialDescriptor = buildClassSerialDescriptor("ListResponsePayloadSerializer") {
@@ -202,7 +202,7 @@
element("content", ListContent.serializer(contentSerializer).descriptor)
}
- override fun serialize(encoder: Encoder, obj: ListResponsePayload<E>) {
+ override fun serialize(encoder: Encoder, value: ListResponsePayload<E>) {
TODO("not implemented")
}
--- a/webapi/src/main/kotlin/model/Config.kt Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/src/main/kotlin/model/Config.kt Thu Aug 20 14:23:44 2020 -0400
@@ -18,9 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
*/
+@file:OptIn(ExperimentalSerializationApi::class)
package com.geekorum.ttrss.webapi.model
import androidx.annotation.Keep
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
--- a/webapi/src/main/kotlin/model/Login.kt Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/src/main/kotlin/model/Login.kt Thu Aug 20 14:23:44 2020 -0400
@@ -18,9 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
*/
+@file:OptIn(ExperimentalSerializationApi::class)
package com.geekorum.ttrss.webapi.model
import androidx.annotation.Keep
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@@ -87,7 +89,7 @@
override fun deserialize(decoder: Decoder): LoginResponsePayload {
val contentDecoder = decoder.beginStructure(descriptor)
- lateinit var content: LoginResponsePayload.Content
+ lateinit var content: Content
var seq: Int? = null
var status = 0
loop@ while (true) {
--- a/webapi/src/main/kotlin/model/SubscribeToFeed.kt Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/src/main/kotlin/model/SubscribeToFeed.kt Thu Aug 20 14:23:44 2020 -0400
@@ -18,9 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
*/
+@file:OptIn(ExperimentalSerializationApi::class)
package com.geekorum.ttrss.webapi.model
import androidx.annotation.Keep
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
--- a/webapi/src/main/kotlin/model/Version.kt Wed Aug 19 22:30:45 2020 -0400
+++ b/webapi/src/main/kotlin/model/Version.kt Thu Aug 20 14:23:44 2020 -0400
@@ -18,9 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with Geekttrss. If not, see <http://www.gnu.org/licenses/>.
*/
+@file:OptIn(ExperimentalSerializationApi::class)
package com.geekorum.ttrss.webapi.model
import androidx.annotation.Keep
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable