Remove golatac

benchmark/build.gradle.kts

@@ -4,9 +4,3 @@ buildscript {
   }
 }
 
-plugins {
-  id("net.mbonnin.golatac") version "0.0.3"
-}
-
-golatac.init(file("../gradle/libraries.toml"))
-

benchmark/microbenchmark/build.gradle.kts

@@ -68,10 +68,10 @@ dependencies {
 
 configure<com.android.build.gradle.LibraryExtension> {
   namespace = "com.apollographql.apollo3.benchmark"
-  compileSdk = golatac.version("android.sdkversion.compile").toInt()
+  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
 
   defaultConfig {
-    minSdk = golatac.version("android.sdkversion.min").toInt()
+    minSdk = libs.versions.android.sdkversion.min.get().toInt()
     testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
   }
 

build-logic/build.gradle.kts

@@ -5,7 +5,6 @@ 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)
@@ -15,42 +14,40 @@ extensions.configure(SamWithReceiverExtension::class.java) {
 
 group = "com.apollographql.apollo3.build"
 
-golatac.init(file("../gradle/libraries.toml"))
-
 dependencies {
   compileOnly(gradleApi())
-  compileOnly(golatac.lib("gegp"))
+  compileOnly(libs.gegp)
 
-  implementation(golatac.lib("okhttp"))
+  implementation(libs.okhttp)
 
-  implementation(golatac.lib("kotlinx.benchmark"))
-  implementation(golatac.lib("dokka.plugin"))
-  implementation(golatac.lib("dokka.base"))
+  implementation(libs.kotlinx.benchmark)
+  implementation(libs.dokka.plugin)
+  implementation(libs.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(golatac.lib("android.plugin"))
-  implementation(golatac.lib("gradle.japicmp.plugin"))
-  implementation(golatac.lib("vespene"))
-  implementation(golatac.lib("poet.java"))
-  implementation(golatac.lib("poet.kotlin"))
-  implementation(golatac.lib("intellij.plugin"))
-  implementation(golatac.lib("intellij.changelog"))
+  implementation(libs.android.plugin)
+  implementation(libs.gradle.japicmp.plugin)
+  implementation(libs.vespene)
+  implementation(libs.poet.java)
+  implementation(libs.poet.kotlin)
+  implementation(libs.intellij.plugin)
+  implementation(libs.intellij.changelog)
 
   // We want the KSP plugin to use the version from the classpath and not force a newer version
   // of the Gradle plugin
-  implementation(golatac.lib("kotlin.plugin"))
-  runtimeOnly(golatac.lib("ksp"))
+  implementation(libs.kotlin.plugin)
+  runtimeOnly(libs.ksp)
   // XXX: This is only needed for tests. We could have different build logic for different
   // builds but this seems just overkill for now
-  runtimeOnly(golatac.lib("kotlin.allopen"))
-  runtimeOnly(golatac.lib("kotlinx.serialization.plugin"))
+  runtimeOnly(libs.kotlin.allopen)
+  runtimeOnly(libs.kotlinx.serialization.plugin)
 
-  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"))
+  runtimeOnly(libs.sqldelight.plugin)
+  runtimeOnly(libs.gradle.publish.plugin)
+  runtimeOnly(libs.benmanes.versions)
+  runtimeOnly(libs.gr8)
+  runtimeOnly(libs.kotlinx.binarycompatibilityvalidator)
 }
 
 // Keep in sync with CompilerOptions.kt

build-logic/settings.gradle.kts

@@ -6,5 +6,13 @@ plugins {
 
 rootProject.name = "build-logic"
 
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../gradle/libraries.toml"))
+    }
+  }
+}
+
 apply(from = "../gradle/repositories.gradle.kts")
 apply(from = "../gradle/ge.gradle")

build.gradle.kts

@@ -2,11 +2,8 @@ import JapiCmp.configureJapiCmp
 
 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.kotlinx.binary-compatibility-validator")
 

gradle.properties

@@ -26,7 +26,6 @@ org.gradle.caching=true
 # Enable the configuration cache
 org.gradle.unsafe.configuration-cache=true
 
-kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true
 org.gradle.parallel=true
 
 # See https://kotlinlang.org/docs/whatsnew-eap.html#preview-of-gradle-composite-builds-support-in-kotlin-multiplatform

libraries/apollo-adapters/build.gradle.kts

@@ -15,7 +15,7 @@ kotlin {
     findByName("commonMain")?.apply {
       dependencies {
         api(project(":apollo-api"))
-        api(golatac.lib("kotlinx.datetime"))
+        api(libs.kotlinx.datetime)
       }
     }
     findByName("jsMain")?.apply {

libraries/apollo-annotations/build.gradle.kts

@@ -12,15 +12,15 @@ kotlin {
   sourceSets {
     findByName("commonMain")?.apply {
       dependencies {
-        api(golatac.lib("kotlin.stdlib"))
-        api(golatac.lib("jetbrains.annotations"))
+        api(libs.kotlin.stdlib)
+        api(libs.jetbrains.annotations)
       }
     }
 
     findByName("jsMain")?.apply {
       dependencies {
         // See https://youtrack.jetbrains.com/issue/KT-53471
-        api(golatac.lib("kotlin.stdlib.js"))
+        api(libs.kotlin.stdlib.js)
       }
     }
   }

libraries/apollo-api-java/build.gradle.kts

@@ -9,6 +9,6 @@ apolloLibrary {
 
 dependencies {
   api(project(":apollo-api"))
-  api(golatac.lib("okhttp"))
-  compileOnly(golatac.lib("guava.jre"))
+  api(libs.okhttp)
+  compileOnly(libs.guava.jre)
 }

libraries/apollo-api/build.gradle.kts

@@ -12,16 +12,17 @@ kotlin {
   sourceSets {
     findByName("commonMain")?.apply {
       dependencies {
-        api(golatac.lib("okio"))
-        api(golatac.lib("uuid"))
+        api(libs.okio)
+        api(libs.uuid)
         api(project(":apollo-annotations"))
       }
     }
 
     findByName("commonTest")?.apply {
       dependencies {
-        //implementation(golatac.lib("kotlin.test.junit"))
-        implementation(golatac.lib("kotlin.test"))
+        //implementation(libs.kotlin.test.junit)
+        //implementation("org.jetbrains.kotlin:kotlin-test")
+        implementation(libs.kotlin.test.asProvider().get().toString())
       }
     }
   }

libraries/apollo-ast/build.gradle.kts

@@ -21,27 +21,27 @@ kotlin {
   sourceSets {
     getByName("commonMain") {
       dependencies {
-        api(golatac.lib("okio"))
+        api(libs.okio)
         api(project(":apollo-annotations"))
-        implementation(golatac.lib("kotlinx.serialization.json"))
+        implementation(libs.kotlinx.serialization.json)
       }
     }
 
     getByName("jsMain") {
       dependencies {
-        implementation(golatac.lib("okio.nodefilesystem"))
+        implementation(libs.okio.nodefilesystem)
       }
     }
     getByName("jvmMain") {
       dependencies {
-        implementation(golatac.lib("antlr.runtime"))
+        implementation(libs.antlr.runtime)
       }
     }
   }
 }
 
 dependencies {
-  antlr(golatac.lib("antlr"))
+  antlr(libs.antlr)
 }
 
 // Only expose the antlr runtime dependency

libraries/apollo-cli/build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
 dependencies {
   implementation(project(":apollo-tooling"))
   implementation(project(":apollo-annotations"))
-  implementation(golatac.lib("kotlinx.serialization.json"))
-  implementation(golatac.lib("clikt"))
+  implementation(libs.kotlinx.serialization.json)
+  implementation(libs.clikt)
 }
 
 application {

libraries/apollo-compiler/build.gradle.kts

@@ -12,24 +12,24 @@ apolloLibrary {
 
 dependencies {
   implementation(project(":apollo-ast"))
-  api(golatac.lib("poet.kotlin")) {
+  api(libs.poet.kotlin) {
     // We don't use any of the KotlinPoet kotlin-reflect features
     exclude(module = "kotlin-reflect")
   }
-  api(golatac.lib("poet.java"))
+  api(libs.poet.java)
 
-  implementation(golatac.lib("kotlinx.serialization.json"))
-  implementation(golatac.lib("kotlinx.serialization.json.okio"))
+  implementation(libs.kotlinx.serialization.json)
+  implementation(libs.kotlinx.serialization.json.okio)
 
-  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"))
+  testImplementation(libs.kotlin.compiletesting)
+  testImplementation(libs.google.testing.compile)
+  testImplementation(libs.truth)
+  testImplementation(libs.kotlin.test.junit)
+  testImplementation(libs.google.testparameterinjector)
   testImplementation(project(":apollo-api-java")) {
     because("Generated Java code references Java and Guava Optionals")
   }
-  testImplementation(golatac.lib("androidx.annotation")) {
+  testImplementation(libs.androidx.annotation) {
     because("Used in the Java generated code")
   }
 }

libraries/apollo-compose-paging-support/build.gradle.kts

@@ -12,19 +12,19 @@ dependencies {
 }
 
 android {
-  compileSdk = golatac.version("android.sdkversion.compile").toInt()
+  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
   namespace = "com.apollographql.apollo3.compose.paging.support"
 
   defaultConfig {
-    minSdk = golatac.version("android.sdkversion.compose.min").toInt()
+    minSdk = libs.versions.android.sdkversion.compose.min.get().toInt()
   }
 
   buildFeatures {
     compose = true
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = golatac.version("compose.compiler")
+    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
   }
 
   // TODO: compiling fails only with the debug variant currently, due to using a version of Kotlin non supported by Compose.

libraries/apollo-compose-support/build.gradle.kts

@@ -7,25 +7,25 @@ plugins {
 }
 
 dependencies {
-  api(golatac.lib("compose-runtime"))
+  api(libs.compose.runtime)
   api(project(":apollo-runtime"))
   api(project(":apollo-normalized-cache"))
 }
 
 android {
-  compileSdk = golatac.version("android.sdkversion.compile").toInt()
+  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
   namespace = "com.apollographql.apollo3.compose.support"
 
   defaultConfig {
-    minSdk = golatac.version("android.sdkversion.compose.min").toInt()
+    minSdk = libs.versions.android.sdkversion.compose.min.get().toInt()
   }
 
   buildFeatures {
     compose = true
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = golatac.version("compose.compiler")
+    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
   }
 }
 

libraries/apollo-gradle-plugin-external/build.gradle.kts

@@ -10,9 +10,9 @@ apolloLibrary {
 }
 
 dependencies {
-  compileOnly(golatac.lib("gradle.api.min"))
-  compileOnly(golatac.lib("kotlin.plugin.min"))
-  compileOnly(golatac.lib("android.plugin.min"))
+  compileOnly(libs.gradle.api.min)
+  compileOnly(libs.kotlin.plugin.min)
+  compileOnly(libs.android.plugin.min)
 
   api(project(":apollo-compiler"))
   implementation(project(":apollo-tooling"))

libraries/apollo-gradle-plugin/build.gradle.kts

@@ -29,11 +29,11 @@ dependencies {
   add("shade", project(":apollo-gradle-plugin-external"))
 
   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"))
+  testImplementation(libs.junit)
+  testImplementation(libs.truth)
+  testImplementation(libs.assertj)
+  testImplementation(libs.okhttp.mockwebserver)
+  testImplementation(libs.okhttp.tls)
 }
 
 if (relocateJar) {

libraries/apollo-http-cache/build.gradle.kts

@@ -8,13 +8,13 @@ apolloLibrary {
 }
 
 dependencies {
-  api(golatac.lib("okhttp"))
+  api(libs.okhttp)
   api(project(":apollo-api"))
   api(project(":apollo-runtime"))
-  implementation(golatac.lib("moshi"))
-  implementation(golatac.lib("kotlinx.datetime"))
+  implementation(libs.moshi)
+  implementation(libs.kotlinx.datetime)
 
   testImplementation(project(":apollo-mockserver"))
-  testImplementation(golatac.lib("kotlin.test.junit"))
-  testImplementation(golatac.lib("truth"))
+  testImplementation(libs.kotlin.test.junit)
+  testImplementation(libs.truth)
 }

libraries/apollo-idling-resource/build.gradle.kts

@@ -5,15 +5,15 @@ plugins {
 }
 
 dependencies {
-  implementation(golatac.lib("androidx.espresso.idlingresource"))
+  implementation(libs.androidx.espresso.idlingresource)
   api(project(":apollo-runtime"))
 }
 
 android {
-  compileSdk = golatac.version("android.sdkversion.compile").toInt()
+  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
   namespace = "com.apollographql.apollo3.idling.resource"
 
   defaultConfig {
-    minSdk = golatac.version("android.sdkversion.min").toInt()
+    minSdk = libs.versions.android.sdkversion.min.get().toInt()
   }
 }