Update schema, enable explicit API mode for KMP modules.

ReactiveCircus · Nov 23, 2023 · 53799d7 · 53799d7
1 parent 71ae5b8
commit 53799d7
Show file tree

Hide file tree

Showing 27 changed files with 135 additions and 121 deletions.
diff --git a/...d-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/KMPBuildLogic.kt b/...d-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/KMPBuildLogic.kt
@@ -4,6 +4,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /**
  * Apply common configs to KMP project.
@@ -33,7 +34,7 @@ internal fun KotlinMultiplatformExtension.configureKMPCommon(
 /**
  * Apply test configs to KMP project.
  */
-internal fun KotlinMultiplatformExtension.configureKMPCommon() {
+internal fun KotlinMultiplatformExtension.configureKMPTest() {
     with(sourceSets) {
         commonTest {
             dependencies {
@@ -60,3 +61,14 @@ internal fun Project.configureKotlinCommonCompileOptions() {
         }
     }
 }
+
+/**
+ * Enable explicit API mode for non-test Kotlin compilations
+ */
+internal fun Project.enableExplicitApi() {
+    tasks.withType<KotlinCompile>().configureEach {
+        if (!name.contains("TestKotlin")) {
+            kotlinOptions.freeCompilerArgs += "-Xexplicit-api=strict"
+        }
+    }
+}
diff --git a/.../io/github/reactivecircus/kstreamlined/buildlogic/convention/KMPCommonConventionPlugin.kt b/.../io/github/reactivecircus/kstreamlined/buildlogic/convention/KMPCommonConventionPlugin.kt
@@ -1,6 +1,7 @@
 package io.github.reactivecircus.kstreamlined.buildlogic.convention
 
 import io.github.reactivecircus.kstreamlined.buildlogic.configureDetekt
+import io.github.reactivecircus.kstreamlined.buildlogic.enableExplicitApi
 import io.github.reactivecircus.kstreamlined.buildlogic.configureKMPCommon
 import io.github.reactivecircus.kstreamlined.buildlogic.configureKotlinCommonCompileOptions
 import io.github.reactivecircus.kstreamlined.buildlogic.configureTest
@@ -16,6 +17,7 @@ internal class KMPCommonConventionPlugin : Plugin<Project> {
 
         extensions.configure<KotlinMultiplatformExtension> {
             configureKMPCommon(target)
+            enableExplicitApi()
         }
 
         configureKotlinCommonCompileOptions()

diff --git a/...io/github/reactivecircus/kstreamlined/buildlogic/convention/KMPIosOnlyConventionPlugin.kt b/...io/github/reactivecircus/kstreamlined/buildlogic/convention/KMPIosOnlyConventionPlugin.kt
@@ -4,6 +4,7 @@ import io.github.reactivecircus.kstreamlined.buildlogic.configureDetekt
 import io.github.reactivecircus.kstreamlined.buildlogic.configureKMPCommon
 import io.github.reactivecircus.kstreamlined.buildlogic.configureKotlinCommonCompileOptions
 import io.github.reactivecircus.kstreamlined.buildlogic.configureTest
+import io.github.reactivecircus.kstreamlined.buildlogic.enableExplicitApi
 import io.github.reactivecircus.kstreamlined.buildlogic.markNonCompatibleConfigurationCacheTasks
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -16,6 +17,7 @@ internal class KMPIosOnlyConventionPlugin : Plugin<Project> {
 
         extensions.configure<KotlinMultiplatformExtension> {
             configureKMPCommon(target, enableJvmTarget = false)
+            enableExplicitApi()
         }
 
         configureKotlinCommonCompileOptions()

diff --git a/...in/io/github/reactivecircus/kstreamlined/buildlogic/convention/KMPTestConventionPlugin.kt b/...in/io/github/reactivecircus/kstreamlined/buildlogic/convention/KMPTestConventionPlugin.kt
@@ -1,6 +1,6 @@
 package io.github.reactivecircus.kstreamlined.buildlogic.convention
 
-import io.github.reactivecircus.kstreamlined.buildlogic.configureKMPCommon
+import io.github.reactivecircus.kstreamlined.buildlogic.configureKMPTest
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -11,7 +11,7 @@ internal class KMPTestConventionPlugin : Plugin<Project> {
         pluginManager.apply("org.jetbrains.kotlin.multiplatform")
 
         extensions.configure<KotlinMultiplatformExtension> {
-            configureKMPCommon()
+            configureKMPTest()
         }
     }
 }
diff --git a/...s/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/utils/ResultExt.kt b/...s/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/utils/ResultExt.kt
@@ -8,7 +8,7 @@ import kotlin.coroutines.cancellation.CancellationException
  * [block] function execution and encapsulating it as a failure.
  */
 @Suppress("TooGenericExceptionCaught", "InstanceOfCheckForException")
-inline fun <T, R> T.runCatchingNonCancellationException(block: () -> R): Result<R> {
+public inline fun <T, R> T.runCatchingNonCancellationException(block: () -> R): Result<R> {
     return try {
         Result.success(block())
     } catch (e: Throwable) {

diff --git a/...c/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/FeedRepository.kt b/...c/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/FeedRepository.kt
@@ -1,31 +1,38 @@
 package io.github.reactivecircus.kstreamlined.kmp.data.feed
 
+import co.touchlab.kermit.Logger
+import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedOriginItem
 import io.github.reactivecircus.kstreamlined.kmp.feed.datasource.FeedDataSource
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
 
-class FeedRepository(
+public class FeedRepository(
     private val feedDataSource: FeedDataSource
 ) {
 
-    val feedSyncState: Flow<FeedSyncState> = TODO()
+    public val feedSyncState: Flow<FeedSyncState> = emptyFlow()
 
-    suspend fun syncNow() {
-        feedDataSource.loadFeedEntries(null, true)
-        TODO()
+    public suspend fun syncNow() {
+        feedDataSource.loadFeedEntries(null, true).also {
+            Logger.i("<<Number of entries: ${it.size}>>")
+            it.forEach { entry ->
+                Logger.i("${entry::class.simpleName}: ${entry.title}, ${entry.publishTime}}")
+            }
+        }
     }
 
-    suspend fun selectFeedSource(feedOrigin: FeedOriginItem) {
+    public suspend fun selectFeedSource(feedOrigin: FeedOriginItem) {
         feedOrigin.selected
         TODO()
     }
 
-    suspend fun unselectFeedSource(feedOrigin: FeedOriginItem) {
+    public suspend fun unselectFeedSource(feedOrigin: FeedOriginItem) {
         feedOrigin.selected
         TODO()
     }
 
-    suspend fun getSavedFeedItems() {
+    public suspend fun loadSavedFeedItems(): List<FeedItem> {
         TODO()
     }
 }
diff --git a/...rc/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/FeedSyncState.kt b/...rc/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/FeedSyncState.kt
@@ -3,7 +3,7 @@ package io.github.reactivecircus.kstreamlined.kmp.data.feed
 import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedItem
 import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedOriginItem
 
-data class FeedSyncState(
+public data class FeedSyncState(
     val feedOrigins: List<FeedOriginItem>,
     val feedItems: List<FeedItem>,
 )
diff --git a/...c/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/model/FeedItem.kt b/...c/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/model/FeedItem.kt
@@ -1,48 +1,47 @@
 package io.github.reactivecircus.kstreamlined.kmp.data.feed.model
 
-sealed interface FeedItem {
-    val id: String
-    val title: String
-    val publishTimestamp: String
-    val contentUrl: String
-    val savedForLater: Boolean
+public sealed interface FeedItem {
+    public val id: String
+    public val title: String
+    public val publishTime: String
+    public val contentUrl: String
+    public val savedForLater: Boolean
 
-    data class KotlinBlog(
+    public data class KotlinBlog(
         override val id: String,
         override val title: String,
-        override val publishTimestamp: String,
+        override val publishTime: String,
         override val contentUrl: String,
         override val savedForLater: Boolean,
         val featuredImageUrl: String?,
         val description: String,
     ) : FeedItem
 
-    data class KotlinYouTube(
+    public data class KotlinYouTube(
         override val id: String,
         override val title: String,
-        override val publishTimestamp: String,
+        override val publishTime: String,
         override val contentUrl: String,
         override val savedForLater: Boolean,
         val thumbnailUrl: String,
         val description: String,
     ) : FeedItem
 
-    data class TalkingKotlin(
+    public data class TalkingKotlin(
         override val id: String,
         override val title: String,
-        override val publishTimestamp: String,
+        override val publishTime: String,
         override val contentUrl: String,
         override val savedForLater: Boolean,
         val podcastLogoUrl: String,
         val tags: List<String>,
     ) : FeedItem
 
-    data class KotlinWeekly(
+    public data class KotlinWeekly(
         override val id: String,
         override val title: String,
-        override val publishTimestamp: String,
+        override val publishTime: String,
         override val contentUrl: String,
         override val savedForLater: Boolean,
-        val newsletterLogoUrl: String,
     ) : FeedItem
 }
diff --git a/...onMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/model/FeedOriginItem.kt b/...onMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/model/FeedOriginItem.kt
@@ -1,12 +1,12 @@
 package io.github.reactivecircus.kstreamlined.kmp.data.feed.model
 
-data class FeedOriginItem(
+public data class FeedOriginItem(
     val key: Key,
     val title: String,
     val description: String,
     val selected: Boolean,
 ) {
-    enum class Key {
+    public enum class Key {
         KotlinBlog,
         KotlinYouTubeChannel,
         TalkingKotlinPodcast,

diff --git a/.../src/commonMain/graphql/io/github/reactivecircus/kstreamlined/graphql/FeedEntries.graphql b/.../src/commonMain/graphql/io/github/reactivecircus/kstreamlined/graphql/FeedEntries.graphql
@@ -2,7 +2,7 @@ query FeedEntriesQuery($filters: [FeedSourceKey!]) {
   feedEntries(filters: $filters) {
     id
     title
-    publishTimestamp
+    publishTime
     contentUrl
     ... on KotlinBlog {
       featuredImageUrl
@@ -17,7 +17,7 @@ query FeedEntriesQuery($filters: [FeedSourceKey!]) {
       tags
     }
     ... on KotlinWeekly {
-      newsletterLogoUrl
+      contentUrl
     }
   }
 }
diff --git a/...loud/src/commonMain/graphql/io/github/reactivecircus/kstreamlined/graphql/schema.graphqls b/...loud/src/commonMain/graphql/io/github/reactivecircus/kstreamlined/graphql/schema.graphqls
@@ -267,9 +267,9 @@ interface FeedEntry {
   title: String!
 
   """
-  Publish date of the feed entry as UTC timestamp.
+  Publish time of the feed entry in ISO 8601.
   """
-  publishTimestamp: String!
+  publishTime: String!
 
   """
   Url of the content.
@@ -328,9 +328,9 @@ type KotlinBlog implements FeedEntry {
   title: String!
 
   """
-  Publish date of the feed entry as UTC timestamp.
+  Publish time of the feed entry in ISO 8601.
   """
-  publishTimestamp: String!
+  publishTime: String!
 
   """
   Url of the content.
@@ -340,7 +340,7 @@ type KotlinBlog implements FeedEntry {
   """
   Url of the feature image.
   """
-  featuredImageUrl: String
+  featuredImageUrl: String!
 
   """
   Description of the blog post.
@@ -360,19 +360,14 @@ type KotlinWeekly implements FeedEntry {
   title: String!
 
   """
-  Publish date of the feed entry as UTC timestamp.
+  Publish time of the feed entry in ISO 8601.
   """
-  publishTimestamp: String!
+  publishTime: String!
 
   """
   Url of the content.
   """
   contentUrl: String!
-
-  """
-  Url of the newsletter logo.
-  """
-  newsletterLogoUrl: String!
 }
 
 type KotlinYouTube implements FeedEntry {
@@ -387,9 +382,9 @@ type KotlinYouTube implements FeedEntry {
   title: String!
 
   """
-  Publish date of the feed entry as UTC timestamp.
+  Publish time of the feed entry in ISO 8601.
   """
-  publishTimestamp: String!
+  publishTime: String!
 
   """
   Url of the content.
@@ -433,9 +428,9 @@ type TalkingKotlin implements FeedEntry {
   title: String!
 
   """
-  Publish date of the feed entry as UTC timestamp.
+  Publish time of the feed entry in ISO 8601.
   """
-  publishTimestamp: String!
+  publishTime: String!
 
   """
   Url of the content.

diff --git a/...n/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/CloudFeedDataSource.kt b/...n/kotlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/CloudFeedDataSource.kt
@@ -11,7 +11,7 @@ import io.github.reactivecircus.kstreamlined.kmp.feed.datasource.model.FeedEntry
 import io.github.reactivecircus.kstreamlined.kmp.feed.datasource.model.FeedOrigin
 import io.github.reactivecircus.kstreamlined.kmp.feed.datasource.networking.defaultFetchPolicy
 
-class CloudFeedDataSource(private val apolloClient: ApolloClient) : FeedDataSource {
+public class CloudFeedDataSource(private val apolloClient: ApolloClient) : FeedDataSource {
 
     override suspend fun loadFeedOrigins(refresh: Boolean): List<FeedOrigin> {
         return runCatching {

diff --git a/...tlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/mapper/FeedEntryMappers.kt b/...tlin/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/mapper/FeedEntryMappers.kt
@@ -17,7 +17,7 @@ internal fun FeedEntriesQuery.KotlinBlogFeedEntry.asExternalModel(): FeedEntry.K
     return FeedEntry.KotlinBlog(
         id = this.id,
         title = this.title,
-        publishTimestamp = this.publishTimestamp,
+        publishTime = this.publishTime,
         contentUrl = this.contentUrl,
         featuredImageUrl = this.onKotlinBlog.featuredImageUrl,
         description = this.onKotlinBlog.description,
@@ -28,7 +28,7 @@ internal fun FeedEntriesQuery.KotlinYouTubeFeedEntry.asExternalModel(): FeedEntr
     return FeedEntry.KotlinYouTube(
         id = this.id,
         title = this.title,
-        publishTimestamp = this.publishTimestamp,
+        publishTime = this.publishTime,
         contentUrl = this.contentUrl,
         thumbnailUrl = this.onKotlinYouTube.thumbnailUrl,
         description = this.onKotlinYouTube.description,
@@ -39,7 +39,7 @@ internal fun FeedEntriesQuery.TalkingKotlinFeedEntry.asExternalModel(): FeedEntr
     return FeedEntry.TalkingKotlin(
         id = this.id,
         title = this.title,
-        publishTimestamp = this.publishTimestamp,
+        publishTime = this.publishTime,
         contentUrl = this.contentUrl,
         podcastLogoUrl = this.onTalkingKotlin.podcastLogoUrl,
         tags = this.onTalkingKotlin.tags,
@@ -50,8 +50,7 @@ internal fun FeedEntriesQuery.KotlinWeeklyFeedEntry.asExternalModel(): FeedEntry
     return FeedEntry.KotlinWeekly(
         id = this.id,
         title = this.title,
-        publishTimestamp = this.publishTimestamp,
+        publishTime = this.publishTime,
         contentUrl = this.contentUrl,
-        newsletterLogoUrl = this.onKotlinWeekly.newsletterLogoUrl,
     )
 }
diff --git a/.../github/reactivecircus/kstreamlined/kmp/feed/datasource/networking/ApolloClientConfigs.kt b/.../github/reactivecircus/kstreamlined/kmp/feed/datasource/networking/ApolloClientConfigs.kt
@@ -5,8 +5,8 @@ import com.apollographql.apollo3.cache.normalized.api.MemoryCacheFactory
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
-object ApolloClientConfigs {
-    val apolloStore = ApolloStore(
+public object ApolloClientConfigs {
+    public val apolloStore: ApolloStore = ApolloStore(
         normalizedCacheFactory = MemoryCacheFactory(
             maxSizeBytes = MaxSizeBytes,
             expireAfterMillis = CacheExpiry.toLong(DurationUnit.MILLISECONDS)

diff --git a/...n/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/util/ApolloApiErrorChecker.kt b/...n/io/github/reactivecircus/kstreamlined/kmp/feed/datasource/util/ApolloApiErrorChecker.kt
@@ -3,7 +3,7 @@ package io.github.reactivecircus.kstreamlined.kmp.feed.datasource.util
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.exception.NoDataException
 
-object ApolloApiErrorChecker : ApiErrorChecker {
+public object ApolloApiErrorChecker : ApiErrorChecker {
     override fun isNetworkError(throwable: Throwable?): Boolean {
         return when (throwable) {
             // when using dataOrThrow() exceptions are wrapped in NoDataException