Merge pull request #1667 from joreilly/unbreak-reporting

unbreak reporting

Author: martinbonnin

backend/datastore/build.gradle.kts

@@ -1,4 +1,4 @@
-import compat.patrouille.configureJavaCompatibility
+import tapmoc.configureJavaCompatibility
 
 plugins {
   kotlin("multiplatform")

backend/service-graphql/build.gradle.kts

@@ -1,4 +1,4 @@
-import compat.patrouille.configureJavaCompatibility
+import tapmoc.configureJavaCompatibility
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -16,7 +16,7 @@ configureJavaCompatibility(17)
 dependencies {
   implementation(libs.spring.boot.starter.webflux)
   implementation(libs.apollo.execution.spring)
-  //implementation(libs.apollo.execution.reporting)
+  implementation(libs.apollo.execution.reporting)
   implementation(libs.kotlinx.datetime)
   implementation(libs.kotlinx.serialization)
   implementation(libs.bare.graphQL)

backend/service-graphql/src/main/kotlin/dev/johnoreilly/confetti/backend/DefaultApplication.kt

@@ -6,8 +6,8 @@ import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.apollo.execution.ExecutableSchema
 import com.apollographql.apollo.execution.GraphQLResponse
 import com.apollographql.apollo.execution.InMemoryPersistedDocumentCache
-//import com.apollographql.execution.reporting.ApolloReportingInstrumentation
-//import com.apollographql.execution.reporting.ApolloReportingOperationContext
+import com.apollographql.execution.reporting.ApolloReportingInstrumentation
+import com.apollographql.execution.reporting.ApolloReportingOperationContext
 import com.apollographql.execution.spring.apolloSandboxRoutes
 import com.apollographql.execution.spring.parseAsGraphQLRequest
 import com.example.ServiceExecutableSchemaBuilder
@@ -112,7 +112,7 @@ class DefaultApplication {
                 if (apolloKey != null) {
                     println("Enabling Apollo Reporting")
                 }
-                //addInstrumentation(ApolloReportingInstrumentation(apolloKey))
+                addInstrumentation(ApolloReportingInstrumentation(apolloKey))
             }
             .build()
     }
@@ -166,11 +166,11 @@ class DefaultApplication {
             val executionContext = UidContext(uid) +
                 SourceContext(source) +
                 ConferenceContext(conference) +
-                maxAgeContext
-//                ApolloReportingOperationContext(
-//                    serverRequest.headers().header("apollographql-client-name").firstOrNull(),
-//                    serverRequest.headers().header("apollographql-client-version").firstOrNull(),
-//                )
+                maxAgeContext +
+                ApolloReportingOperationContext(
+                    serverRequest.headers().header("apollographql-client-name").firstOrNull(),
+                    serverRequest.headers().header("apollographql-client-version").firstOrNull(),
+                )
 
             val graphqlRequestResult = serverRequest.parseAsGraphQLRequest()
             if (!graphqlRequestResult.isSuccess) {

backend/service-import/build.gradle.kts

@@ -1,5 +1,4 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
-import compat.patrouille.configureJavaCompatibility
+import tapmoc.configureJavaCompatibility
 
 plugins {
   kotlin("multiplatform")

build-logic/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.kgp.jvm)
     alias(libs.plugins.ksp)
     alias(libs.plugins.gratatouille)
-    alias(libs.plugins.compat.patrouille)
+    alias(libs.plugins.tapmoc)
 }
 
 dependencies {
@@ -32,12 +32,12 @@ dependencies {
     implementation(libs.google.cloud.run)
     implementation(libs.kotlinx.datetime)
     implementation(libs.roborazzi.gradle.plugin)
-    implementation(libs.compat.patrouille)
+    implementation(libs.tapmoc)
 }
 
 group = "build-logic"
 
-compatPatrouille {
+tapmoc {
     java(17)
     kotlin(embeddedKotlinVersion)
 }

build-logic/src/main/kotlin/options.kt

@@ -1,4 +1,4 @@
-import compat.patrouille.configureJavaCompatibility
+import tapmoc.configureJavaCompatibility
 import org.gradle.api.Project
 
 fun Project.configureCompilerOptions(jvmVersion: Int = 17) {

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ ksp = "2.3.2"
 kotlinx-coroutines = "1.10.2"
 kotlinx-datetime = "0.7.1"
 kotlinx-serialization = "1.9.0"
-apollo-kotlin-execution = "0.1.1"
-compatPatrouille = "0.1.0"
+apollo-kotlin-execution = "0.1.2"
+tapmoc = "0.3.0"
 
 agp = "8.13.1"
 activity-compose = "1.12.0"
@@ -220,7 +220,7 @@ kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 tink = "com.google.crypto.tink:tink:1.17.0"
 jib-core = "com.google.cloud.tools:jib-core:0.27.2"
 google-cloud-run = "com.google.cloud:google-cloud-run:0.67.0"
-compat-patrouille = { module = "com.gradleup.compat.patrouille:com.gradleup.compat.patrouille.gradle.plugin", version.ref = "compatPatrouille" }
+tapmoc = { module = "com.gradleup.tapmoc:com.gradleup.tapmoc.gradle.plugin", version.ref = "tapmoc" }
 generativeai = { module = "dev.shreyaspatil.generativeai:generativeai-google", version.ref = "generativeai" }
 
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
@@ -241,4 +241,4 @@ screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"
 kgp-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 gratatouille = { id = "com.gradleup.gratatouille", version = "0.0.4" }
-compat-patrouille = { id = "com.gradleup.compat.patrouille", version.ref = "compatPatrouille" }
+tapmoc = { id = "com.gradleup.tapmoc", version.ref = "tapmoc" }

shared/src/commonMain/graphql/schema.graphqls

@@ -142,6 +142,8 @@ type Room {
   capacity: Int
 }
 
+"""
+"""
 type Session {
   id: String!
 

shared/src/wasmJsMain/kotlin/dev/johnoreilly/confetti/utils/WasmDateService.kt

@@ -1,12 +1,9 @@
-@file:OptIn(ExperimentalTime::class)
-
 package dev.johnoreilly.confetti.utils
 
+import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
 
 class WasmDateService: DateService {
     override fun now(): LocalDateTime = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())