Repository: apollographql/apollo-kotlin
Pull request #4409 (2022-09-21 17:25:21)

Build scripts: remove generated project and version catalog accessors
I've seen multiple occasions where the `R8` task was run over and over again making local development quite slow. After investigation, looks like it's due to typesafe accessors (see https://github.com/gradle/gradle/issues/22095). Not only projects but version catalogs too it seems. So it's a bit sad but this PR disables them. Because it's one thing less to generate/compile, it should also make the build a bit faster.

Also fix a couple of Gradle warnings in `apollo-gradle-plugin`



Patch:
diff --git a/apollo-adapters/build.gradle.kts b/apollo-adapters/build.gradle.kts
index 3d9d8323f8..df1446a9ce 100644
--- a/apollo-adapters/build.gradle.kts
+++ b/apollo-adapters/build.gradle.kts
@@ -14,8 +14,8 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(libs.kotlinx.datetime)
+        api(project(":apollo-api"))
+        api(golatac.lib("kotlinx.datetime"))
       }
     }
     val jsMain by getting {
diff --git a/apollo-annotations/build.gradle.kts b/apollo-annotations/build.gradle.kts
index fe0d908394..cd0d841a9a 100644
--- a/apollo-annotations/build.gradle.kts
+++ b/apollo-annotations/build.gradle.kts
@@ -12,14 +12,14 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(libs.kotlin.stdlib)
+        api(golatac.lib("kotlin.stdlib"))
       }
     }
 
     val jsMain by getting {
       dependencies {
         // See https://youtrack.jetbrains.com/issue/KT-53471
-        api(libs.kotlin.stdlib.js)
+        api(golatac.lib("kotlin.stdlib.js"))
       }
     }
   }
diff --git a/apollo-api/build.gradle.kts b/apollo-api/build.gradle.kts
index 88259eb008..0a1367cd9b 100644
--- a/apollo-api/build.gradle.kts
+++ b/apollo-api/build.gradle.kts
@@ -13,8 +13,8 @@ kotlin {
     val commonMain by getting {
       dependencies {
         api(okio())
-        api(libs.uuid)
-        api(projects.apolloAnnotations)
+        api(golatac.lib("uuid"))
+        api(project(":apollo-annotations"))
       }
     }
   }
diff --git a/apollo-ast/build.gradle.kts b/apollo-ast/build.gradle.kts
index c6b66c3b0a..96dd2583df 100644
--- a/apollo-ast/build.gradle.kts
+++ b/apollo-ast/build.gradle.kts
@@ -12,18 +12,18 @@ apolloLibrary {
 }
 
 dependencies {
-  antlr(libs.antlr)
-  implementation(libs.antlr.runtime)
+  antlr(golatac.lib("antlr"))
+  implementation(golatac.lib("antlr.runtime"))
   api(okio())
-  api(projects.apolloAnnotations)
+  api(project(":apollo-annotations"))
 
-  implementation(libs.moshi)
-  implementation(libs.moshix.sealed.runtime)
+  implementation(golatac.lib("moshi"))
+  implementation(golatac.lib("moshix.sealed.runtime"))
 
-  ksp(libs.moshix.sealed.codegen)
-  ksp(libs.moshix.ksp)
+  ksp(golatac.lib("moshix.sealed.codegen"))
+  ksp(golatac.lib("moshix.ksp"))
 
-  testImplementation(libs.kotlin.test.junit)
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 // Only expose the antlr runtime dependency
diff --git a/apollo-cli/build.gradle.kts b/apollo-cli/build.gradle.kts
index 7acb6f9ffe..bd1f455fc8 100644
--- a/apollo-cli/build.gradle.kts
+++ b/apollo-cli/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  implementation(projects.apolloTooling)
-  implementation(projects.apolloAnnotations)
-  implementation(libs.kotlinx.serialization.json)
-  implementation(libs.clikt)
+  implementation(project(":apollo-tooling"))
+  implementation(project(":apollo-annotations"))
+  implementation(golatac.lib("kotlinx.serialization.json"))
+  implementation(golatac.lib("clikt"))
 }
 
 application {
diff --git a/apollo-compiler/build.gradle.kts b/apollo-compiler/build.gradle.kts
index 519ca9d222..1441728165 100644
--- a/apollo-compiler/build.gradle.kts
+++ b/apollo-compiler/build.gradle.kts
@@ -11,27 +11,27 @@ apolloLibrary {
 }
 
 dependencies {
-  implementation(projects.apolloAst)
-  implementation(projects.apolloApi) {
+  implementation(project(":apollo-ast"))
+  implementation(project(":apollo-api")) {
     because("For BooleanExpression")
   }
-  implementation(libs.poet.kotlin.get().toString()) {
+  implementation(golatac.lib("poet.kotlin")) {
     // We don't use any of the KotlinPoet kotlin-reflect features
     exclude(module = "kotlin-reflect")
   }
-  implementation(libs.poet.java)
+  implementation(golatac.lib("poet.java"))
 
-  implementation(libs.moshi)
-  implementation(libs.moshix.sealed.runtime)
+  implementation(golatac.lib("moshi"))
+  implementation(golatac.lib("moshix.sealed.runtime"))
 
-  ksp(libs.moshix.sealed.codegen)
-  ksp(libs.moshix.ksp)
+  ksp(golatac.lib("moshix.sealed.codegen"))
+  ksp(golatac.lib("moshix.ksp"))
 
-  testImplementation(libs.kotlin.compiletesting)
-  testImplementation(libs.google.testing.compile)
-  testImplementation(libs.truth)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.google.testparameterinjector)
+  testImplementation(golatac.lib("kotlin.compiletesting"))
+  testImplementation(golatac.lib("google.testing.compile"))
+  testImplementation(golatac.lib("truth"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
+  testImplementation(golatac.lib("google.testparameterinjector"))
 }
 
 abstract class GeneratePluginVersion : DefaultTask() {
diff --git a/apollo-gradle-plugin-external/build.gradle.kts b/apollo-gradle-plugin-external/build.gradle.kts
index 63922acb3a..434e4613a4 100644
--- a/apollo-gradle-plugin-external/build.gradle.kts
+++ b/apollo-gradle-plugin-external/build.gradle.kts
@@ -10,13 +10,13 @@ apolloLibrary {
 }
 
 dependencies {
-  compileOnly(libs.gradle.api.min)
-  compileOnly(libs.kotlin.plugin.min)
-  compileOnly(libs.android.plugin.min)
+  compileOnly(golatac.lib("gradle.api.min"))
+  compileOnly(golatac.lib("kotlin.plugin.min"))
+  compileOnly(golatac.lib("android.plugin.min"))
 
-  api(projects.apolloCompiler)
-  implementation(projects.apolloTooling)
-  implementation(projects.apolloAst)
+  api(project(":apollo-compiler"))
+  implementation(project(":apollo-tooling"))
+  implementation(project(":apollo-ast"))
 }
 
 
diff --git a/apollo-gradle-plugin/build.gradle.kts b/apollo-gradle-plugin/build.gradle.kts
index 114b3c8dba..68cb136744 100644
--- a/apollo-gradle-plugin/build.gradle.kts
+++ b/apollo-gradle-plugin/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   id("org.jetbrains.kotlin.jvm")
-  id("apollo.library")
   id("java-gradle-plugin")
+  id("apollo.library")
   id("com.gradle.plugin-publish")
   id("com.gradleup.gr8")
 }
@@ -27,14 +27,14 @@ dependencies {
    */
   add("gr8Classpath", "org.conscrypt:conscrypt-openjdk-uber:2.5.2")
 
-  add("shade", projects.apolloGradlePluginExternal)
+  add("shade", project(":apollo-gradle-plugin-external"))
 
-  testImplementation(projects.apolloAst)
-  testImplementation(libs.junit)
-  testImplementation(libs.truth)
-  testImplementation(libs.assertj)
-  testImplementation(libs.okhttp.mockwebserver)
-  testImplementation(libs.okhttp.tls)
+  testImplementation(project(":apollo-ast"))
+  testImplementation(golatac.lib("junit"))
+  testImplementation(golatac.lib("truth"))
+  testImplementation(golatac.lib("assertj"))
+  testImplementation(golatac.lib("okhttp.mockwebserver"))
+  testImplementation(golatac.lib("okhttp.tls"))
 }
 
 if (relocateJar) {
diff --git a/apollo-http-cache/build.gradle.kts b/apollo-http-cache/build.gradle.kts
index c86df1f40f..29bfe75e66 100644
--- a/apollo-http-cache/build.gradle.kts
+++ b/apollo-http-cache/build.gradle.kts
@@ -8,13 +8,13 @@ apolloLibrary {
 }
 
 dependencies {
-  api(libs.okhttp)
-  api(projects.apolloApi)
-  api(projects.apolloRuntime)
-  implementation(libs.moshi)
-  implementation(libs.kotlinx.datetime)
+  api(golatac.lib("okhttp"))
+  api(project(":apollo-api"))
+  api(project(":apollo-runtime"))
+  implementation(golatac.lib("moshi"))
+  implementation(golatac.lib("kotlinx.datetime"))
 
-  testImplementation(projects.apolloMockserver)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.truth)
+  testImplementation(project(":apollo-mockserver"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
+  testImplementation(golatac.lib("truth"))
 }
diff --git a/apollo-idling-resource/build.gradle.kts b/apollo-idling-resource/build.gradle.kts
index d18718bc10..e593dd8349 100644
--- a/apollo-idling-resource/build.gradle.kts
+++ b/apollo-idling-resource/build.gradle.kts
@@ -5,15 +5,15 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.androidx.espresso.idlingresource)
-  api(projects.apolloRuntime)
+  implementation(golatac.lib("androidx.espresso.idlingresource"))
+  api(project(":apollo-runtime"))
 }
 
 android {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
+  compileSdk = golatac.version("android.sdkversion.compile").toInt()
 
   defaultConfig {
-    minSdk = libs.versions.android.sdkversion.min.get().toInt()
-    targetSdk = libs.versions.android.sdkversion.target.get().toInt()
+    minSdk = golatac.version("android.sdkversion.min").toInt()
+    targetSdk = golatac.version("android.sdkversion.target").toInt()
   }
 }
diff --git a/apollo-mockserver/build.gradle.kts b/apollo-mockserver/build.gradle.kts
index d87507714e..426ce81b57 100644
--- a/apollo-mockserver/build.gradle.kts
+++ b/apollo-mockserver/build.gradle.kts
@@ -14,27 +14,27 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloAnnotations)
+        api(project(":apollo-annotations"))
         api(okio())
-        implementation(libs.atomicfu.get().toString()) {
+        implementation(golatac.lib("atomicfu")) {
           because("We need locks for native (we don't use the gradle plugin rewrite)")
         }
-        implementation(libs.kotlinx.coroutines)
+        implementation(golatac.lib("kotlinx.coroutines"))
       }
     }
 
     val jsMain by getting {
       dependencies {
-        implementation(libs.kotlinx.nodejs)
+        implementation(golatac.lib("kotlinx.nodejs"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(projects.apolloTestingSupport) {
+        implementation(project(":apollo-testing-support")) {
           because("runTest")
         }
-        implementation(projects.apolloRuntime) {
+        implementation(project(":apollo-runtime")) {
           because("We need HttpEngine for SocketTest")
         }
       }
diff --git a/apollo-mpp-utils/build.gradle.kts b/apollo-mpp-utils/build.gradle.kts
index 87359ff410..a2f1e494f4 100644
--- a/apollo-mpp-utils/build.gradle.kts
+++ b/apollo-mpp-utils/build.gradle.kts
@@ -14,7 +14,7 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloAnnotations)
+        api(project(":apollo-annotations"))
       }
     }
   }
diff --git a/apollo-normalized-cache-api-incubating/build.gradle.kts b/apollo-normalized-cache-api-incubating/build.gradle.kts
index 10b0570a4e..9f036a8470 100644
--- a/apollo-normalized-cache-api-incubating/build.gradle.kts
+++ b/apollo-normalized-cache-api-incubating/build.gradle.kts
@@ -14,10 +14,10 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(projects.apolloMppUtils)
+        api(project(":apollo-api"))
+        api(project(":apollo-mpp-utils"))
         implementation(okio())
-        api(libs.uuid)
+        api(golatac.lib("uuid"))
       }
     }
   }
