Skip to content

Commit d4afc61

Browse files
authored
chore: use graphql from protocol (#100)
* remove graphql * chore: use graphql from protocol fixes sourceplusplus/sourceplusplus#597 * refactor: simplify
1 parent b6bd37a commit d4afc61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+19
-6269
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ build/
66

77
# Ignore .gradle directory
88
.gradle/
9+
10+
# Ignore protocol GraphQL files
11+
src/main/graphql/

build.gradle.kts

+16
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,14 @@ repositories {
4141
maven(url = "https://pkg.sourceplus.plus/sourceplusplus/protocol")
4242
}
4343

44+
val graphqlLibs = configurations.create("graphqlLibs")
45+
4446
dependencies {
4547
implementation("com.apollographql.apollo3:apollo-runtime:$apolloVersion")
4648
api("com.apollographql.apollo3:apollo-api:$apolloVersion")
4749

4850
implementation("plus.sourceplus:protocol:$projectVersion")
51+
graphqlLibs("plus.sourceplus:protocol:$projectVersion")
4952

5053
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
5154
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
@@ -170,6 +173,19 @@ apollo {
170173
packageNamesFromFilePaths("spp.cli.protocol")
171174
}
172175

176+
tasks.create<Copy>("importProtocolFiles") {
177+
configurations.getByName("graphqlLibs").asFileTree.forEach {
178+
if (it.name.contains("protocol-jvm")) {
179+
from(zipTree(it)) {
180+
exclude("META-INF/**")
181+
exclude("spp/**")
182+
}
183+
}
184+
}
185+
into(file("src/main"))
186+
}
187+
tasks.getByName("checkApolloVersions").dependsOn("importProtocolFiles")
188+
173189
spotless {
174190
kotlin {
175191
targetExclude("**/generated/**")

src/main/graphql/.graphqlconfig

-15
This file was deleted.

src/main/graphql/access/add-access-permission.graphql

-7
This file was deleted.

src/main/graphql/access/add-role-access-permission.graphql

-3
This file was deleted.

src/main/graphql/access/get-access-permissions.graphql

-7
This file was deleted.

src/main/graphql/access/get-developer-access-permissions.graphql

-7
This file was deleted.

src/main/graphql/access/get-role-access-permissions.graphql

-7
This file was deleted.

src/main/graphql/access/remove-access-permission.graphql

-3
This file was deleted.

src/main/graphql/access/remove-role-access-permission.graphql

-3
This file was deleted.

src/main/graphql/client/add-client-access.graphql

-6
This file was deleted.

src/main/graphql/client/get-client-accessors.graphql

-6
This file was deleted.

src/main/graphql/client/remove-client-access.graphql

-3
This file was deleted.

src/main/graphql/client/update-client-access.graphql

-6
This file was deleted.

src/main/graphql/developer/add-developer.graphql

-6
This file was deleted.

src/main/graphql/developer/get-developers.graphql

-5
This file was deleted.

src/main/graphql/developer/get-self.graphql

-16
This file was deleted.

src/main/graphql/developer/refresh-developer-token.graphql

-6
This file was deleted.

src/main/graphql/developer/remove-developer.graphql

-3
This file was deleted.

src/main/graphql/instrument/add-live-breakpoint.graphql

-20
This file was deleted.

src/main/graphql/instrument/add-live-log.graphql

-22
This file was deleted.

src/main/graphql/instrument/add-live-meter.graphql

-26
This file was deleted.

src/main/graphql/instrument/add-live-span.graphql

-21
This file was deleted.

src/main/graphql/instrument/clear-live-instruments.graphql

-3
This file was deleted.

src/main/graphql/instrument/get-live-breakpoints.graphql

-22
This file was deleted.

src/main/graphql/instrument/get-live-instruments.graphql

-38
This file was deleted.

src/main/graphql/instrument/get-live-logs.graphql

-24
This file was deleted.

0 commit comments

Comments
 (0)