Convert cloud modules to kotlin multiplatform (#892)

ashdavies · Mar 12, 2024 · 1a71db8 · 1a71db8
1 parent b671097
commit 1a71db8
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 101 deletions.
diff --git a/app-check/app-check-sdk/build.gradle.kts b/app-check/app-check-sdk/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("io.ashdavies.cloud")
+    id("io.ashdavies.kotlin")
     id("io.ashdavies.properties")
 
     alias(libs.plugins.build.config)
@@ -25,15 +25,19 @@ buildConfig {
     packageName.set("io.ashdavies.check")
 }
 
-dependencies {
-    implementation(libs.auth.java.jwt)
-    implementation(libs.auth.jwks.rsa)
-    implementation(libs.google.auth.http)
-    implementation(libs.google.firebase.admin)
-    implementation(libs.kotlinx.datetime)
-    implementation(libs.kotlinx.serialization.core)
-    implementation(libs.ktor.client.core)
-
-    runtimeOnly(libs.google.guava.jre)
-    runtimeOnly(libs.slf4j.simple)
+kotlin {
+    commonMain.dependencies {
+        implementation(libs.auth.java.jwt)
+        implementation(libs.auth.jwks.rsa)
+        implementation(libs.google.auth.http)
+        implementation(libs.google.firebase.admin)
+        implementation(libs.kotlinx.datetime)
+        implementation(libs.kotlinx.serialization.core)
+        implementation(libs.ktor.client.core)
+    }
+
+    jvmMain.dependencies {
+        runtimeOnly(libs.google.guava.jre)
+        runtimeOnly(libs.slf4j.simple)
+    }
 }
diff --git a/...in/kotlin/io/ashdavies/check/Algorithm.kt → ...in/kotlin/io/ashdavies/check/Algorithm.kt b/...in/kotlin/io/ashdavies/check/Algorithm.kt → ...in/kotlin/io/ashdavies/check/Algorithm.kt
diff --git a/...ain/kotlin/io/ashdavies/check/AppCheck.kt → ...ain/kotlin/io/ashdavies/check/AppCheck.kt b/...ain/kotlin/io/ashdavies/check/AppCheck.kt → ...ain/kotlin/io/ashdavies/check/AppCheck.kt
diff --git a/...n/io/ashdavies/check/AppCheckGenerator.kt → ...n/io/ashdavies/check/AppCheckGenerator.kt b/...n/io/ashdavies/check/AppCheckGenerator.kt → ...n/io/ashdavies/check/AppCheckGenerator.kt
diff --git a/...in/io/ashdavies/check/AppCheckVerifier.kt → ...in/io/ashdavies/check/AppCheckVerifier.kt b/...in/io/ashdavies/check/AppCheckVerifier.kt → ...in/io/ashdavies/check/AppCheckVerifier.kt
diff --git a/...kotlin/io/ashdavies/check/BearerTokens.kt → ...tlin/io/ashdavies/check/BearerResponse.kt b/...kotlin/io/ashdavies/check/BearerTokens.kt → ...tlin/io/ashdavies/check/BearerResponse.kt
diff --git a/...kotlin/io/ashdavies/check/CryptoSigner.kt → ...kotlin/io/ashdavies/check/CryptoSigner.kt b/...kotlin/io/ashdavies/check/CryptoSigner.kt → ...kotlin/io/ashdavies/check/CryptoSigner.kt
diff --git a/.../kotlin/io/ashdavies/check/FirebaseApp.kt → .../kotlin/io/ashdavies/check/FirebaseApp.kt b/.../kotlin/io/ashdavies/check/FirebaseApp.kt → .../kotlin/io/ashdavies/check/FirebaseApp.kt
diff --git a/...n/kotlin/io/ashdavies/check/JwtCreator.kt → ...n/kotlin/io/ashdavies/check/JwtCreator.kt b/...n/kotlin/io/ashdavies/check/JwtCreator.kt → ...n/kotlin/io/ashdavies/check/JwtCreator.kt
@@ -11,7 +11,7 @@ import kotlinx.datetime.toJavaInstant
 import kotlin.time.Duration.Companion.hours
 
 private const val APP_CHECK_ENDPOINT = "https://firebaseappcheck.googleapis.com"
-private const val APP_CHECK_AUDIENCE = "${APP_CHECK_ENDPOINT}/google.firebase.appcheck.v1.TokenExchangeService"
+private const val APP_CHECK_AUDIENCE = "$APP_CHECK_ENDPOINT/google.firebase.appcheck.v1.TokenExchangeService"
 
 internal object Jwt : JWT()
 

diff --git a/build-plugins/src/main/kotlin/io.ashdavies.cloud.gradle.kts b/build-plugins/src/main/kotlin/io.ashdavies.cloud.gradle.kts
diff --git a/build-plugins/src/main/kotlin/io.ashdavies.graphql.gradle.kts b/build-plugins/src/main/kotlin/io.ashdavies.graphql.gradle.kts
diff --git a/events-aggregator/build.gradle.kts b/events-aggregator/build.gradle.kts
@@ -1,11 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+
 plugins {
-    id("io.ashdavies.cloud")
-    id("io.ashdavies.graphql")
+    id("io.ashdavies.kotlin")
     id("io.ashdavies.properties")
 
+    alias(libs.plugins.apollo.graphql)
     alias(libs.plugins.build.config)
 }
 
+apollo {
+    generateKotlinModels.set(true)
+}
+
 buildConfig {
     val githubToken by stringPropertyOrNull { value ->
         buildConfigField<String?>("GITHUB_TOKEN", value)
@@ -14,12 +20,16 @@ buildConfig {
     packageName.set("io.ashdavies.playground.aggregator")
 }
 
-dependencies {
-    implementation(projects.microYaml)
+kotlin {
+    explicitApi = ExplicitApiMode.Disabled
 
-    implementation(libs.apollo.graphql.coroutines.support)
-    implementation(libs.apollo.graphql.runtime)
-    implementation(libs.kotlinx.serialization.core)
-    implementation(libs.squareup.okhttp)
-    implementation(libs.squareup.okio)
+    commonMain.dependencies {
+        implementation(projects.microYaml)
+
+        implementation(libs.apollo.graphql.coroutines.support)
+        implementation(libs.apollo.graphql.runtime)
+        implementation(libs.kotlinx.serialization.core)
+        implementation(libs.squareup.okhttp)
+        implementation(libs.squareup.okio)
+    }
 }
diff --git a/...shdavies/playground/github/events.graphql → ...shdavies/playground/github/events.graphql b/...shdavies/playground/github/events.graphql → ...shdavies/playground/github/events.graphql
diff --git a/...o/ashdavies/playground/github/schema.json → ...o/ashdavies/playground/github/schema.json b/...o/ashdavies/playground/github/schema.json → ...o/ashdavies/playground/github/schema.json
diff --git a/...playground/aggregator/AggregatorModule.kt → ...playground/aggregator/AggregatorModule.kt b/...playground/aggregator/AggregatorModule.kt → ...playground/aggregator/AggregatorModule.kt
diff --git a/...ground/apollo/AuthorisationInterceptor.kt → ...ground/apollo/AuthorisationInterceptor.kt b/...ground/apollo/AuthorisationInterceptor.kt → ...ground/apollo/AuthorisationInterceptor.kt
diff --git a/...n/io/ashdavies/playground/apollo/Query.kt → ...n/io/ashdavies/playground/apollo/Query.kt b/...n/io/ashdavies/playground/apollo/Query.kt → ...n/io/ashdavies/playground/apollo/Query.kt
diff --git a/...davies/playground/github/GitHubService.kt → ...davies/playground/github/GitHubService.kt b/...davies/playground/github/GitHubService.kt → ...davies/playground/github/GitHubService.kt
@@ -8,47 +8,16 @@ import io.ashdavies.playground.apollo.entries
 import io.ashdavies.playground.apollo.requireOid
 import io.ashdavies.playground.apollo.requireText
 import io.ashdavies.yaml.Yaml
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 public interface GitHubService {
-    public suspend fun <T : Any> getEvents(
-        mapper: (
-            @ParameterName("id")
-            String,
-            @ParameterName("name")
-            String,
-            @ParameterName("website")
-            String,
-            @ParameterName("location")
-            String,
-            @ParameterName("status")
-            String?,
-            @ParameterName("online")
-            Boolean?,
-            @ParameterName("dateStart")
-            String,
-            @ParameterName("dateEnd")
-            String,
-            @ParameterName("cfpStart")
-            String?,
-            @ParameterName("cfpEnd")
-            String?,
-            @ParameterName("cfpSite")
-            String?,
-        ) -> T,
-    ): List<T>
 
-    public companion object Default : GitHubService by GitHubService(
-        client = ApolloClient(),
-        yaml = Yaml,
-    )
-}
+    public suspend fun <T : Any> getEvents(mapper: Mapper<T>): List<T>
 
-@Suppress("NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING")
-public fun GitHubService(client: ApolloClient, yaml: Yaml) = object : GitHubService {
-    override suspend fun <T : Any> getEvents(
-        mapper: (
+    public fun interface Mapper<T : Any> {
+        public operator fun invoke(
             id: String,
             name: String,
             website: String,
@@ -60,30 +29,36 @@ public fun GitHubService(client: ApolloClient, yaml: Yaml) = object : GitHubServ
             cfpStart: String?,
             cfpEnd: String?,
             cfpSite: String?,
-        ) -> T,
-    ): List<T> {
+        ): T
+    }
+
+    @OptIn(ExperimentalSerializationApi::class)
+    public companion object Default : GitHubService by GitHubService(
+        client = ApolloClient(),
+        yaml = Yaml,
+    )
+}
+
+@ExperimentalSerializationApi
+public fun GitHubService(client: ApolloClient, yaml: Yaml): GitHubService = object : GitHubService {
+    override suspend fun <T : Any> getEvents(mapper: GitHubService.Mapper<T>): List<T> {
         val entries: List<EventsQuery.AsBlob> = client
             .query(EventsQuery())
             .await()
             .entries
             .asBlobs()
 
-        return entries.map {
-            with(yaml.decodeFromString(GitHubConference.serializer(), it.requireText())) {
-                mapper(
-                    /* id */ it.requireOid(),
-                    /* name */ name,
-                    /* website */ website,
-                    /* location */ location,
-                    /* status */ status,
-                    /* online */ online,
-                    /* dateStart */ dateStart,
-                    /* dateEnd */ dateEnd,
-                    /* cfpStart */ cfp?.start,
-                    /* cfpEnd */ cfp?.end,
-                    /* cfpSite */ cfp?.site,
-                )
-            }
+        val serializer = GitHubConference.serializer()
+
+        return entries.map { blob ->
+            val value = yaml.decodeFromString(serializer, blob.requireText())
+
+            mapper(
+                id = blob.requireOid(), name = value.name, website = value.website,
+                location = value.location, status = value.status, online = value.online,
+                dateStart = value.dateStart, dateEnd = value.dateEnd, cfpStart = value.cfp?.start,
+                cfpEnd = value.cfp?.end, cfpSite = value.cfp?.site,
+            )
         }
     }
 }