diff --git a/apollo-normalized-cache-api/build.gradle.kts b/apollo-normalized-cache-api/build.gradle.kts
index 10b0570a4e..9f036a8470 100644
--- a/apollo-normalized-cache-api/build.gradle.kts
+++ b/apollo-normalized-cache-api/build.gradle.kts
@@ -14,10 +14,10 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(projects.apolloMppUtils)
+        api(project(":apollo-api"))
+        api(project(":apollo-mpp-utils"))
         implementation(okio())
-        api(libs.uuid)
+        api(golatac.lib("uuid"))
       }
     }
   }
diff --git a/apollo-normalized-cache-incubating/build.gradle.kts b/apollo-normalized-cache-incubating/build.gradle.kts
index fce1e9dbc1..3df568ef05 100644
--- a/apollo-normalized-cache-incubating/build.gradle.kts
+++ b/apollo-normalized-cache-incubating/build.gradle.kts
@@ -14,10 +14,10 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloRuntime)
-        api(projects.apolloNormalizedCacheApiIncubating)
-        api(libs.kotlinx.coroutines)
-        implementation(libs.atomicfu.get().toString()) {
+        api(project(":apollo-runtime"))
+        api(project(":apollo-normalized-cache-api-incubating"))
+        api(golatac.lib("kotlinx.coroutines"))
+        implementation(golatac.lib("atomicfu")) {
           because("Use of ReentrantLock in DefaultApolloStore for Apple (we don't use the gradle plugin rewrite)")
         }
       }
diff --git a/apollo-normalized-cache-sqlite-incubating/build.gradle.kts b/apollo-normalized-cache-sqlite-incubating/build.gradle.kts
index db30687eef..0c9100ce4f 100644
--- a/apollo-normalized-cache-sqlite-incubating/build.gradle.kts
+++ b/apollo-normalized-cache-sqlite-incubating/build.gradle.kts
@@ -41,59 +41,59 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(projects.apolloNormalizedCacheApiIncubating)
-        api(projects.apolloNormalizedCacheIncubating)
+        api(project(":apollo-api"))
+        api(project(":apollo-normalized-cache-api-incubating"))
+        api(project(":apollo-normalized-cache-incubating"))
       }
     }
 
     val jvmMain by getting {
       dependsOn(commonMain)
       dependencies {
-        implementation(libs.sqldelight.jvm)
+        implementation(golatac.lib("sqldelight.jvm"))
       }
     }
 
     val appleMain by getting {
       dependencies {
-        implementation(libs.sqldelight.native)
+        implementation(golatac.lib("sqldelight.native"))
       }
     }
 
     val jvmTest by getting {
       dependencies {
-        implementation(libs.truth)
+        implementation(golatac.lib("truth"))
       }
     }
 
     val androidMain by getting {
       dependsOn(commonMain)
       dependencies {
-        api(libs.androidx.sqlite)
-        implementation(libs.sqldelight.android)
-        implementation(libs.androidx.sqlite.framework)
-        implementation(libs.androidx.startup.runtime)
+        api(golatac.lib("androidx.sqlite"))
+        implementation(golatac.lib("sqldelight.android"))
+        implementation(golatac.lib("androidx.sqlite.framework"))
+        implementation(golatac.lib("androidx.startup.runtime"))
       }
     }
     val androidTest by getting {
       dependencies {
-        implementation(libs.kotlin.test.junit)
+        implementation(golatac.lib("kotlin.test.junit"))
       }
     }
     val commonTest by getting {
       dependencies {
-        implementation(projects.apolloTestingSupport)
+        implementation(project(":apollo-testing-support"))
       }
     }
   }
 }
 
 configure<com.android.build.gradle.LibraryExtension> {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
+  compileSdk = golatac.version("android.sdkversion.compile").toInt()
 
   defaultConfig {
-    minSdk = libs.versions.android.sdkversion.min.get().toInt()
-    targetSdk = libs.versions.android.sdkversion.target.get().toInt()
+    minSdk = golatac.version("android.sdkversion.min").toInt()
+    targetSdk = golatac.version("android.sdkversion.target").toInt()
   }
 }
 
diff --git a/apollo-normalized-cache-sqlite/build.gradle.kts b/apollo-normalized-cache-sqlite/build.gradle.kts
index 19138453fe..33b59e56fc 100644
--- a/apollo-normalized-cache-sqlite/build.gradle.kts
+++ b/apollo-normalized-cache-sqlite/build.gradle.kts
@@ -31,60 +31,60 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(projects.apolloNormalizedCacheApi)
-        api(projects.apolloNormalizedCache)
+        api(project(":apollo-api"))
+        api(project(":apollo-normalized-cache-api"))
+        api(project(":apollo-normalized-cache"))
       }
     }
 
     val jvmMain by getting {
       dependsOn(commonMain)
       dependencies {
-        implementation(libs.sqldelight.jvm)
+        implementation(golatac.lib("sqldelight.jvm"))
       }
     }
 
     val appleMain by getting {
       dependencies {
-        implementation(libs.sqldelight.native)
+        implementation(golatac.lib("sqldelight.native"))
       }
     }
 
     val jvmTest by getting {
       dependencies {
-        implementation(libs.truth)
+        implementation(golatac.lib("truth"))
       }
     }
 
     val androidMain by getting {
       dependsOn(commonMain)
       dependencies {
-        api(libs.androidx.sqlite)
-        implementation(libs.sqldelight.android)
-        implementation(libs.androidx.sqlite.framework)
-        implementation(libs.androidx.startup.runtime)
+        api(golatac.lib("androidx.sqlite"))
+        implementation(golatac.lib("sqldelight.android"))
+        implementation(golatac.lib("androidx.sqlite.framework"))
+        implementation(golatac.lib("androidx.startup.runtime"))
       }
     }
     val androidTest by getting {
       dependencies {
-        implementation(libs.kotlin.test.junit)
+        implementation(golatac.lib("kotlin.test.junit"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(projects.apolloTestingSupport)
+        implementation(project(":apollo-testing-support"))
       }
     }
   }
 }
 
 configure<com.android.build.gradle.LibraryExtension> {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
+  compileSdk = golatac.version("android.sdkversion.compile").toInt()
 
   defaultConfig {
-    minSdk = libs.versions.android.sdkversion.min.get().toInt()
-    targetSdk = libs.versions.android.sdkversion.target.get().toInt()
+    minSdk = golatac.version("android.sdkversion.min").toInt()
+    targetSdk = golatac.version("android.sdkversion.target").toInt()
   }
 }
 
