Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the compiler accept Json configuration files #5516

Merged
merged 11 commits into from
Jan 12, 2024
Merged

Make the compiler accept Json configuration files #5516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d199709
Use json files as intermediate results
martinbonnin Jan 11, 2024
6eb4c09
fix Gradle tests
martinbonnin Jan 11, 2024
a5e8eb3
Merge branch 'main' into json-config
martinbonnin Jan 11, 2024
a2ccb22
Trying to pass kotlin options to the java codegen (or vice versa) is …
martinbonnin Jan 11, 2024
056f99c
naming + tweak visibility
martinbonnin Jan 11, 2024
7876c94
restore proper warning for missing packageName
martinbonnin Jan 11, 2024
4adc419
remove data classes
martinbonnin Jan 11, 2024
6fb007f
tweak Java API
martinbonnin Jan 11, 2024
fa7c386
cosmetics
martinbonnin Jan 11, 2024
027d470
move packageName check to generateOptions task
martinbonnin Jan 11, 2024
b4fdbeb
Merge branch 'main' into json-config
martinbonnin Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion gradle/libraries.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ kotlin-node = "org.jetbrains.kotlin-wrappers:kotlin-node:18.16.12-pre.634"
kotlinx-serialization-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin-plugin" }
kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization-runtime" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-runtime" }
kotlinx-serialization-json-okio = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-okio", version.ref = "kotlinx-serialization-runtime" }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not stable so removing from the apollo-compiler API since users may start using the apollo-compiler API directly with this PR (some might have done so already but apollo-compiler was mostly used by the Gradle plugin so far)

kotlinx-binarycompatibilityvalidator = { group = "org.jetbrains.kotlinx", name = "binary-compatibility-validator", version = "0.13.2" }
ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
Expand Down
234 changes: 162 additions & 72 deletions libraries/apollo-compiler/api/apollo-compiler.api
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion libraries/apollo-compiler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ dependencies {
api(libs.poet.java)

implementation(libs.kotlinx.serialization.json)
implementation(libs.kotlinx.serialization.json.okio)

testImplementation(libs.kotlin.compiletesting)
testImplementation(libs.google.testing.compile)
Expand Down
Loading
Loading