Skip to content

Commit

Permalink
Merge pull request #1426 from joreilly/remove-reflection
Browse files Browse the repository at this point in the history
[backend] replace graphql-kotlin with apollo-execution
  • Loading branch information
martinbonnin authored Sep 1, 2024
2 parents 34e642b + 80e5f09 commit e2de106
Show file tree
Hide file tree
Showing 17 changed files with 618 additions and 945 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency:
cancel-in-progress: true

jobs:
deploy:
build-backend:
runs-on: ubuntu-22.04

steps:
Expand Down
1 change: 0 additions & 1 deletion androidApp/src/main/res/xml/network_security_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<domain includeSubdomains="true">localhost</domain>
<!-- 10.0.2.2 is localhost in the emulator -->
<domain includeSubdomains="true">10.0.2.2</domain>
<domain includeSubdomains="true">2a01:e34:ec49:a800:1434:5963:3e34:4fa0</domain>
</domain-config>
<debug-overrides>
<trust-anchors>
Expand Down
14 changes: 0 additions & 14 deletions backend/service-graphql/README.md

This file was deleted.

29 changes: 20 additions & 9 deletions backend/service-graphql/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.kotlin.plugin.spring")
id("org.jetbrains.kotlin.plugin.serialization")
id("org.springframework.boot")
id("com.google.devtools.ksp")
id("com.apollographql.execution")
}

configureCompilerOptions(17)

dependencies {
implementation(libs.graphql.kotlin.spring.server)
implementation(libs.spring.boot.starter.webflux)
implementation(libs.apollo.execution.spring)
implementation(libs.kotlinx.datetime)
implementation(libs.kotlinx.serialization)
implementation(libs.bare.graphQL)
Expand All @@ -22,7 +24,7 @@ dependencies {
implementation(libs.apollo.tooling)
implementation(libs.apollo.annotations)
implementation(libs.firebase.admin)
implementation(libs.federation.jvm)
implementation(libs.kotlinx.coroutines.reactor)

implementation(libs.scrimage.core)
implementation(libs.scrimage.filters)
Expand All @@ -38,10 +40,19 @@ springBoot {
mainClass.set("dev.johnoreilly.confetti.backend.MainKt")
}

tasks.register("updateSchema", JavaExec::class) {
classpath(configurations.getByName("runtimeClasspath"))
classpath(tasks.named("jar"))
mainClass.set("dev.johnoreilly.confetti.backend.UpdateSchemaKt")
apolloExecution {
service("service") {
schemaFile.set(file("../../shared/src/commonMain/graphql/schema.graphqls"))
}
}

configureDeploy("graphql", "dev.johnoreilly.confetti.backend.MainKt")
configureDeploy("graphql", "dev.johnoreilly.confetti.backend.MainKt")

tasks.configureEach {
if (name == "kspTestKotlin") {
/**
* Running KSP on tests fails with '[ksp] No '@GraphQLQuery' class found'
* Disable that
*/
enabled = false
}
}

This file was deleted.

Loading

0 comments on commit e2de106

Please sign in to comment.