diff --git a/apollo-normalized-cache/build.gradle.kts b/apollo-normalized-cache/build.gradle.kts
index 324b9eb561..9c5b90f47c 100644
--- a/apollo-normalized-cache/build.gradle.kts
+++ b/apollo-normalized-cache/build.gradle.kts
@@ -14,10 +14,10 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloRuntime)
-        api(projects.apolloNormalizedCacheApi)
-        api(libs.kotlinx.coroutines)
-        implementation(libs.atomicfu.get().toString()) {
+        api(project(":apollo-runtime"))
+        api(project(":apollo-normalized-cache-api"))
+        api(golatac.lib("kotlinx.coroutines"))
+        implementation(golatac.lib("atomicfu")) {
           because("Use of ReentrantLock in DefaultApolloStore for Apple (we don't use the gradle plugin rewrite)")
         }
       }
diff --git a/apollo-runtime/build.gradle.kts b/apollo-runtime/build.gradle.kts
index 3ad2b4e885..cecc417edc 100644
--- a/apollo-runtime/build.gradle.kts
+++ b/apollo-runtime/build.gradle.kts
@@ -14,30 +14,30 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(projects.apolloMppUtils)
+        api(project(":apollo-api"))
+        api(project(":apollo-mpp-utils"))
         api(okio())
-        api(libs.uuid)
-        api(libs.kotlinx.coroutines)
+        api(golatac.lib("uuid"))
+        api(golatac.lib("kotlinx.coroutines"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(projects.apolloMockserver)
-        implementation(projects.apolloTestingSupport)
+        implementation(project(":apollo-mockserver"))
+        implementation(project(":apollo-testing-support"))
       }
     }
 
     val jvmMain by getting {
       dependencies {
-        api(libs.okhttp)
+        api(golatac.lib("okhttp"))
       }
     }
 
     val jsMain by getting {
       dependencies {
-        api(libs.ktor.client.js)
+        api(golatac.lib("ktor.client.js"))
       }
     }
 
@@ -48,9 +48,9 @@ kotlin {
 
     val jvmTest by getting {
       dependencies {
-        implementation(libs.kotlin.test.junit)
-        implementation(libs.truth)
-        implementation(libs.okhttp)
+        implementation(golatac.lib("kotlin.test.junit"))
+        implementation(golatac.lib("truth"))
+        implementation(golatac.lib("okhttp"))
       }
     }
   }
diff --git a/apollo-rx2-support/build.gradle.kts b/apollo-rx2-support/build.gradle.kts
index a8ed129a15..edb2b65828 100644
--- a/apollo-rx2-support/build.gradle.kts
+++ b/apollo-rx2-support/build.gradle.kts
@@ -8,10 +8,10 @@ apolloLibrary {
 }
 
 dependencies {
-  implementation(projects.apolloApi)
-  api(libs.rx.java2)
-  api(libs.kotlinx.coroutines.rx2)
+  implementation(project(":apollo-api"))
+  api(golatac.lib("rx.java2"))
+  api(golatac.lib("kotlinx.coroutines.rx2"))
 
-  api(projects.apolloRuntime)
-  api(projects.apolloNormalizedCache)
+  api(project(":apollo-runtime"))
+  api(project(":apollo-normalized-cache"))
 }
diff --git a/apollo-rx3-support/build.gradle.kts b/apollo-rx3-support/build.gradle.kts
index 1c77e32651..afabbe369a 100644
--- a/apollo-rx3-support/build.gradle.kts
+++ b/apollo-rx3-support/build.gradle.kts
@@ -11,10 +11,10 @@ apolloLibrary {
 }
 
 dependencies {
-  implementation(projects.apolloApi)
-  api(libs.rx.java3)
-  api(libs.kotlinx.coroutines.rx3)
+  implementation(project(":apollo-api"))
+  api(golatac.lib("rx.java3"))
+  api(golatac.lib("kotlinx.coroutines.rx3"))
 
-  api(projects.apolloRuntime)
-  api(projects.apolloNormalizedCache)
+  api(project(":apollo-runtime"))
+  api(project(":apollo-normalized-cache"))
 }
diff --git a/apollo-tooling/build.gradle.kts b/apollo-tooling/build.gradle.kts
index 54d3a705bf..ebe733f4c8 100644
--- a/apollo-tooling/build.gradle.kts
+++ b/apollo-tooling/build.gradle.kts
@@ -4,14 +4,14 @@ plugins {
 }
 
 dependencies {
-  implementation(projects.apolloAnnotations)
-  implementation(projects.apolloAst)
-  api(projects.apolloCompiler)
-  implementation(libs.moshi)
-  implementation(libs.moshix.sealed.runtime)
-  implementation(libs.okhttp)
+  implementation(project(":apollo-annotations"))
+  implementation(project(":apollo-ast"))
+  api(project(":apollo-compiler"))
+  implementation(golatac.lib("moshi"))
+  implementation(golatac.lib("moshix.sealed.runtime"))
+  implementation(golatac.lib("okhttp"))
 
-  implementation(libs.moshi)
-  testImplementation(libs.junit)
-  testImplementation(libs.truth)
+  implementation(golatac.lib("moshi"))
+  testImplementation(golatac.lib("junit"))
+  testImplementation(golatac.lib("truth"))
 }
