diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 5c51c285d1f..30470e46bfc 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -4,9 +4,3 @@ buildscript { } } -plugins { - id("net.mbonnin.golatac") version "0.0.3" -} - -golatac.init(file("../gradle/libraries.toml")) - diff --git a/benchmark/microbenchmark/build.gradle.kts b/benchmark/microbenchmark/build.gradle.kts index 9651ebbb754..054e793254a 100644 --- a/benchmark/microbenchmark/build.gradle.kts +++ b/benchmark/microbenchmark/build.gradle.kts @@ -68,10 +68,10 @@ dependencies { configure { 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" } diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 95acd4ad770..eec535f2cdb 100644 --- a/build-logic/build.gradle.kts +++ b/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 diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 4586025607d..ff7eafe162e 100644 --- a/build-logic/settings.gradle.kts +++ b/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") diff --git a/build.gradle.kts b/build.gradle.kts index 0b3dbd71341..39abdb23193 100644 --- a/build.gradle.kts +++ b/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") diff --git a/gradle.properties b/gradle.properties index 635d68fd7bb..488bc8defd8 100644 --- a/gradle.properties +++ b/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 diff --git a/libraries/apollo-adapters/build.gradle.kts b/libraries/apollo-adapters/build.gradle.kts index dbc1db1bd1e..fd80c27dd43 100644 --- a/libraries/apollo-adapters/build.gradle.kts +++ b/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 { diff --git a/libraries/apollo-annotations/build.gradle.kts b/libraries/apollo-annotations/build.gradle.kts index 74c51e323a8..3fc0f0d7f82 100644 --- a/libraries/apollo-annotations/build.gradle.kts +++ b/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) } } } diff --git a/libraries/apollo-api-java/build.gradle.kts b/libraries/apollo-api-java/build.gradle.kts index 34453e65770..415411f12d8 100644 --- a/libraries/apollo-api-java/build.gradle.kts +++ b/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) } diff --git a/libraries/apollo-api/build.gradle.kts b/libraries/apollo-api/build.gradle.kts index 0e1ca29f88e..3f2c27d611b 100644 --- a/libraries/apollo-api/build.gradle.kts +++ b/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()) } } } diff --git a/libraries/apollo-ast/build.gradle.kts b/libraries/apollo-ast/build.gradle.kts index 23794eabd84..3b5d9ca8add 100644 --- a/libraries/apollo-ast/build.gradle.kts +++ b/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 diff --git a/libraries/apollo-cli/build.gradle.kts b/libraries/apollo-cli/build.gradle.kts index bd1f455fc84..471dbd348ec 100644 --- a/libraries/apollo-cli/build.gradle.kts +++ b/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 { diff --git a/libraries/apollo-compiler/build.gradle.kts b/libraries/apollo-compiler/build.gradle.kts index db52986be28..79d367cb103 100644 --- a/libraries/apollo-compiler/build.gradle.kts +++ b/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") } } diff --git a/libraries/apollo-compose-paging-support/build.gradle.kts b/libraries/apollo-compose-paging-support/build.gradle.kts index cc87a32ef20..45741d09555 100644 --- a/libraries/apollo-compose-paging-support/build.gradle.kts +++ b/libraries/apollo-compose-paging-support/build.gradle.kts @@ -12,11 +12,11 @@ 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 { @@ -24,7 +24,7 @@ android { } 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. diff --git a/libraries/apollo-compose-support/build.gradle.kts b/libraries/apollo-compose-support/build.gradle.kts index 7deb840b7cf..0950ce04a30 100644 --- a/libraries/apollo-compose-support/build.gradle.kts +++ b/libraries/apollo-compose-support/build.gradle.kts @@ -7,17 +7,17 @@ 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 { @@ -25,7 +25,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = golatac.version("compose.compiler") + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } } diff --git a/libraries/apollo-gradle-plugin-external/build.gradle.kts b/libraries/apollo-gradle-plugin-external/build.gradle.kts index a3b9db8ac96..23fcdb6e2b8 100644 --- a/libraries/apollo-gradle-plugin-external/build.gradle.kts +++ b/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")) diff --git a/libraries/apollo-gradle-plugin/build.gradle.kts b/libraries/apollo-gradle-plugin/build.gradle.kts index b4986cebaef..a185f179a27 100644 --- a/libraries/apollo-gradle-plugin/build.gradle.kts +++ b/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) { diff --git a/libraries/apollo-http-cache/build.gradle.kts b/libraries/apollo-http-cache/build.gradle.kts index 29bfe75e662..75ebde1d33e 100644 --- a/libraries/apollo-http-cache/build.gradle.kts +++ b/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) } diff --git a/libraries/apollo-idling-resource/build.gradle.kts b/libraries/apollo-idling-resource/build.gradle.kts index 668ae7fadd4..a311555d661 100644 --- a/libraries/apollo-idling-resource/build.gradle.kts +++ b/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() } } diff --git a/libraries/apollo-mockserver/build.gradle.kts b/libraries/apollo-mockserver/build.gradle.kts index 70ef97585e9..97e58bbc1d7 100644 --- a/libraries/apollo-mockserver/build.gradle.kts +++ b/libraries/apollo-mockserver/build.gradle.kts @@ -15,17 +15,17 @@ kotlin { findByName("commonMain")?.apply { dependencies { api(project(":apollo-annotations")) - api(golatac.lib("okio")) - implementation(golatac.lib("atomicfu")) { + api(libs.okio) + implementation(libs.atomicfu.get().toString()) { because("We need locks for native (we don't use the gradle plugin rewrite)") } - api(golatac.lib("kotlinx.coroutines")) + api(libs.kotlinx.coroutines) } } findByName("jsMain")?.apply { dependencies { - implementation(golatac.lib("kotlinx.nodejs")) + implementation(libs.kotlinx.nodejs) } } diff --git a/libraries/apollo-normalized-cache-api-incubating/build.gradle.kts b/libraries/apollo-normalized-cache-api-incubating/build.gradle.kts index 153cc68a632..ae96e9be845 100644 --- a/libraries/apollo-normalized-cache-api-incubating/build.gradle.kts +++ b/libraries/apollo-normalized-cache-api-incubating/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { dependencies { api(project(":apollo-api")) api(project(":apollo-mpp-utils")) - implementation(golatac.lib("okio")) - api(golatac.lib("uuid")) + implementation(libs.okio) + api(libs.uuid) } } } diff --git a/libraries/apollo-normalized-cache-api/build.gradle.kts b/libraries/apollo-normalized-cache-api/build.gradle.kts index 153cc68a632..ae96e9be845 100644 --- a/libraries/apollo-normalized-cache-api/build.gradle.kts +++ b/libraries/apollo-normalized-cache-api/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { dependencies { api(project(":apollo-api")) api(project(":apollo-mpp-utils")) - implementation(golatac.lib("okio")) - api(golatac.lib("uuid")) + implementation(libs.okio) + api(libs.uuid) } } } diff --git a/libraries/apollo-normalized-cache-incubating/build.gradle.kts b/libraries/apollo-normalized-cache-incubating/build.gradle.kts index 3930e422b84..e16ffa8f667 100644 --- a/libraries/apollo-normalized-cache-incubating/build.gradle.kts +++ b/libraries/apollo-normalized-cache-incubating/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { dependencies { api(project(":apollo-runtime")) api(project(":apollo-normalized-cache-api-incubating")) - api(golatac.lib("kotlinx.coroutines")) - implementation(golatac.lib("atomicfu")) { + api(libs.kotlinx.coroutines) + implementation(libs.atomicfu.get().toString()) { because("Use of ReentrantLock in DefaultApolloStore for Apple (we don't use the gradle plugin rewrite)") } } diff --git a/libraries/apollo-normalized-cache-sqlite-incubating/build.gradle.kts b/libraries/apollo-normalized-cache-sqlite-incubating/build.gradle.kts index 141537fa428..96f0e8e44eb 100644 --- a/libraries/apollo-normalized-cache-sqlite-incubating/build.gradle.kts +++ b/libraries/apollo-normalized-cache-sqlite-incubating/build.gradle.kts @@ -44,39 +44,39 @@ kotlin { api(project(":apollo-api")) api(project(":apollo-normalized-cache-api-incubating")) api(project(":apollo-normalized-cache-incubating")) - api(golatac.lib("sqldelight.runtime")) + api(libs.sqldelight.runtime) } } findByName("jvmMain")?.apply { dependencies { - implementation(golatac.lib("sqldelight.jvm")) + implementation(libs.sqldelight.jvm) } } findByName("appleMain")?.apply { dependencies { - implementation(golatac.lib("sqldelight.native")) + implementation(libs.sqldelight.native) } } findByName("jvmTest")?.apply { dependencies { - implementation(golatac.lib("truth")) + implementation(libs.truth) } } findByName("androidMain")?.apply { dependencies { - api(golatac.lib("androidx.sqlite")) - implementation(golatac.lib("sqldelight.android")) - implementation(golatac.lib("androidx.sqlite.framework")) - implementation(golatac.lib("androidx.startup.runtime")) + api(libs.androidx.sqlite) + implementation(libs.sqldelight.android) + implementation(libs.androidx.sqlite.framework) + implementation(libs.androidx.startup.runtime) } } findByName("androidTest")?.apply { dependencies { - implementation(golatac.lib("kotlin.test.junit")) + implementation(libs.kotlin.test.junit) } } findByName("commonTest")?.apply { @@ -88,11 +88,11 @@ kotlin { } configure { - compileSdk = golatac.version("android.sdkversion.compile").toInt() + compileSdk = libs.versions.android.sdkversion.compile.get().toInt() namespace = "com.apollographql.apollo3.cache.normalized.sql" defaultConfig { - minSdk = golatac.version("android.sdkversion.min").toInt() + minSdk = libs.versions.android.sdkversion.min.get().toInt() } } diff --git a/libraries/apollo-normalized-cache-sqlite/build.gradle.kts b/libraries/apollo-normalized-cache-sqlite/build.gradle.kts index 90157932997..64d5e2509c5 100644 --- a/libraries/apollo-normalized-cache-sqlite/build.gradle.kts +++ b/libraries/apollo-normalized-cache-sqlite/build.gradle.kts @@ -36,34 +36,34 @@ kotlin { findByName("jvmMain")?.apply { dependencies { - implementation(golatac.lib("sqldelight.jvm")) + implementation(libs.sqldelight.jvm) } } findByName("appleMain")?.apply { dependencies { - implementation(golatac.lib("sqldelight.native")) + implementation(libs.sqldelight.native) } } findByName("jvmTest")?.apply { dependencies { - implementation(golatac.lib("truth")) + implementation(libs.truth) } } findByName("androidMain")?.apply { dependencies { - api(golatac.lib("androidx.sqlite")) - implementation(golatac.lib("sqldelight.android")) - implementation(golatac.lib("androidx.sqlite.framework")) - implementation(golatac.lib("androidx.startup.runtime")) + api(libs.androidx.sqlite) + implementation(libs.sqldelight.android) + implementation(libs.androidx.sqlite.framework) + implementation(libs.androidx.startup.runtime) } } findByName("androidTest")?.apply { dependencies { - implementation(golatac.lib("kotlin.test.junit")) + implementation(libs.kotlin.test.junit) } } @@ -76,11 +76,11 @@ kotlin { } configure { - compileSdk = golatac.version("android.sdkversion.compile").toInt() + compileSdk = libs.versions.android.sdkversion.compile.get().toInt() namespace = "com.apollographql.apollo3.cache.normalized.sql" defaultConfig { - minSdk = golatac.version("android.sdkversion.min").toInt() + minSdk = libs.versions.android.sdkversion.min.get().toInt() } } diff --git a/libraries/apollo-normalized-cache/build.gradle.kts b/libraries/apollo-normalized-cache/build.gradle.kts index 14612dd22f8..21c3f469c83 100644 --- a/libraries/apollo-normalized-cache/build.gradle.kts +++ b/libraries/apollo-normalized-cache/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { dependencies { api(project(":apollo-runtime")) api(project(":apollo-normalized-cache-api")) - api(golatac.lib("kotlinx.coroutines")) - implementation(golatac.lib("atomicfu")) { + api(libs.kotlinx.coroutines) + implementation(libs.atomicfu.get().toString()) { because("Use of ReentrantLock in DefaultApolloStore for Apple (we don't use the gradle plugin rewrite)") } } diff --git a/libraries/apollo-runtime/build.gradle.kts b/libraries/apollo-runtime/build.gradle.kts index 0bae36dd6ba..8051579c3f8 100644 --- a/libraries/apollo-runtime/build.gradle.kts +++ b/libraries/apollo-runtime/build.gradle.kts @@ -16,9 +16,9 @@ kotlin { dependencies { api(project(":apollo-api")) api(project(":apollo-mpp-utils")) - api(golatac.lib("okio")) - api(golatac.lib("uuid")) - api(golatac.lib("kotlinx.coroutines")) + api(libs.okio) + api(libs.uuid) + api(libs.kotlinx.coroutines) } } @@ -38,13 +38,13 @@ kotlin { findByName("jvmMain")?.apply { dependencies { - api(golatac.lib("okhttp")) + api(libs.okhttp) } } findByName("jsMain")?.apply { dependencies { - api(golatac.lib("ktor.client.js")) + api(libs.ktor.client.js) } } @@ -55,9 +55,9 @@ kotlin { findByName("jvmTest")?.apply { dependencies { - implementation(golatac.lib("kotlin.test.junit")) - implementation(golatac.lib("truth")) - implementation(golatac.lib("okhttp")) + implementation(libs.kotlin.test.junit) + implementation(libs.truth) + implementation(libs.okhttp) } } } diff --git a/libraries/apollo-rx2-support-java/build.gradle.kts b/libraries/apollo-rx2-support-java/build.gradle.kts index d475c66bf72..d1abd97e1a8 100644 --- a/libraries/apollo-rx2-support-java/build.gradle.kts +++ b/libraries/apollo-rx2-support-java/build.gradle.kts @@ -8,6 +8,6 @@ apolloLibrary { } dependencies { - api(golatac.lib("rx.java2")) + api(libs.rx.java2) api(project(":apollo-runtime-java")) } diff --git a/libraries/apollo-rx2-support/build.gradle.kts b/libraries/apollo-rx2-support/build.gradle.kts index edb2b65828b..3d8c002ce17 100644 --- a/libraries/apollo-rx2-support/build.gradle.kts +++ b/libraries/apollo-rx2-support/build.gradle.kts @@ -9,8 +9,8 @@ apolloLibrary { dependencies { implementation(project(":apollo-api")) - api(golatac.lib("rx.java2")) - api(golatac.lib("kotlinx.coroutines.rx2")) + api(libs.rx.java2) + api(libs.kotlinx.coroutines.rx2) api(project(":apollo-runtime")) api(project(":apollo-normalized-cache")) diff --git a/libraries/apollo-rx3-support-java/build.gradle.kts b/libraries/apollo-rx3-support-java/build.gradle.kts index 29a139d09ea..938e612caa0 100644 --- a/libraries/apollo-rx3-support-java/build.gradle.kts +++ b/libraries/apollo-rx3-support-java/build.gradle.kts @@ -11,6 +11,6 @@ apolloLibrary { } dependencies { - api(golatac.lib("rx.java3")) + api(libs.rx.java3) api(project(":apollo-runtime-java")) } diff --git a/libraries/apollo-rx3-support/build.gradle.kts b/libraries/apollo-rx3-support/build.gradle.kts index afabbe369af..6f5488b3837 100644 --- a/libraries/apollo-rx3-support/build.gradle.kts +++ b/libraries/apollo-rx3-support/build.gradle.kts @@ -12,8 +12,8 @@ apolloLibrary { dependencies { implementation(project(":apollo-api")) - api(golatac.lib("rx.java3")) - api(golatac.lib("kotlinx.coroutines.rx3")) + api(libs.rx.java3) + api(libs.kotlinx.coroutines.rx3) api(project(":apollo-runtime")) api(project(":apollo-normalized-cache")) diff --git a/libraries/apollo-testing-support/build.gradle.kts b/libraries/apollo-testing-support/build.gradle.kts index 6c46a2b5a3f..3b8e83ff848 100644 --- a/libraries/apollo-testing-support/build.gradle.kts +++ b/libraries/apollo-testing-support/build.gradle.kts @@ -16,30 +16,30 @@ kotlin { api(project(":apollo-api")) api(project(":apollo-runtime")) api(project(":apollo-mockserver")) - api(golatac.lib("kotlinx.coroutines")) - implementation(golatac.lib("atomicfu")) { + api(libs.kotlinx.coroutines) + implementation(libs.atomicfu.get().toString()) { because("We need locks in TestNetworkTransportHandler (we don't use the gradle plugin rewrite)") } - implementation(golatac.lib("kotlinx.coroutines.test")) + implementation(libs.kotlinx.coroutines.test) } } findByName("jvmTest")?.apply { dependencies { - implementation(golatac.lib("truth")) + implementation(libs.truth) } } findByName("jsMain")?.apply { dependencies { - implementation(golatac.lib("kotlinx.nodejs")) - implementation(golatac.lib("kotlin.test.js")) - api(golatac.lib("okio.nodefilesystem")) + implementation(libs.kotlinx.nodejs) + implementation(libs.kotlin.test.js) + api(libs.okio.nodefilesystem) } } findByName("jsTest")?.apply { dependencies { - implementation(golatac.lib("kotlin.test.js")) + implementation(libs.kotlin.test.js) } } } diff --git a/libraries/apollo-tooling/build.gradle.kts b/libraries/apollo-tooling/build.gradle.kts index eacdc234e26..f9e5fb38d21 100644 --- a/libraries/apollo-tooling/build.gradle.kts +++ b/libraries/apollo-tooling/build.gradle.kts @@ -14,14 +14,14 @@ dependencies { } implementation(project(":apollo-ast")) - implementation(golatac.lib("apollo-runtime-published")) - implementation(golatac.lib("okhttp")) - implementation(golatac.lib("kotlinx.serialization.json")) + implementation(libs.apollo.runtime.published) + implementation(libs.okhttp) + implementation(libs.kotlinx.serialization.json) - testImplementation(golatac.lib("junit")) - testImplementation(golatac.lib("truth")) - testImplementation(golatac.lib("apollo-mockserver-published")) - testImplementation(golatac.lib("apollo-testingsupport-published")) + testImplementation(libs.junit) + testImplementation(libs.truth) + testImplementation(libs.apollo.mockserver.published) + testImplementation(libs.apollo.testingsupport.published) } apollo { diff --git a/settings.gradle.kts b/settings.gradle.kts index a0f7e34c85c..9b4df843ee9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,6 +23,13 @@ rootProject.projectDir include(":intellij-plugin") +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("gradle/libraries.toml")) + } + } +} apply(from = "./gradle/repositories.gradle.kts") apply(from = "./gradle/ge.gradle") diff --git a/tests/ast-benchmark/build.gradle.kts b/tests/ast-benchmark/build.gradle.kts index 8cf11fdc8a2..b93e79b33ef 100644 --- a/tests/ast-benchmark/build.gradle.kts +++ b/tests/ast-benchmark/build.gradle.kts @@ -14,9 +14,9 @@ benchmark { dependencies { implementation("com.apollographql.apollo3:apollo-ast") - implementation(golatac.lib("graphql.java")) + implementation(libs.graphql.java) implementation("org.jetbrains.kotlin:kotlin-test") - add("jmhImplementation", golatac.lib("kotlinx.benchmark.runtime")) + add("jmhImplementation", libs.kotlinx.benchmark.runtime) add("jmhImplementation", sourceSets.main.get().output + sourceSets.main.get().runtimeClasspath) } diff --git a/tests/browser-tests/build.gradle.kts b/tests/browser-tests/build.gradle.kts index 39e2fc52412..4d2cb07235f 100644 --- a/tests/browser-tests/build.gradle.kts +++ b/tests/browser-tests/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { sourceSets { val commonTest by getting { dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("kotlinx.coroutines.test")) + implementation(libs.apollo.runtime) + implementation(libs.kotlinx.coroutines.test) } } } diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index 5c57f6063f9..96efa772c12 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -1,9 +1,7 @@ plugins { id("apollo.test") apply false - id("net.mbonnin.golatac") version "0.0.3" } -golatac.init(file("../gradle/libraries.toml")) rootProject.configureNode() diff --git a/tests/compiler-hooks/build.gradle.kts b/tests/compiler-hooks/build.gradle.kts index 5895c47f4b9..575b17086eb 100644 --- a/tests/compiler-hooks/build.gradle.kts +++ b/tests/compiler-hooks/build.gradle.kts @@ -22,10 +22,10 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) - testImplementation(golatac.lib("kotlin.reflect")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) + testImplementation(libs.kotlin.reflect) } apollo { diff --git a/tests/data-builders-java/build.gradle.kts b/tests/data-builders-java/build.gradle.kts index 95fc4fdb8a7..b9f44284dbe 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(golatac.lib("junit")) + testImplementation(libs.junit) } apollo { diff --git a/tests/defer/build.gradle.kts b/tests/defer/build.gradle.kts index c958c686974..c881d59447f 100644 --- a/tests/defer/build.gradle.kts +++ b/tests/defer/build.gradle.kts @@ -19,15 +19,15 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.normalizedcache")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.mockserver")) - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.testingsupport) } } @@ -45,7 +45,7 @@ kotlin { findByName("jvmTest")?.apply { dependencies { - implementation(golatac.lib("apollo.httpCache")) + implementation(libs.apollo.httpCache) } } } diff --git a/tests/deprecated-requires-opt-in/build.gradle.kts b/tests/deprecated-requires-opt-in/build.gradle.kts index b7b0a672cd4..fb0c06885f2 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(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } /** diff --git a/tests/enums/build.gradle.kts b/tests/enums/build.gradle.kts index 2905a854d20..26c03499896 100644 --- a/tests/enums/build.gradle.kts +++ b/tests/enums/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/escaping/build.gradle.kts b/tests/escaping/build.gradle.kts index 76e54e1e19c..7e6d16878ec 100644 --- a/tests/escaping/build.gradle.kts +++ b/tests/escaping/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/filesystem-sensitivity/build.gradle.kts b/tests/filesystem-sensitivity/build.gradle.kts index 4f8a4b340ad..fb2d529b8ac 100644 --- a/tests/filesystem-sensitivity/build.gradle.kts +++ b/tests/filesystem-sensitivity/build.gradle.kts @@ -5,8 +5,8 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.api")) - testImplementation(golatac.lib("kotlin.test.junit")) + implementation(libs.apollo.api) + testImplementation(libs.kotlin.test.junit) } apollo { diff --git a/tests/gzip/build.gradle.kts b/tests/gzip/build.gradle.kts index 4d125c9b2c6..77005e08634 100644 --- a/tests/gzip/build.gradle.kts +++ b/tests/gzip/build.gradle.kts @@ -14,13 +14,13 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.testingsupport) } } } diff --git a/tests/http-cache/build.gradle.kts b/tests/http-cache/build.gradle.kts index fab025b4372..7dc3ccb84fe 100644 --- a/tests/http-cache/build.gradle.kts +++ b/tests/http-cache/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - 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")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.httpCache) + implementation(libs.apollo.mockserver) + testImplementation(libs.kotlin.test.junit) + testImplementation(libs.apollo.testingsupport) } apollo { diff --git a/tests/idling-resource/build.gradle.kts b/tests/idling-resource/build.gradle.kts index c7af9f48bd8..e3e43beeea8 100644 --- a/tests/idling-resource/build.gradle.kts +++ b/tests/idling-resource/build.gradle.kts @@ -6,20 +6,20 @@ plugins { } dependencies { - 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")) + implementation(libs.androidx.espresso.idlingresource) + implementation(libs.apollo.idlingresource) + testImplementation(libs.apollo.mockserver) + testImplementation(libs.android.support.annotations) + testImplementation(libs.android.test.runner) } android { - compileSdk = golatac.version("android.sdkversion.compile").toInt() + compileSdk = libs.versions.android.sdkversion.compile.get().toInt() namespace = "com.apollographql.apollo3.idling.resource.test" defaultConfig { - minSdk = golatac.version("android.sdkversion.min").toInt() - targetSdk = golatac.version("android.sdkversion.target").toInt() + minSdk = libs.versions.android.sdkversion.min.get().toInt() + targetSdk = libs.versions.android.sdkversion.target.get().toInt() } } diff --git a/tests/include-skip-operation-based/build.gradle.kts b/tests/include-skip-operation-based/build.gradle.kts index dcbd9ac115d..bee8f4e93c5 100644 --- a/tests/include-skip-operation-based/build.gradle.kts +++ b/tests/include-skip-operation-based/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.httpCache")) - implementation(golatac.lib("apollo.normalizedcache")) - implementation(golatac.lib("apollo.mockserver")) - testImplementation(golatac.lib("kotlin.test.junit")) - testImplementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.httpCache) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.mockserver) + testImplementation(libs.kotlin.test.junit) + testImplementation(libs.apollo.testingsupport) } apollo { diff --git a/tests/integration-tests/build.gradle.kts b/tests/integration-tests/build.gradle.kts index d933eedf06a..8b274188468 100644 --- a/tests/integration-tests/build.gradle.kts +++ b/tests/integration-tests/build.gradle.kts @@ -19,36 +19,34 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - 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")) + implementation(libs.apollo.api) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.testingsupport) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.adapters) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - 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(golatac.lib("kotlinx.coroutines.test")) - implementation(golatac.lib("turbine")) + implementation(libs.kotlinx.coroutines) + implementation(libs.kotlinx.serialization.json.asProvider()) + implementation(libs.kotlinx.coroutines.test) + implementation(libs.turbine) } } findByName("javaCodegenTest")?.apply { dependencies { // Add test-junit manually because configureMppTestsDefaults did not do it for us - implementation(golatac.lib("kotlin.test.junit")) + implementation(libs.kotlin.test.junit) } } findByName("jvmTest")?.apply { dependencies { - implementation(golatac.lib("okhttp.logging")) + implementation(libs.okhttp.logging) } } } diff --git a/tests/ios-test/build.gradle.kts b/tests/ios-test/build.gradle.kts index 533192a4bee..45ff6d5bcef 100644 --- a/tests/ios-test/build.gradle.kts +++ b/tests/ios-test/build.gradle.kts @@ -16,14 +16,14 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.mockserver")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.mockserver) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.testingsupport) } } } diff --git a/tests/java-client/build.gradle.kts b/tests/java-client/build.gradle.kts index 1d4f39be74c..3bdb3f59e36 100644 --- a/tests/java-client/build.gradle.kts +++ b/tests/java-client/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime.java")) - implementation(golatac.lib("apollo.mockserver")) - implementation(golatac.lib("apollo.rx3.java")) - testImplementation(golatac.lib("junit")) - testImplementation(golatac.lib("truth")) + implementation(libs.apollo.runtime.java) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.rx3.java) + testImplementation(libs.junit) + testImplementation(libs.truth) testImplementation(project(":sample-server")) } diff --git a/tests/java-nullability/build.gradle.kts b/tests/java-nullability/build.gradle.kts index fdc4b994261..4beeff8f3eb 100644 --- a/tests/java-nullability/build.gradle.kts +++ b/tests/java-nullability/build.gradle.kts @@ -5,10 +5,10 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.api.java")) - implementation(golatac.lib("guava.jre")) - implementation(golatac.lib("androidx.annotation")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.api.java) + implementation(libs.guava.jre) + implementation(libs.androidx.annotation) + testImplementation(libs.junit) } apollo { diff --git a/tests/java-tests/build.gradle.kts b/tests/java-tests/build.gradle.kts index cfbac27996b..b1baf3adc26 100644 --- a/tests/java-tests/build.gradle.kts +++ b/tests/java-tests/build.gradle.kts @@ -5,14 +5,14 @@ plugins { } dependencies { - 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")) + 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) } apollo { diff --git a/tests/jpms/build.gradle.kts b/tests/jpms/build.gradle.kts index c6b6bfcd912..ac209c1c1cf 100644 --- a/tests/jpms/build.gradle.kts +++ b/tests/jpms/build.gradle.kts @@ -6,10 +6,10 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.rx2")) - implementation(golatac.lib("apollo.normalizedcache.sqlite")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.rx2) + implementation(libs.apollo.normalizedcache.sqlite) + testImplementation(libs.junit) } application { diff --git a/tests/js/build.gradle.kts b/tests/js/build.gradle.kts index e9142eec9eb..c8754ffa304 100644 --- a/tests/js/build.gradle.kts +++ b/tests/js/build.gradle.kts @@ -15,13 +15,13 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.testingsupport) } } } diff --git a/tests/jsexport/build.gradle.kts b/tests/jsexport/build.gradle.kts index 14c93d6b5f7..d3421cdf266 100644 --- a/tests/jsexport/build.gradle.kts +++ b/tests/jsexport/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } diff --git a/tests/jvmoverloads/build.gradle.kts b/tests/jvmoverloads/build.gradle.kts index 4798090703d..d4d7ea108a7 100644 --- a/tests/jvmoverloads/build.gradle.kts +++ b/tests/jvmoverloads/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/kotlin-codegen/build.gradle.kts b/tests/kotlin-codegen/build.gradle.kts index 71e72446115..37424307639 100644 --- a/tests/kotlin-codegen/build.gradle.kts +++ b/tests/kotlin-codegen/build.gradle.kts @@ -5,8 +5,8 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.api")) - testImplementation(golatac.lib("kotlin.test.junit")) + implementation(libs.apollo.api) + testImplementation(libs.kotlin.test.junit) } apollo { diff --git a/tests/model-builders-java/build.gradle.kts b/tests/model-builders-java/build.gradle.kts index 5a7a8d0e6ce..e70630889e9 100644 --- a/tests/model-builders-java/build.gradle.kts +++ b/tests/model-builders-java/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { implementation("com.apollographql.apollo3:apollo-runtime") - testImplementation(golatac.lib("junit")) + testImplementation(libs.junit) } apollo { diff --git a/tests/models-operation-based-with-interfaces/build.gradle.kts b/tests/models-operation-based-with-interfaces/build.gradle.kts index b64f285d99f..587cd5b4f33 100644 --- a/tests/models-operation-based-with-interfaces/build.gradle.kts +++ b/tests/models-operation-based-with-interfaces/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.normalizedcache")) - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.adapters")) - testImplementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.runtime) + implementation(libs.apollo.adapters) + testImplementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) } apollo { diff --git a/tests/models-operation-based/build.gradle.kts b/tests/models-operation-based/build.gradle.kts index c229ae8dd39..4dba7191b1a 100644 --- a/tests/models-operation-based/build.gradle.kts +++ b/tests/models-operation-based/build.gradle.kts @@ -21,22 +21,22 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.normalizedcache")) - implementation(golatac.lib("apollo.adapters")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.adapters) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.testingsupport) } } findByName("javaCodegenTest")?.apply { dependencies { // Add test-junit manually because configureMppTestsDefaults did not do it for us - implementation(golatac.lib("kotlin.test.junit")) + implementation(libs.kotlin.test.junit) } } } diff --git a/tests/models-response-based/build.gradle.kts b/tests/models-response-based/build.gradle.kts index 68df43a4d64..777c91bb863 100644 --- a/tests/models-response-based/build.gradle.kts +++ b/tests/models-response-based/build.gradle.kts @@ -12,15 +12,15 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.normalizedcache")) - implementation(golatac.lib("apollo.adapters")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.adapters) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.testingsupport) } } } diff --git a/tests/multi-module-1/child/build.gradle.kts b/tests/multi-module-1/child/build.gradle.kts index 6593e35b193..1f64113c277 100644 --- a/tests/multi-module-1/child/build.gradle.kts +++ b/tests/multi-module-1/child/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) implementation(project(":multi-module-1:root")) - testImplementation(golatac.lib("kotlin.test.junit")) + testImplementation(libs.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 64337fc5157..d9ade0a88c2 100644 --- a/tests/multi-module-1/file-path/build.gradle.kts +++ b/tests/multi-module-1/file-path/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) implementation(project(":multi-module-1:root")) - testImplementation(golatac.lib("kotlin.test.junit")) + testImplementation(libs.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 95013de7e59..e2f04c53e38 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(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } apollo { diff --git a/tests/multi-module-2/child/build.gradle.kts b/tests/multi-module-2/child/build.gradle.kts index 3087101f196..1c04659710e 100644 --- a/tests/multi-module-2/child/build.gradle.kts +++ b/tests/multi-module-2/child/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) implementation(project(":multi-module-2:root")) - testImplementation(golatac.lib("kotlin.test.junit")) + testImplementation(libs.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 27ac0a93c09..cdec450fcb2 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(golatac.lib("apollo.api")) + implementation(libs.apollo.api) } apollo { diff --git a/tests/multi-module-3/child/build.gradle.kts b/tests/multi-module-3/child/build.gradle.kts index 0fb21eac9d1..c15e781ad90 100644 --- a/tests/multi-module-3/child/build.gradle.kts +++ b/tests/multi-module-3/child/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) implementation(project(":multi-module-3:root")) - testImplementation(golatac.lib("kotlin.test.junit")) + testImplementation(libs.kotlin.test.junit) } apollo { diff --git a/tests/multi-module-3/root/build.gradle.kts b/tests/multi-module-3/root/build.gradle.kts index 7dc6323650c..5cf1f7ae54e 100644 --- a/tests/multi-module-3/root/build.gradle.kts +++ b/tests/multi-module-3/root/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.api")) + implementation(libs.apollo.api) } apollo { diff --git a/tests/multipart/build.gradle.kts b/tests/multipart/build.gradle.kts index bc0cc8c1938..70304ef909a 100644 --- a/tests/multipart/build.gradle.kts +++ b/tests/multipart/build.gradle.kts @@ -12,13 +12,13 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) + implementation(libs.apollo.testingsupport) } } } diff --git a/tests/native-benchmarks/build.gradle.kts b/tests/native-benchmarks/build.gradle.kts index 3e6a2395513..b3a08da618e 100644 --- a/tests/native-benchmarks/build.gradle.kts +++ b/tests/native-benchmarks/build.gradle.kts @@ -15,16 +15,16 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.normalizedcache")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) - implementation(golatac.lib("apollo.mockserver")) - implementation(golatac.lib("apollo.mpputils")) + implementation(libs.apollo.testingsupport) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.mpputils) } } } diff --git a/tests/no-query-document/build.gradle.kts b/tests/no-query-document/build.gradle.kts index 6a7e6d75fc2..bceecb7b8b1 100644 --- a/tests/no-query-document/build.gradle.kts +++ b/tests/no-query-document/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.mockserver")) - implementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/no-runtime/build.gradle.kts b/tests/no-runtime/build.gradle.kts index 24edcf31417..f1cf85d9ffa 100644 --- a/tests/no-runtime/build.gradle.kts +++ b/tests/no-runtime/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.api")) + implementation(libs.apollo.api) implementation(project(":sample-server")) - implementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) - testImplementation(golatac.lib("okhttp")) + implementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) + testImplementation(libs.okhttp) } apollo { diff --git a/tests/normalization-tests/build.gradle.kts b/tests/normalization-tests/build.gradle.kts index 5cbbdc593ac..b2dbcefd037 100644 --- a/tests/normalization-tests/build.gradle.kts +++ b/tests/normalization-tests/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - 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")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/optimistic-data/build.gradle.kts b/tests/optimistic-data/build.gradle.kts index 30efd71321f..dad2534dc66 100644 --- a/tests/optimistic-data/build.gradle.kts +++ b/tests/optimistic-data/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.normalizedcache")) - testImplementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("turbine")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) + testImplementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) + testImplementation(libs.turbine) } apollo { diff --git a/tests/optional-variables/build.gradle.kts b/tests/optional-variables/build.gradle.kts index 9dcef3c8e40..cf5c84c5923 100644 --- a/tests/optional-variables/build.gradle.kts +++ b/tests/optional-variables/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/outofbounds/build.gradle.kts b/tests/outofbounds/build.gradle.kts index 8ce12fd4cae..cf8a9a1a707 100644 --- a/tests/outofbounds/build.gradle.kts +++ b/tests/outofbounds/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/pagination/build.gradle.kts b/tests/pagination/build.gradle.kts index 4363cdf4961..c972d1c514b 100644 --- a/tests/pagination/build.gradle.kts +++ b/tests/pagination/build.gradle.kts @@ -14,16 +14,16 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("atomicfu")) - implementation(golatac.lib("apollo.testingsupport")) - implementation(golatac.lib("apollo.normalizedcache.incubating")) - implementation(golatac.lib("apollo.normalizedcache.sqlite.incubating")) + implementation(libs.atomicfu) + implementation(libs.apollo.testingsupport) + implementation(libs.apollo.normalizedcache.incubating) + implementation(libs.apollo.normalizedcache.sqlite.incubating) } } } diff --git a/tests/runtime/build.gradle.kts b/tests/runtime/build.gradle.kts index cb2f8a926ab..e4ccddec095 100644 --- a/tests/runtime/build.gradle.kts +++ b/tests/runtime/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) implementation(project(":sample-server")) - implementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) - testImplementation(golatac.lib("okhttp")) + implementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) + testImplementation(libs.okhttp) } apollo { diff --git a/tests/rxjava/build.gradle.kts b/tests/rxjava/build.gradle.kts index 39a28e433a5..2d01084a2ed 100644 --- a/tests/rxjava/build.gradle.kts +++ b/tests/rxjava/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - 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")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) + implementation(libs.apollo.mockserver) + implementation(libs.apollo.rx2) + testImplementation(libs.kotlin.test.junit) } apollo { diff --git a/tests/sample-server/build.gradle.kts b/tests/sample-server/build.gradle.kts index 4de27d2c73f..a8897eab23b 100644 --- a/tests/sample-server/build.gradle.kts +++ b/tests/sample-server/build.gradle.kts @@ -6,15 +6,15 @@ plugins { } dependencies { - implementation(golatac.lib("graphqlkotlin")) - implementation(golatac.lib("kotlin.reflect")) { + implementation(libs.graphqlkotlin) + implementation(libs.kotlin.reflect) { because("graphqlKotlin pull kotlin-reflect and that triggers a warning like" + "Runtime JAR files in the classpath should have the same version.") } - implementation(golatac.lib("kotlinx.coroutines.reactor")) { + implementation(libs.kotlinx.coroutines.reactor) { because("reactor must have the same version as the coroutines version") } - compileOnly(golatac.lib("apollo.annotations")) { + compileOnly(libs.apollo.annotations) { because(""" We unconditionally opt-in ApolloExperimental in all the tests and we need the symbol in the classpath to prevent a warning diff --git a/tests/scalar-adapters/build.gradle.kts b/tests/scalar-adapters/build.gradle.kts index bd18ba16bdb..50b23a6ba2a 100644 --- a/tests/scalar-adapters/build.gradle.kts +++ b/tests/scalar-adapters/build.gradle.kts @@ -5,10 +5,10 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.adapters")) - testImplementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.adapters) + testImplementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) } apollo { diff --git a/tests/schema-changes/build.gradle.kts b/tests/schema-changes/build.gradle.kts index 832f980a7e9..495af3b1d05 100644 --- a/tests/schema-changes/build.gradle.kts +++ b/tests/schema-changes/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - implementation(golatac.lib("apollo.normalizedcache")) - testImplementation(golatac.lib("apollo.testingsupport")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("turbine")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.normalizedcache) + testImplementation(libs.apollo.testingsupport) + testImplementation(libs.kotlin.test) + testImplementation(libs.turbine) } apollo { diff --git a/tests/settings.gradle.kts b/tests/settings.gradle.kts index 4012546716b..383ea4714cd 100644 --- a/tests/settings.gradle.kts +++ b/tests/settings.gradle.kts @@ -28,8 +28,13 @@ includeBuild("../") { name = "apollo-kotlin" } - - +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libraries.toml")) + } + } +} apply(from = "./gradle/repositories.gradle.kts") apply(from = "./gradle/ge.gradle") diff --git a/tests/sqlite/build.gradle.kts b/tests/sqlite/build.gradle.kts index 9c78d7c5dd0..dec10fd4343 100644 --- a/tests/sqlite/build.gradle.kts +++ b/tests/sqlite/build.gradle.kts @@ -14,15 +14,15 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) - implementation(golatac.lib("apollo.normalizedcache.incubating")) - implementation(golatac.lib("apollo.normalizedcache.sqlite.incubating")) + implementation(libs.apollo.testingsupport) + implementation(libs.apollo.normalizedcache.incubating) + implementation(libs.apollo.normalizedcache.sqlite.incubating) } } } diff --git a/tests/termination/build.gradle.kts b/tests/termination/build.gradle.kts index a48b0c5809a..8354206ef38 100644 --- a/tests/termination/build.gradle.kts +++ b/tests/termination/build.gradle.kts @@ -6,9 +6,9 @@ plugins { } dependencies { - implementation(golatac.lib("apollo.runtime")) - testImplementation(golatac.lib("kotlin.test")) - testImplementation(golatac.lib("junit")) + implementation(libs.apollo.runtime) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) } apollo { diff --git a/tests/test-network-transport/build.gradle.kts b/tests/test-network-transport/build.gradle.kts index 01b9a8cbbc0..ab8ddd650be 100644 --- a/tests/test-network-transport/build.gradle.kts +++ b/tests/test-network-transport/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - 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")) + implementation(libs.apollo.runtime) + implementation(libs.apollo.mockserver) + testImplementation(libs.kotlin.test) + testImplementation(libs.junit) + testImplementation(libs.turbine) + testImplementation(libs.apollo.testingsupport) } apollo { diff --git a/tests/websockets/build.gradle.kts b/tests/websockets/build.gradle.kts index 0e45957299c..fba61116a78 100644 --- a/tests/websockets/build.gradle.kts +++ b/tests/websockets/build.gradle.kts @@ -12,15 +12,15 @@ kotlin { sourceSets { findByName("commonMain")?.apply { dependencies { - implementation(golatac.lib("apollo.runtime")) + implementation(libs.apollo.runtime) } } findByName("commonTest")?.apply { dependencies { - implementation(golatac.lib("apollo.testingsupport")) - implementation(golatac.lib("apollo.normalizedcache")) - implementation(golatac.lib("turbine")) + implementation(libs.apollo.testingsupport) + implementation(libs.apollo.normalizedcache) + implementation(libs.turbine) } }