Skip to content

Commit c4ae1e8

Browse files
authored
Align our build process with the other Apollo Galaxy repos (#6725)
* Use Librarian programmatic API * fix integration tests
1 parent 62c0dfe commit c4ae1e8

File tree

71 files changed

+453
-1016
lines changed

Some content is hidden

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

71 files changed

+453
-1016
lines changed

.github/workflows/publish-snapshot-and-kdoc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
with:
2424
gradle-home-cache-cleanup: true
2525
- run: |
26-
./gradlew :apollo-kdoc:dokkaGeneratePublicationHtml
27-
./gradlew nmcpPublishAggregationToCentralPortalSnapshots
26+
./gradlew :librarianStaticContent
27+
./gradlew :nmcpPublishAggregationToCentralPortalSnapshots
2828
env:
2929
LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
3030
LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
3131
- uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa #v3.0.1
3232
with:
33-
path: "libraries/apollo-kdoc/build/dokka/html"
33+
path: "static"
3434
- uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e #v4.0.5

.idea/dictionaries/project.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-logic/build.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension
2-
import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin
3-
41
plugins {
52
alias(libs.plugins.kotlin.jvm.latest)
63
alias(libs.plugins.kotlin.sam)
74
alias(libs.plugins.compat.patrouille)
85
}
96

10-
plugins.apply(SamWithReceiverGradleSubplugin::class.java)
11-
extensions.configure(SamWithReceiverExtension::class.java) {
12-
annotations(HasImplicitReceiver::class.qualifiedName!!)
13-
}
14-
157
group = "com.apollographql.apollo"
168

179
dependencies {
@@ -49,7 +41,7 @@ dependencies {
4941

5042
runtimeOnly(libs.ksp)
5143
// XXX: This is only needed for tests. We could have different build logic for different
52-
// builds but this seems just overkill for now
44+
// builds, but this seems just overkill for now
5345
runtimeOnly(libs.kotlin.allopen)
5446
runtimeOnly(libs.kotlinx.serialization.plugin)
5547
runtimeOnly(libs.atomicfu.plugin)

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

Lines changed: 0 additions & 50 deletions
This file was deleted.

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import org.gradle.api.Project
2-
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
32
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
43
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
54

@@ -8,21 +7,13 @@ fun Project.configureNode() {
87
"Must only be called in root project"
98
}
109
plugins.withType(NodeJsRootPlugin::class.java).configureEach {
11-
extensions.getByType(NodeJsRootExtension::class.java).apply {
12-
// /**
13-
// * See https://youtrack.jetbrains.com/issue/KT-63014
14-
// */
15-
// version = "21.0.0-v8-canary202309143a48826a08"
16-
// downloadBaseUrl = "https://nodejs.org/download/v8-canary"
17-
}
18-
1910
tasks.withType(KotlinNpmInstallTask::class.java).configureEach {
20-
args.add("--ignore-engines")
11+
it.args.add("--ignore-engines")
2112
}
2213
}
2314

2415
tasks.withType(KotlinNpmInstallTask::class.java).configureEach {
25-
args.addAll(
16+
it.args.addAll(
2617
listOf(
2718
"--network-concurrency",
2819
"1",

0 commit comments

Comments
 (0)