diff --git a/benchmark/app/build.gradle.kts b/benchmark/app/build.gradle.kts
index f949b92b44..a424c86b00 100644
--- a/benchmark/app/build.gradle.kts
+++ b/benchmark/app/build.gradle.kts
@@ -3,11 +3,11 @@ apply(plugin = "org.jetbrains.kotlin.android")
 
 configure<com.android.build.gradle.AppExtension> {
   namespace = "com.apollographql.apollo3.emptyapp"
-  compileSdkVersion(libs.versions.android.sdkversion.compile.get().toInt())
+  compileSdkVersion(golatac.version("android.sdkversion.compile").toInt())
 
   defaultConfig {
-    minSdkVersion(libs.versions.android.sdkversion.min.get())
-    targetSdkVersion(libs.versions.android.sdkversion.target.get())
+    minSdkVersion(golatac.version("android.sdkversion.min"))
+    targetSdkVersion(golatac.version("android.sdkversion.target"))
 
     val debugSigningConfig = signingConfigs.getByName("debug").apply {
       // This is all public. This app is only an empty shell to make Firebase happy because it requires an 'app' APK.
diff --git a/benchmark/build-logic/build.gradle.kts b/benchmark/build-logic/build.gradle.kts
index 4faa954a74..1c657f39c0 100644
--- a/benchmark/build-logic/build.gradle.kts
+++ b/benchmark/build-logic/build.gradle.kts
@@ -1,7 +1,10 @@
 plugins {
   `embedded-kotlin`
+  id("net.mbonnin.golatac").version("0.0.3")
 }
 
+golatac.init(file("../../gradle/libraries.toml"))
+
 group = "com.apollographql.apollo3.benchmark"
 
 repositories {
@@ -14,13 +17,13 @@ repositories {
 
 dependencies {
   compileOnly(gradleApi())
-  implementation(libs.kotlin.plugin)
+  implementation(golatac.lib("kotlin.plugin"))
   implementation("com.squareup.okio:okio-jvm:3.2.0")
-  implementation(libs.ksp)
+  implementation(golatac.lib("ksp"))
   implementation("me.lucko:jar-relocator:1.5")
 
   if (true) {
-    implementation(libs.apollo.plugin)
+    implementation(golatac.lib("apollo.plugin"))
   } else {
     implementation("com.apollographql.apollo3:apollo-gradle-plugin:3.4.0")
   }
diff --git a/benchmark/build-logic/settings.gradle.kts b/benchmark/build-logic/settings.gradle.kts
index 547827d74f..e50a948d16 100644
--- a/benchmark/build-logic/settings.gradle.kts
+++ b/benchmark/build-logic/settings.gradle.kts
@@ -1,7 +1,11 @@
-dependencyResolutionManagement {
-  versionCatalogs {
-    create("libs") {
-      from(files("../../gradle/libs.versions.toml"))
+pluginManagement {
+  repositories {
+    mavenCentral()
+    gradlePluginPortal {
+      content {
+        includeModule("org.gradle.kotlin.embedded-kotlin", "org.gradle.kotlin.embedded-kotlin.gradle.plugin")
+        includeGroup("org.gradle.kotlin")
+      }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index e06b8f64eb..5bfc04e127 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -11,6 +11,12 @@ buildscript {
   }
 }
 
+plugins {
+  id("net.mbonnin.golatac").version("0.0.3")
+}
+
+golatac.init(file("../gradle/libraries.toml"))
+
 allprojects {
   repositories {
     mavenCentral()
diff --git a/benchmark/microbenchmark/build.gradle.kts b/benchmark/microbenchmark/build.gradle.kts
index 8935f6329a..5a1eed158c 100644
--- a/benchmark/microbenchmark/build.gradle.kts
+++ b/benchmark/microbenchmark/build.gradle.kts
@@ -59,8 +59,8 @@ dependencies {
       }
     }
   }
-  implementation(libs.moshi)
-  ksp(libs.moshix.ksp)
+  implementation(golatac.lib("moshi"))
+  ksp(golatac.lib("moshix.ksp"))
 
   androidTestImplementation("androidx.benchmark:benchmark-junit4:1.1.0")
   androidTestImplementation("androidx.test:core:1.4.0")
@@ -68,11 +68,11 @@ dependencies {
 
 configure<com.android.build.gradle.LibraryExtension> {
   namespace = "com.apollographql.apollo3.benchmark"
-  compileSdkVersion(libs.versions.android.sdkversion.compile.get().toInt())
+  compileSdkVersion(golatac.version("android.sdkversion.compile").toInt())
 
   defaultConfig {
-    minSdkVersion(libs.versions.android.sdkversion.min.get())
-    targetSdkVersion(libs.versions.android.sdkversion.target.get())
+    minSdkVersion(golatac.version("android.sdkversion.min"))
+    targetSdkVersion(golatac.version("android.sdkversion.target"))
     testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
   }
 
diff --git a/benchmark/settings.gradle.kts b/benchmark/settings.gradle.kts
index 8c5ea707c5..d88523d810 100644
--- a/benchmark/settings.gradle.kts
+++ b/benchmark/settings.gradle.kts
@@ -2,10 +2,8 @@ include(":app", ":microbenchmark")
 
 includeBuild("build-logic")
 
-dependencyResolutionManagement {
-  versionCatalogs {
-    create("libs") {
-      from(files("../gradle/libs.versions.toml"))
-    }
+pluginManagement {
+  repositories {
+    mavenCentral()
   }
-}
+}
\ No newline at end of file
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 2040164b0b..687cd1f924 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugi
 plugins {
   `embedded-kotlin`
   id("java-gradle-plugin")
+  id("net.mbonnin.golatac").version("0.0.3")
 }
 
 plugins.apply(SamWithReceiverGradleSubplugin::class.java)
@@ -11,41 +12,42 @@ extensions.configure(SamWithReceiverExtension::class.java) {
   annotations(HasImplicitReceiver::class.qualifiedName!!)
 }
 
-group = "com.apollographql.apollo3"
+group = "com.apollographql.apollo3.build"
+
+golatac.init(file("../gradle/libraries.toml"))
 
 dependencies {
-  compileOnly(libs.gradle.api)
+  compileOnly(golatac.lib("gradle.api"))
 
-  implementation(libs.okhttp)
+  implementation(golatac.lib("okhttp"))
 
-  implementation(libs.dokka.plugin)
-  implementation(libs.dokka.base)
+  implementation(golatac.lib("dokka.plugin"))
+  implementation(golatac.lib("dokka.base"))
 
   // We add all the plugins to the classpath here so that they are loaded with proper conflict resolution
   // See https://github.com/gradle/gradle/issues/4741
-  implementation(libs.android.plugin)
-  implementation(libs.gradle.japicmp.plugin)
-  implementation(libs.gradle.metalava.plugin)
-  implementation(libs.vespene)
+  implementation(golatac.lib("android.plugin"))
+  implementation(golatac.lib("gradle.japicmp.plugin"))
+  implementation(golatac.lib("vespene"))
 
   // We want the KSP plugin to use the version from the classpath and not force a newer version
   // of the Gradle plugin
   if (System.getProperty("idea.sync.active") == null) {
-    implementation(libs.kotlin.plugin)
-    runtimeOnly(libs.ksp)
+    implementation(golatac.lib("kotlin.plugin"))
+    runtimeOnly(golatac.lib("ksp"))
   } else {
-    implementation(libs.kotlin.plugin.duringideasync)
-    runtimeOnly(libs.ksp.duringideasync)
+    implementation(golatac.lib("kotlin.plugin.duringideasync"))
+    runtimeOnly(golatac.lib("ksp.duringideasync"))
   }
 
-  runtimeOnly(libs.sqldelight.plugin)
-  runtimeOnly(libs.gradle.publish.plugin)
-  runtimeOnly(libs.benmanes.versions)
-  runtimeOnly(libs.gr8)
-  runtimeOnly(libs.kotlinx.binarycompatibilityvalidator)
+  runtimeOnly(golatac.lib("sqldelight.plugin"))
+  runtimeOnly(golatac.lib("gradle.publish.plugin"))
+  runtimeOnly(golatac.lib("benmanes.versions"))
+  runtimeOnly(golatac.lib("gr8"))
+  runtimeOnly(golatac.lib("kotlinx.binarycompatibilityvalidator"))
   // XXX: This is only needed for tests. We could have different build logic for different
   // builds but this seems just overkill for now
-  runtimeOnly(libs.kotlin.allopen)
+  runtimeOnly(golatac.lib("kotlin.allopen"))
 }
 
 // This shuts down a warning in Kotlin 1.5.30:
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 90a1d931ae..78d2ec4691 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -1,5 +1,17 @@
 rootProject.name = "build-logic"
 
+pluginManagement {
+  repositories {
+    gradlePluginPortal {
+      content {
+        includeModule("org.gradle.kotlin.embedded-kotlin", "org.gradle.kotlin.embedded-kotlin.gradle.plugin")
+        includeGroup("org.gradle.kotlin")
+      }
+    }
+    mavenCentral()
+  }
+}
+
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
@@ -7,16 +19,9 @@ dependencyResolutionManagement {
     gradlePluginPortal {
       content {
         includeModule("me.champeau.gradle", "japicmp-gradle-plugin")
-        includeModule("me.tylerbwong.gradle", "metalava-gradle")
         includeModule("com.gradle.publish", "plugin-publish-plugin")
         includeModule("com.github.ben-manes", "gradle-versions-plugin")
       }
     }
   }
-
-  versionCatalogs {
-    create("libs") {
-      from(files("../gradle/libs.versions.toml"))
-    }
-  }
 }
diff --git a/build-logic/src/main/kotlin/Publishing.kt b/build-logic/src/main/kotlin/Publishing.kt
index 3d3f30ad76..cff56959a8 100644
--- a/build-logic/src/main/kotlin/Publishing.kt
+++ b/build-logic/src/main/kotlin/Publishing.kt
@@ -91,6 +91,8 @@ private fun Project.configurePublishingInternal() {
     }
   }
   val emptyJavadocJarTaskProvider = tasks.register("emptyJavadocJar", org.gradle.jvm.tasks.Jar::class.java) {
+    // Add an appendix to avoid the output of this task to overlap with defaultJavadocJar
+    archiveAppendix.set("empty")
     archiveClassifier.set("javadoc")
   }
 
@@ -125,10 +127,10 @@ private fun Project.configurePublishingInternal() {
           withType(MavenPublication::class.java).configureEach {
             if (name == "kotlinMultiplatform") {
               // Add the javadoc to the multiplatform publications
-              artifact(javadocJarTaskProvider.get())
+              artifact(javadocJarTaskProvider)
             } else {
               // And an empty one for others so as to save some space
-              artifact(emptyJavadocJarTaskProvider.get())
+              artifact(emptyJavadocJarTaskProvider)
             }
           }
         }
@@ -138,7 +140,7 @@ private fun Project.configurePublishingInternal() {
            * java-gradle-plugin creates 2 publications (one marker and one regular) but without source/javadoc.
            */
           withType(MavenPublication::class.java) {
-            artifact(javadocJarTaskProvider.get())
+            artifact(javadocJarTaskProvider)
             // Only add sources for the main publication
             // XXX: is there a nicer way to do this?
             if (!name.lowercase().contains("marker")) {
@@ -157,8 +159,8 @@ private fun Project.configurePublishingInternal() {
               from(components.findByName("release"))
             }
 
-            artifact(javadocJarTaskProvider.get())
-            artifact(createAndroidSourcesTask().get())
+            artifact(javadocJarTaskProvider)
+            artifact(createAndroidSourcesTask())
 
             artifactId = findProperty("POM_ARTIFACT_ID") as String?
           }
@@ -171,8 +173,8 @@ private fun Project.configurePublishingInternal() {
           create("default", MavenPublication::class.java) {
 
             from(components.findByName("java"))
-            artifact(javadocJarTaskProvider.get())
-            artifact(createJavaSourcesTask().get())
+            artifact(javadocJarTaskProvider)
+            artifact(createJavaSourcesTask())
 
             artifactId = findProperty("POM_ARTIFACT_ID") as String?
           }
diff --git a/build.gradle.kts b/build.gradle.kts
index f41ecf9e4c..0048061b67 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,12 @@
 import JapiCmp.configureJapiCmp
 
-buildscript {
-  repositories {
-    mavenCentral()
-    google()
-    gradlePluginPortal()
-  }
-  dependencies {
-    classpath("com.apollographql.apollo3:build-logic")
-  }
+plugins {
+  id("apollo.library").apply(false)
+  id("net.mbonnin.golatac").version("0.0.3")
 }
 
+golatac.init(file("gradle/libraries.toml"))
+
 apply(plugin = "com.github.ben-manes.versions")
 apply(plugin = "org.jetbrains.dokka")
 apply(plugin = "org.jetbrains.kotlinx.binary-compatibility-validator")
diff --git a/gradle/libs.versions.toml b/gradle/libraries.toml
similarity index 98%
rename from gradle/libs.versions.toml
rename to gradle/libraries.toml
index 98be7b5b63..e896401f77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libraries.toml
@@ -76,7 +76,6 @@ gradle-api = { group = "dev.gradleplugins", name = "gradle-api", version = "7.2"
 # Keep in sync with MIN_GRADLE_VERSION
 gradle-api-min = { group = "dev.gradleplugins", name = "gradle-api", version = "5.6" }
 gradle-japicmp-plugin = { group = "me.champeau.gradle", name = "japicmp-gradle-plugin", version = "0.2.8" }
-gradle-metalava-plugin = { group = "me.tylerbwong.gradle", name = "metalava-gradle", version = "0.1.5" }
 gradle-publish-plugin = { group = "com.gradle.publish", name = "plugin-publish-plugin", version = "0.12.0" }
 graphqlkotlin = { group = "com.expediagroup", name = "graphql-kotlin-spring-server", version = "5.3.0" }
 guava-jre = { group = "com.google.guava", name = "guava", version.ref = "guava" }
@@ -133,4 +132,4 @@ vespene = { group = "net.mbonnin.vespene", name = "vespene-lib", version = "0.5"
 
 [plugins]
 apollo = { id = "com.apollographql.apollo3", version.ref = "apollo" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-plugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-plugin" }
\ No newline at end of file
diff --git a/scripts/tag.main.kts b/scripts/tag.main.kts
index 09c8b875ec..3edc434dcc 100755
--- a/scripts/tag.main.kts
+++ b/scripts/tag.main.kts
@@ -71,7 +71,7 @@ fun setCurrentVersion(version: String) {
   }.joinToString(separator = "\n", postfix = "\n")
   gradleProperties.writeText(newContent)
 
-  val versionCatalog = File("gradle/libs.versions.toml")
+  val versionCatalog = File("gradle/libraries.toml"))
   // apollo = "3.5.1"
   newContent = versionCatalog.readLines().map {
     it.replace(Regex("( *apollo *= *\").*(\".*)")) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8516179957..e816b4e3df 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,17 +9,19 @@ rootProject.projectDir
       include(it.name)
     }
 
-includeBuild("build-logic")
-
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-
 pluginManagement {
   includeBuild("build-logic")
 
   repositories {
     mavenCentral()
     google()
-    gradlePluginPortal()
+    gradlePluginPortal {
+      content {
+        includeModule("me.champeau.gradle", "japicmp-gradle-plugin")
+        includeModule("com.gradle.publish", "plugin-publish-plugin")
+        includeModule("com.github.ben-manes", "gradle-versions-plugin")
+      }
+    }
   }
 }
 


Test patch:
diff --git a/apollo-gradle-plugin/src/test/files/gradle/settings.gradle b/apollo-gradle-plugin/src/test/files/gradle/settings.gradle
index 28b5628f40..d2f024f4a7 100644
--- a/apollo-gradle-plugin/src/test/files/gradle/settings.gradle
+++ b/apollo-gradle-plugin/src/test/files/gradle/settings.gradle
@@ -3,7 +3,7 @@ rootProject.name = "testProject"
 dependencyResolutionManagement {
   versionCatalogs {
     libs {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/src/test/files/gradle/settings.gradle.kts b/apollo-gradle-plugin/src/test/files/gradle/settings.gradle.kts
index a09ae49cfc..c31fa2a2fe 100644
--- a/apollo-gradle-plugin/src/test/files/gradle/settings.gradle.kts
+++ b/apollo-gradle-plugin/src/test/files/gradle/settings.gradle.kts
@@ -3,7 +3,7 @@ rootProject.name="testProject"
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/android-java/settings.gradle.kts b/apollo-gradle-plugin/testProjects/android-java/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/android-java/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/android-java/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/androidTestVariants/settings.gradle.kts b/apollo-gradle-plugin/testProjects/androidTestVariants/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/androidTestVariants/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/androidTestVariants/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/androidVariants/settings.gradle.kts b/apollo-gradle-plugin/testProjects/androidVariants/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/androidVariants/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/androidVariants/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/buildCache/settings.gradle.kts b/apollo-gradle-plugin/testProjects/buildCache/settings.gradle.kts
index 8d0f1e89c2..aae6393cc4 100644
--- a/apollo-gradle-plugin/testProjects/buildCache/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/buildCache/settings.gradle.kts
@@ -10,7 +10,7 @@ buildCache {
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../../gradle/libs.versions.toml"))
+      from(files("../../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/configuration-cache/settings.gradle.kts b/apollo-gradle-plugin/testProjects/configuration-cache/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/configuration-cache/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/configuration-cache/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/convertSchema/settings.gradle.kts b/apollo-gradle-plugin/testProjects/convertSchema/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/convertSchema/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/convertSchema/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/defaultVersion/settings.gradle.kts b/apollo-gradle-plugin/testProjects/defaultVersion/settings.gradle.kts
index e291b25590..803d0d8a72 100644
--- a/apollo-gradle-plugin/testProjects/defaultVersion/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/defaultVersion/settings.gradle.kts
@@ -3,7 +3,7 @@ include(":module")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/deprecationWarnings/settings.gradle.kts b/apollo-gradle-plugin/testProjects/deprecationWarnings/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/deprecationWarnings/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/deprecationWarnings/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/executable-schema-file/settings.gradle.kts b/apollo-gradle-plugin/testProjects/executable-schema-file/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/executable-schema-file/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/executable-schema-file/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/groovy/settings.gradle.kts b/apollo-gradle-plugin/testProjects/groovy/settings.gradle.kts
index 6b574ce7e6..c9eda5d06b 100644
--- a/apollo-gradle-plugin/testProjects/groovy/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/groovy/settings.gradle.kts
@@ -10,7 +10,7 @@ pluginManagement {
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/java-only/settings.gradle.kts b/apollo-gradle-plugin/testProjects/java-only/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/java-only/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/java-only/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/kotlin-plugin-version/settings.gradle.kts b/apollo-gradle-plugin/testProjects/kotlin-plugin-version/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/kotlin-plugin-version/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/kotlin-plugin-version/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/kotlinJvmSourceSets/settings.gradle.kts b/apollo-gradle-plugin/testProjects/kotlinJvmSourceSets/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/kotlinJvmSourceSets/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/kotlinJvmSourceSets/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/mismatchedVersions/settings.gradle.kts b/apollo-gradle-plugin/testProjects/mismatchedVersions/settings.gradle.kts
index b62a78adfe..05a615cd40 100644
--- a/apollo-gradle-plugin/testProjects/mismatchedVersions/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/mismatchedVersions/settings.gradle.kts
@@ -4,7 +4,7 @@ rootProject.name = "mismatchedVersions"
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/settings.gradle.kts
index 11ee4c4d0f..1ecf4ef15c 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar-defined-in-leaf/settings.gradle.kts
@@ -5,7 +5,7 @@ include(":root", ":leaf")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/settings.gradle.kts
index 11ee4c4d0f..1ecf4ef15c 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-custom-scalar/settings.gradle.kts
@@ -5,7 +5,7 @@ include(":root", ":leaf")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-diamond/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-diamond/settings.gradle.kts
index 00d90a13ba..9ea1fd9c69 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-diamond/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-diamond/settings.gradle.kts
@@ -5,7 +5,7 @@ include(":root", ":node1", ":node2", "leaf")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-duplicates/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-duplicates/settings.gradle.kts
index 4a7669d0cc..85024ea526 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-duplicates/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-duplicates/settings.gradle.kts
@@ -5,7 +5,7 @@ include(":root", ":node1", ":node2")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-publishing/consumer/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-publishing/consumer/settings.gradle.kts
index 4cd485144e..4d791442ba 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-publishing/consumer/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-publishing/consumer/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../../gradle/libs.versions.toml"))
+      from(files("../../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-publishing/jvm-producer/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-publishing/jvm-producer/settings.gradle.kts
index 4cd485144e..4d791442ba 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-publishing/jvm-producer/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-publishing/jvm-producer/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../../gradle/libs.versions.toml"))
+      from(files("../../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-transitive/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-transitive/settings.gradle.kts
index 5fe758409e..3558196bbe 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules-transitive/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules-transitive/settings.gradle.kts
@@ -5,7 +5,7 @@ include(":root", ":node", "leaf")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules/settings.gradle.kts
index 11ee4c4d0f..1ecf4ef15c 100644
--- a/apollo-gradle-plugin/testProjects/multi-modules/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multi-modules/settings.gradle.kts
@@ -5,7 +5,7 @@ include(":root", ":leaf")
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/multiplatform/settings.gradle.kts b/apollo-gradle-plugin/testProjects/multiplatform/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/multiplatform/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/multiplatform/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/operationIds/settings.gradle.kts b/apollo-gradle-plugin/testProjects/operationIds/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/operationIds/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/operationIds/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/register-operations/settings.gradle.kts b/apollo-gradle-plugin/testProjects/register-operations/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/register-operations/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/register-operations/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-gradle-plugin/testProjects/testSourceSet/settings.gradle.kts b/apollo-gradle-plugin/testProjects/testSourceSet/settings.gradle.kts
index 0d97cf27a9..6c6699d201 100644
--- a/apollo-gradle-plugin/testProjects/testSourceSet/settings.gradle.kts
+++ b/apollo-gradle-plugin/testProjects/testSourceSet/settings.gradle.kts
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
   versionCatalogs {
     create("libs") {
-      from(files("../../../gradle/libs.versions.toml"))
+      from(files("../../../gradle/libraries.toml"))
     }
   }
 }
diff --git a/apollo-testing-support/build.gradle.kts b/apollo-testing-support/build.gradle.kts
index ddb5b3afd2..f5b49e42c9 100644
--- a/apollo-testing-support/build.gradle.kts
+++ b/apollo-testing-support/build.gradle.kts
@@ -13,33 +13,33 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        api(projects.apolloApi)
-        api(projects.apolloRuntime)
-        api(projects.apolloMockserver)
-        api(libs.kotlinx.coroutines)
-        implementation(libs.atomicfu.get().toString()) {
+        api(project(":apollo-api"))
+        api(project(":apollo-runtime"))
+        api(project(":apollo-mockserver"))
+        api(golatac.lib("kotlinx.coroutines"))
+        implementation(golatac.lib("atomicfu")) {
           because("We need locks in TestNetworkTransportHandler (we don't use the gradle plugin rewrite)")
         }
-        implementation(libs.kotlinx.coroutines.test)
+        implementation(golatac.lib("kotlinx.coroutines.test"))
       }
     }
 
     val jvmTest by getting {
       dependencies {
-        implementation(libs.truth)
+        implementation(golatac.lib("truth"))
       }
     }
 
     val jsMain by getting {
       dependencies {
-        implementation(libs.kotlinx.nodejs)
-        implementation(libs.kotlin.test.js)
+        implementation(golatac.lib("kotlinx.nodejs"))
+        implementation(golatac.lib("kotlin.test.js"))
         api(okioNodeJs())
       }
     }
     val jsTest by getting {
       dependencies {
-        implementation(libs.kotlin.test.js)
+        implementation(golatac.lib("kotlin.test.js"))
       }
     }
   }
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
index 9c9447bd43..47f514a5f4 100644
--- a/tests/build.gradle.kts
+++ b/tests/build.gradle.kts
@@ -1,16 +1,11 @@
-buildscript {
-  repositories {
-    mavenCentral()
-    google()
-    gradlePluginPortal()
-  }
-
-  dependencies {
-    classpath("com.apollographql.apollo3:apollo-gradle-plugin")
-    classpath("com.apollographql.apollo3:build-logic")
-  }
+plugins {
+  id("com.apollographql.apollo3").apply(false)
+  id("apollo.test").apply(false)
+  id("net.mbonnin.golatac").version("0.0.3")
 }
 
+golatac.init(file("../gradle/libraries.toml"))
+
 repositories {
   mavenCentral()
 }
diff --git a/tests/coroutines-mt/build.gradle.kts b/tests/coroutines-mt/build.gradle.kts
index 4ca4fa2d31..f8aa1c6fa7 100644
--- a/tests/coroutines-mt/build.gradle.kts
+++ b/tests/coroutines-mt/build.gradle.kts
@@ -15,11 +15,11 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
-        implementation(libs.apollo.mockserver)
-        implementation(libs.apollo.normalizedcache)
-        implementation(libs.apollo.mpputils)
-        implementation(libs.apollo.runtime)
+        implementation(golatac.lib("apollo.testingsupport"))
+        implementation(golatac.lib("apollo.mockserver"))
+        implementation(golatac.lib("apollo.normalizedcache"))
+        implementation(golatac.lib("apollo.mpputils"))
+        implementation(golatac.lib("apollo.runtime"))
       }
     }
   }
@@ -38,4 +38,3 @@ apollo {
   packageName.set("macos.app")
   generateDataBuilders.set(true)
 }
-
diff --git a/tests/data-builders-java/build.gradle.kts b/tests/data-builders-java/build.gradle.kts
index 9208a6f27e..54758a67c9 100644
--- a/tests/data-builders-java/build.gradle.kts
+++ b/tests/data-builders-java/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
   implementation("com.apollographql.apollo3:apollo-runtime")
-  testImplementation(libs.junit)
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/defer/build.gradle.kts b/tests/defer/build.gradle.kts
index 6941d9df62..67aac99021 100644
--- a/tests/defer/build.gradle.kts
+++ b/tests/defer/build.gradle.kts
@@ -19,15 +19,15 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
-        implementation(libs.apollo.normalizedcache)
+        implementation(golatac.lib("apollo.runtime"))
+        implementation(golatac.lib("apollo.normalizedcache"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.mockserver)
-        implementation(libs.apollo.testingsupport)
+        implementation(golatac.lib("apollo.mockserver"))
+        implementation(golatac.lib("apollo.testingsupport"))
       }
     }
 
@@ -45,7 +45,7 @@ kotlin {
 
     val jvmTest by getting {
       dependencies {
-        implementation(libs.apollo.httpCache)
+        implementation(golatac.lib("apollo.httpCache"))
       }
     }
   }
diff --git a/tests/deprecated-requires-opt-in/build.gradle.kts b/tests/deprecated-requires-opt-in/build.gradle.kts
index a57695664d..fe8c8a00d6 100644
--- a/tests/deprecated-requires-opt-in/build.gradle.kts
+++ b/tests/deprecated-requires-opt-in/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/enums/build.gradle.kts b/tests/enums/build.gradle.kts
index e4f18fe625..d1ce6c5aea 100644
--- a/tests/enums/build.gradle.kts
+++ b/tests/enums/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/escaping/build.gradle.kts b/tests/escaping/build.gradle.kts
index fa48bf1b99..55e64f45b1 100644
--- a/tests/escaping/build.gradle.kts
+++ b/tests/escaping/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/filesystem-sensitivity/build.gradle.kts b/tests/filesystem-sensitivity/build.gradle.kts
index fb2d529b8a..4f8a4b340a 100644
--- a/tests/filesystem-sensitivity/build.gradle.kts
+++ b/tests/filesystem-sensitivity/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.api)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.api"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/http-cache/build.gradle.kts b/tests/http-cache/build.gradle.kts
index 04613ef4f3..7b19454cf1 100644
--- a/tests/http-cache/build.gradle.kts
+++ b/tests/http-cache/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.httpCache)
-  implementation(libs.apollo.mockserver)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.apollo.testingsupport)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.httpCache"))
+  implementation(golatac.lib("apollo.mockserver"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
+  testImplementation(golatac.lib("apollo.testingsupport"))
 }
 
 apollo {
diff --git a/tests/idling-resource/build.gradle.kts b/tests/idling-resource/build.gradle.kts
index afb7a32eb7..c4881e05be 100644
--- a/tests/idling-resource/build.gradle.kts
+++ b/tests/idling-resource/build.gradle.kts
@@ -6,19 +6,19 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.androidx.espresso.idlingresource)
-  implementation(libs.apollo.idlingresource)
-  testImplementation(libs.apollo.mockserver)
-  testImplementation(libs.android.support.annotations)
-  testImplementation(libs.android.test.runner)
+  implementation(golatac.lib("androidx.espresso.idlingresource"))
+  implementation(golatac.lib("apollo.idlingresource"))
+  testImplementation(golatac.lib("apollo.mockserver"))
+  testImplementation(golatac.lib("android.support.annotations"))
+  testImplementation(golatac.lib("android.test.runner"))
 }
 
 android {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
+  compileSdk = golatac.version("android.sdkversion.compile").toInt()
 
   defaultConfig {
-    minSdk = libs.versions.android.sdkversion.min.get().toInt()
-    targetSdk = libs.versions.android.sdkversion.target.get().toInt()
+    minSdk = golatac.version("android.sdkversion.min").toInt()
+    targetSdk = golatac.version("android.sdkversion.target").toInt()
   }
 }
 
diff --git a/tests/include-skip-operation-based/build.gradle.kts b/tests/include-skip-operation-based/build.gradle.kts
index 187c3131cb..5311fad4ee 100644
--- a/tests/include-skip-operation-based/build.gradle.kts
+++ b/tests/include-skip-operation-based/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.httpCache)
-  implementation(libs.apollo.mockserver)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.apollo.testingsupport)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.httpCache"))
+  implementation(golatac.lib("apollo.mockserver"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
+  testImplementation(golatac.lib("apollo.testingsupport"))
 }
 
 apollo {
diff --git a/tests/integration-tests/build.gradle.kts b/tests/integration-tests/build.gradle.kts
index 4101c0e6e6..1223dd1b7e 100644
--- a/tests/integration-tests/build.gradle.kts
+++ b/tests/integration-tests/build.gradle.kts
@@ -19,35 +19,35 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.api)
-        implementation(libs.apollo.normalizedcache)
-        implementation(libs.apollo.testingsupport)
-        implementation(libs.apollo.mockserver)
-        implementation(libs.apollo.adapters)
-        implementation(libs.apollo.runtime)
+        implementation(golatac.lib("apollo.api"))
+        implementation(golatac.lib("apollo.normalizedcache"))
+        implementation(golatac.lib("apollo.testingsupport"))
+        implementation(golatac.lib("apollo.mockserver"))
+        implementation(golatac.lib("apollo.adapters"))
+        implementation(golatac.lib("apollo.runtime"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.kotlinx.coroutines)
-        implementation(libs.kotlinx.serialization.json.get().toString()) {
+        implementation(golatac.lib("kotlinx.coroutines"))
+        implementation(golatac.lib("kotlinx.serialization.json").toString()) {
           because("OperationOutputTest uses it to check the json and we can't use moshi since it's mpp code")
         }
-        implementation(libs.kotlinx.coroutines.test)
+        implementation(golatac.lib("kotlinx.coroutines.test"))
       }
     }
 
     val javaCodegenTest by getting {
       dependencies {
         // Add test-junit manually because configureMppTestsDefaults did not do it for us
-        implementation(libs.kotlin.test.junit)
+        implementation(golatac.lib("kotlin.test.junit"))
       }
     }
 
     val jvmTest by getting {
       dependencies {
-        implementation(libs.okhttp.logging)
+        implementation(golatac.lib("okhttp.logging"))
       }
     }
   }
diff --git a/tests/ios-test/build.gradle.kts b/tests/ios-test/build.gradle.kts
index c81afceba4..178616f7c6 100644
--- a/tests/ios-test/build.gradle.kts
+++ b/tests/ios-test/build.gradle.kts
@@ -16,14 +16,14 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
-        implementation(libs.apollo.mockserver)
+        implementation(golatac.lib("apollo.runtime"))
+        implementation(golatac.lib("apollo.mockserver"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
+        implementation(golatac.lib("apollo.testingsupport"))
       }
     }
   }
diff --git a/tests/java-tests/build.gradle.kts b/tests/java-tests/build.gradle.kts
index 3680b514b0..1221d6903c 100644
--- a/tests/java-tests/build.gradle.kts
+++ b/tests/java-tests/build.gradle.kts
@@ -5,14 +5,14 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.httpCache)
-  implementation(libs.apollo.normalizedcache)
-  implementation(libs.apollo.normalizedcache.sqlite)
-  implementation(libs.apollo.mockserver)
-  implementation(libs.apollo.rx2)
-  testImplementation(libs.junit)
-  testImplementation(libs.truth)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.httpCache"))
+  implementation(golatac.lib("apollo.normalizedcache"))
+  implementation(golatac.lib("apollo.normalizedcache.sqlite"))
+  implementation(golatac.lib("apollo.mockserver"))
+  implementation(golatac.lib("apollo.rx2"))
+  testImplementation(golatac.lib("junit"))
+  testImplementation(golatac.lib("truth"))
 }
 
 apollo {
diff --git a/tests/jpms/build.gradle.kts b/tests/jpms/build.gradle.kts
index 9c1fc6be06..e0094f06e9 100644
--- a/tests/jpms/build.gradle.kts
+++ b/tests/jpms/build.gradle.kts
@@ -10,10 +10,10 @@ repositories {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.rx2)
-  implementation(libs.apollo.normalizedcache.sqlite)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.rx2"))
+  implementation(golatac.lib("apollo.normalizedcache.sqlite"))
+  testImplementation(golatac.lib("junit"))
 }
 
 application {
diff --git a/tests/jvmoverloads/build.gradle.kts b/tests/jvmoverloads/build.gradle.kts
index 6614208864..cf421ceaee 100644
--- a/tests/jvmoverloads/build.gradle.kts
+++ b/tests/jvmoverloads/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/kotlin-codegen/build.gradle.kts b/tests/kotlin-codegen/build.gradle.kts
index ae46d3b6cf..86de7b40ce 100644
--- a/tests/kotlin-codegen/build.gradle.kts
+++ b/tests/kotlin-codegen/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.api)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.api"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/legacy-memory-model/build.gradle.kts b/tests/legacy-memory-model/build.gradle.kts
index 3e8ceca4b6..c24b9c568e 100644
--- a/tests/legacy-memory-model/build.gradle.kts
+++ b/tests/legacy-memory-model/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
+        implementation(golatac.lib("apollo.runtime"))
       }
     }
   }
diff --git a/tests/models-compat/build.gradle.kts b/tests/models-compat/build.gradle.kts
index c3586690c9..7809951dfb 100644
--- a/tests/models-compat/build.gradle.kts
+++ b/tests/models-compat/build.gradle.kts
@@ -14,15 +14,15 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
-        implementation(libs.apollo.normalizedcache)
-        implementation(libs.apollo.adapters)
+        implementation(golatac.lib("apollo.runtime"))
+        implementation(golatac.lib("apollo.normalizedcache"))
+        implementation(golatac.lib("apollo.adapters"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
+        implementation(golatac.lib("apollo.testingsupport"))
       }
     }
   }
diff --git a/tests/models-operation-based/build.gradle.kts b/tests/models-operation-based/build.gradle.kts
index 673d3f4aa5..b99a614330 100644
--- a/tests/models-operation-based/build.gradle.kts
+++ b/tests/models-operation-based/build.gradle.kts
@@ -21,22 +21,22 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
-        implementation(libs.apollo.normalizedcache)
-        implementation(libs.apollo.adapters)
+        implementation(golatac.lib("apollo.runtime"))
+        implementation(golatac.lib("apollo.normalizedcache"))
+        implementation(golatac.lib("apollo.adapters"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
+        implementation(golatac.lib("apollo.testingsupport"))
       }
     }
 
     val javaCodegenTest by getting {
       dependencies {
         // Add test-junit manually because configureMppTestsDefaults did not do it for us
-        implementation(libs.kotlin.test.junit)
+        implementation(golatac.lib("kotlin.test.junit"))
       }
     }
   }
diff --git a/tests/models-response-based/build.gradle.kts b/tests/models-response-based/build.gradle.kts
index 8526a91f10..371d8710a3 100644
--- a/tests/models-response-based/build.gradle.kts
+++ b/tests/models-response-based/build.gradle.kts
@@ -12,15 +12,15 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
-        implementation(libs.apollo.normalizedcache)
-        implementation(libs.apollo.adapters)
+        implementation(golatac.lib("apollo.runtime"))
+        implementation(golatac.lib("apollo.normalizedcache"))
+        implementation(golatac.lib("apollo.adapters"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
+        implementation(golatac.lib("apollo.testingsupport"))
       }
     }
   }
diff --git a/tests/multi-module-1/child/build.gradle.kts b/tests/multi-module-1/child/build.gradle.kts
index dedb6f1466..52d1277c96 100644
--- a/tests/multi-module-1/child/build.gradle.kts
+++ b/tests/multi-module-1/child/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(projects.multiModule1.root)
-  apolloMetadata(projects.multiModule1.root)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(project(":multi-module-1:root"))
+  apolloMetadata(project(":multi-module-1:root"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/multi-module-1/file-path/build.gradle.kts b/tests/multi-module-1/file-path/build.gradle.kts
index 39eca74653..b980f31afd 100644
--- a/tests/multi-module-1/file-path/build.gradle.kts
+++ b/tests/multi-module-1/file-path/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(projects.multiModule1.root)
-  apolloMetadata(projects.multiModule1.root)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(project(":multi-module-1:root"))
+  apolloMetadata(project(":multi-module-1:root"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/multi-module-1/fragment-schema-package/build.gradle.kts b/tests/multi-module-1/fragment-schema-package/build.gradle.kts
index 8ae3fc25c6..e277e87e6d 100644
--- a/tests/multi-module-1/fragment-schema-package/build.gradle.kts
+++ b/tests/multi-module-1/fragment-schema-package/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(projects.multiModule1.root)
-  apolloMetadata(projects.multiModule1.root)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(project(":multi-module-1:root"))
+  apolloMetadata(project(":multi-module-1:root"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/multi-module-1/root/build.gradle.kts b/tests/multi-module-1/root/build.gradle.kts
index 52ead9daa0..8cdc384729 100644
--- a/tests/multi-module-1/root/build.gradle.kts
+++ b/tests/multi-module-1/root/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
+  implementation(golatac.lib("apollo.runtime"))
 }
 
 apollo {
diff --git a/tests/multi-module-2/child/build.gradle.kts b/tests/multi-module-2/child/build.gradle.kts
index 64803f9591..f8d8b84dcc 100644
--- a/tests/multi-module-2/child/build.gradle.kts
+++ b/tests/multi-module-2/child/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(projects.multiModule2.root)
-  apolloMetadata(projects.multiModule2.root)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(project(":multi-module-2:root"))
+  apolloMetadata(project(":multi-module-2:root"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/multi-module-2/root/build.gradle.kts b/tests/multi-module-2/root/build.gradle.kts
index cb28daa00c..50c489796e 100644
--- a/tests/multi-module-2/root/build.gradle.kts
+++ b/tests/multi-module-2/root/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.api)
+  implementation(golatac.lib("apollo.api"))
 }
 
 apollo {
diff --git a/tests/native-benchmarks/build.gradle.kts b/tests/native-benchmarks/build.gradle.kts
index 55bb214d89..d61ec118f8 100644
--- a/tests/native-benchmarks/build.gradle.kts
+++ b/tests/native-benchmarks/build.gradle.kts
@@ -15,16 +15,16 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
-        implementation(libs.apollo.normalizedcache)
+        implementation(golatac.lib("apollo.runtime"))
+        implementation(golatac.lib("apollo.normalizedcache"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
-        implementation(libs.apollo.mockserver)
-        implementation(libs.apollo.mpputils)
+        implementation(golatac.lib("apollo.testingsupport"))
+        implementation(golatac.lib("apollo.mockserver"))
+        implementation(golatac.lib("apollo.mpputils"))
       }
     }
   }
diff --git a/tests/no-query-document/build.gradle.kts b/tests/no-query-document/build.gradle.kts
index eec3c3478c..90d5352ba3 100644
--- a/tests/no-query-document/build.gradle.kts
+++ b/tests/no-query-document/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.mockserver)
-  implementation(libs.apollo.testingsupport)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.mockserver"))
+  implementation(golatac.lib("apollo.testingsupport"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/no-runtime/build.gradle.kts b/tests/no-runtime/build.gradle.kts
index ddfae247cb..d1cc7e6c99 100644
--- a/tests/no-runtime/build.gradle.kts
+++ b/tests/no-runtime/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.api)
-  implementation(projects.sampleServer)
-  implementation(libs.apollo.testingsupport)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
-  testImplementation(libs.okhttp)
+  implementation(golatac.lib("apollo.api"))
+  implementation(project(":sample-server"))
+  implementation(golatac.lib("apollo.testingsupport"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
+  testImplementation(golatac.lib("okhttp"))
 }
 
 apollo {
diff --git a/tests/normalization-tests/build.gradle.kts b/tests/normalization-tests/build.gradle.kts
index b2dbcefd03..5cbbdc593a 100644
--- a/tests/normalization-tests/build.gradle.kts
+++ b/tests/normalization-tests/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.mockserver)
-  implementation(libs.apollo.normalizedcache)
-  implementation(libs.apollo.testingsupport)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.mockserver"))
+  implementation(golatac.lib("apollo.normalizedcache"))
+  implementation(golatac.lib("apollo.testingsupport"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/optimistic-data/build.gradle.kts b/tests/optimistic-data/build.gradle.kts
index 2a8db77627..5fe83f5518 100644
--- a/tests/optimistic-data/build.gradle.kts
+++ b/tests/optimistic-data/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.normalizedcache)
-  testImplementation(libs.apollo.testingsupport)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.turbine)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.normalizedcache"))
+  testImplementation(golatac.lib("apollo.testingsupport"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("turbine"))
 }
 
 apollo {
diff --git a/tests/optional-variables/build.gradle.kts b/tests/optional-variables/build.gradle.kts
index f564f9f9d2..07cfc7d0cb 100644
--- a/tests/optional-variables/build.gradle.kts
+++ b/tests/optional-variables/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/outofbounds/build.gradle.kts b/tests/outofbounds/build.gradle.kts
index d1834892c4..6b3c86f117 100644
--- a/tests/outofbounds/build.gradle.kts
+++ b/tests/outofbounds/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/pagination/build.gradle.kts b/tests/pagination/build.gradle.kts
index 008a0427a6..1bab5c05eb 100644
--- a/tests/pagination/build.gradle.kts
+++ b/tests/pagination/build.gradle.kts
@@ -14,15 +14,15 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
+        implementation(golatac.lib("apollo.runtime"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
-        implementation(libs.apollo.normalizedcache.incubating)
-        implementation(libs.apollo.normalizedcache.sqlite.incubating)
+        implementation(golatac.lib("apollo.testingsupport"))
+        implementation(golatac.lib("apollo.normalizedcache.incubating"))
+        implementation(golatac.lib("apollo.normalizedcache.sqlite.incubating"))
       }
     }
   }
diff --git a/tests/rxjava/build.gradle.kts b/tests/rxjava/build.gradle.kts
index f79b60c668..84bbd5787a 100644
--- a/tests/rxjava/build.gradle.kts
+++ b/tests/rxjava/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.normalizedcache)
-  implementation(libs.apollo.mockserver)
-  implementation(libs.apollo.rx2)
-  testImplementation(libs.kotlin.test.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.normalizedcache"))
+  implementation(golatac.lib("apollo.mockserver"))
+  implementation(golatac.lib("apollo.rx2"))
+  testImplementation(golatac.lib("kotlin.test.junit"))
 }
 
 apollo {
diff --git a/tests/sample-server/build.gradle.kts b/tests/sample-server/build.gradle.kts
index d593600332..a5a36b8ebd 100644
--- a/tests/sample-server/build.gradle.kts
+++ b/tests/sample-server/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 dependencies {
-  api(libs.graphqlkotlin)
-  api(libs.kotlin.reflect.get().toString()) {
+  api(golatac.lib("graphqlkotlin"))
+  api(golatac.lib("kotlin.reflect").toString()) {
     because("graphqlKotlin pull kotlin-reflect and that triggers a warning like" +
         "Runtime JAR files in the classpath should have the same version.")
   }
-  implementation(libs.kotlinx.coroutines.reactor.get().toString()) {
+  implementation(golatac.lib("kotlinx.coroutines.reactor").toString()) {
     because("reactor must have the same version as the coroutines version")
   }
 }
diff --git a/tests/scalar-adapters/build.gradle.kts b/tests/scalar-adapters/build.gradle.kts
index bfeb724945..d1ba0750bb 100644
--- a/tests/scalar-adapters/build.gradle.kts
+++ b/tests/scalar-adapters/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.adapters)
-  testImplementation(libs.apollo.testingsupport)
-  testImplementation(libs.kotlin.test)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.adapters"))
+  testImplementation(golatac.lib("apollo.testingsupport"))
+  testImplementation(golatac.lib("kotlin.test"))
 }
 
 apollo {
diff --git a/tests/schema-changes/build.gradle.kts b/tests/schema-changes/build.gradle.kts
index ffdcc34bea..0f59e0551d 100644
--- a/tests/schema-changes/build.gradle.kts
+++ b/tests/schema-changes/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.normalizedcache)
-  testImplementation(libs.apollo.testingsupport)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.turbine)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.normalizedcache"))
+  testImplementation(golatac.lib("apollo.testingsupport"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("turbine"))
 }
 
 apollo {
diff --git a/tests/settings.gradle.kts b/tests/settings.gradle.kts
index fd0f88de87..1ba5c72348 100644
--- a/tests/settings.gradle.kts
+++ b/tests/settings.gradle.kts
@@ -13,17 +13,20 @@ rootProject.projectDir
       include(project)
     }
 
-includeBuild("../build-logic")
 includeBuild("../")
 
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-
 pluginManagement {
   includeBuild("../build-logic")
 
   repositories {
     mavenCentral()
     google()
-    gradlePluginPortal()
+    gradlePluginPortal {
+      content {
+        includeModule("me.champeau.gradle", "japicmp-gradle-plugin")
+        includeModule("com.gradle.publish", "plugin-publish-plugin")
+        includeModule("com.github.ben-manes", "gradle-versions-plugin")
+      }
+    }
   }
 }
diff --git a/tests/sqlite/build.gradle.kts b/tests/sqlite/build.gradle.kts
index 8f1154d9b2..79d941bd41 100644
--- a/tests/sqlite/build.gradle.kts
+++ b/tests/sqlite/build.gradle.kts
@@ -14,15 +14,15 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
+        implementation(golatac.lib("apollo.runtime"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
-        implementation(libs.apollo.normalizedcache.incubating)
-        implementation(libs.apollo.normalizedcache.sqlite.incubating)
+        implementation(golatac.lib("apollo.testingsupport"))
+        implementation(golatac.lib("apollo.normalizedcache.incubating"))
+        implementation(golatac.lib("apollo.normalizedcache.sqlite.incubating"))
       }
     }
   }
diff --git a/tests/termination/build.gradle.kts b/tests/termination/build.gradle.kts
index 42723f8f05..01eed7f9a0 100644
--- a/tests/termination/build.gradle.kts
+++ b/tests/termination/build.gradle.kts
@@ -6,9 +6,9 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
+  implementation(golatac.lib("apollo.runtime"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
 }
 
 apollo {
diff --git a/tests/test-network-transport/build.gradle.kts b/tests/test-network-transport/build.gradle.kts
index a638a879b1..802ae15fb2 100644
--- a/tests/test-network-transport/build.gradle.kts
+++ b/tests/test-network-transport/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.apollo.runtime)
-  implementation(libs.apollo.mockserver)
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.junit)
-  testImplementation(libs.turbine)
-  testImplementation(libs.apollo.testingsupport)
+  implementation(golatac.lib("apollo.runtime"))
+  implementation(golatac.lib("apollo.mockserver"))
+  testImplementation(golatac.lib("kotlin.test"))
+  testImplementation(golatac.lib("junit"))
+  testImplementation(golatac.lib("turbine"))
+  testImplementation(golatac.lib("apollo.testingsupport"))
 }
 
 apollo {
diff --git a/tests/websockets/build.gradle.kts b/tests/websockets/build.gradle.kts
index 40911a7b31..a9d6f3fd03 100644
--- a/tests/websockets/build.gradle.kts
+++ b/tests/websockets/build.gradle.kts
@@ -12,21 +12,21 @@ kotlin {
   sourceSets {
     val commonMain by getting {
       dependencies {
-        implementation(libs.apollo.runtime)
+        implementation(golatac.lib("apollo.runtime"))
       }
     }
 
     val commonTest by getting {
       dependencies {
-        implementation(libs.apollo.testingsupport)
-        implementation(libs.apollo.normalizedcache)
-        implementation(libs.turbine)
+        implementation(golatac.lib("apollo.testingsupport"))
+        implementation(golatac.lib("apollo.normalizedcache"))
+        implementation(golatac.lib("turbine"))
       }
     }
 
     val jvmTest by getting {
       dependencies {
-        implementation(projects.sampleServer)
+        implementation(project(":sample-server"))
       }
     }
   }