From e00841c5621657e065834d1eb1b44ad3ce38eca6 Mon Sep 17 00:00:00 2001 From: Benoit Lubek Date: Tue, 12 Dec 2023 12:11:36 +0100 Subject: [PATCH] release 4.0.0-beta.4 (#5463) --- README.md | 14 +++++++------- docs/source/advanced/apollo-ast.mdx | 2 +- docs/source/advanced/java.mdx | 2 +- docs/source/advanced/no-runtime.mdx | 2 +- docs/source/caching/http-cache.mdx | 2 +- docs/source/caching/normalized-cache.mdx | 4 ++-- docs/source/essentials/custom-scalars.mdx | 2 +- docs/source/index.md | 14 +++++++------- docs/source/testing/apollo-debug-server.mdx | 2 +- .../source/testing/mocking-graphql-responses.mdx | 2 +- docs/source/testing/mocking-http-responses.mdx | 2 +- docs/source/testing/ui-tests.mdx | 2 +- docs/source/tutorial/01-configure-project.mdx | 6 +++--- gradle.properties | 2 +- gradle/libraries.toml | 2 +- .../v3tov4/ApolloV3ToV4MigrationProcessor.kt | 2 +- .../inspection/Apollo4Available.gradle.kts | 8 ++++---- ...denciesInLibsVersionsToml_after.versions.toml | 12 ++++++------ ...GradlePluginInBuildGradleKts_after.gradle.kts | 16 ++++++++-------- 19 files changed, 49 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 5e88e1c8de9..63ccfdbd52d 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Add the plugin to your `build.gradle.kts`: ```kotlin plugins { - id("com.apollographql.apollo3") version "4.0.0-beta.3" + id("com.apollographql.apollo3") version "4.0.0-beta.4" } ``` @@ -92,7 +92,7 @@ Add the runtime dependency: ```kotlin dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4") } ``` @@ -183,7 +183,7 @@ Releases are hosted on [Maven Central](https://repo1.maven.org/maven2/com/apollo ```kotlin plugins { - id("com.apollographql.apollo3") version "4.0.0-beta.3" + id("com.apollographql.apollo3") version "4.0.0-beta.4" } repositories { @@ -191,13 +191,13 @@ repositories { } dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4") // optional: if you want to use the normalized cache - implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.4") // optional: if you just want the generated models and parsers and write your own HTTP code/cache code, you can remove apollo-runtime // and use apollo-api instead - implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.4") } ``` @@ -228,7 +228,7 @@ pluginManagement { } ``` -And then use the `4.0.0-beta.4-SNAPSHOT` version for the plugin and libraries. +And then use the `4.0.0-beta.5-SNAPSHOT` version for the plugin and libraries. ### Android Studio / IntelliJ plugin diff --git a/docs/source/advanced/apollo-ast.mdx b/docs/source/advanced/apollo-ast.mdx index 054c0ee7a25..1c7c2f63827 100644 --- a/docs/source/advanced/apollo-ast.mdx +++ b/docs/source/advanced/apollo-ast.mdx @@ -21,7 +21,7 @@ Add the `apollo-ast` dependency to your project: dependencies { // ... - implementation("com.apollographql.apollo3:apollo-ast:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-ast:4.0.0-beta.4") } ``` diff --git a/docs/source/advanced/java.mdx b/docs/source/advanced/java.mdx index f4346810be9..ff933572614 100644 --- a/docs/source/advanced/java.mdx +++ b/docs/source/advanced/java.mdx @@ -26,7 +26,7 @@ dependencies { // ... // Use apollo-runtime-java instead of apollo-runtime - implementation("com.apollographql.apollo3:apollo-runtime-java:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime-java:4.0.0-beta.4") } ``` diff --git a/docs/source/advanced/no-runtime.mdx b/docs/source/advanced/no-runtime.mdx index 5622684f9a7..c03829c88af 100644 --- a/docs/source/advanced/no-runtime.mdx +++ b/docs/source/advanced/no-runtime.mdx @@ -7,7 +7,7 @@ title: Using the models without apollo-runtime For this, remove the `com.apollographql.apollo3:apollo-runtime` dependency and replace it with: ```kotlin title="build.gradle" -implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.3") +implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.4") ``` ## Composing an HTTP request body diff --git a/docs/source/caching/http-cache.mdx b/docs/source/caching/http-cache.mdx index a9ca58432d9..b096f216fe2 100644 --- a/docs/source/caching/http-cache.mdx +++ b/docs/source/caching/http-cache.mdx @@ -13,7 +13,7 @@ To enable HTTP cache support, add the dependency to your project's `build.gradle ```kotlin title="build.gradle[.kts]" dependencies { - implementation("com.apollographql.apollo3:apollo-http-cache:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-http-cache:4.0.0-beta.4") } ``` diff --git a/docs/source/caching/normalized-cache.mdx b/docs/source/caching/normalized-cache.mdx index 39635edd055..e3f4eb65931 100644 --- a/docs/source/caching/normalized-cache.mdx +++ b/docs/source/caching/normalized-cache.mdx @@ -70,7 +70,7 @@ Apollo Kotlin's `MemoryCache` is a normalized, in-memory cache for storing objec ```kotlin title="build.gradle[.kts]" dependencies { - implementation("com.apollographql.apollo3:apollo-normalized-cache:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-normalized-cache:4.0.0-beta.4") } ``` @@ -106,7 +106,7 @@ To enable SQLite cache support, add the `apollo-normalized-cache-sqlite` depende ```kotlin title="build.gradle.kts" dependencies { - implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.4") } ``` diff --git a/docs/source/essentials/custom-scalars.mdx b/docs/source/essentials/custom-scalars.mdx index 5bd4d80b828..aa9e0d910b6 100644 --- a/docs/source/essentials/custom-scalars.mdx +++ b/docs/source/essentials/custom-scalars.mdx @@ -150,7 +150,7 @@ For example, to use `DateAdapter`, configure your Gradle scripts like so: ```kotlin title="build.gradle[.kts]" dependencies { - implementation("com.apollographql.apollo3:apollo-adapters:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-adapters:4.0.0-beta.4") } apollo { diff --git a/docs/source/index.md b/docs/source/index.md index 55b7624e1cc..e2c7962a5f5 100644 --- a/docs/source/index.md +++ b/docs/source/index.md @@ -68,7 +68,7 @@ Add the plugin to your `build.gradle.kts`: ```kotlin plugins { - id("com.apollographql.apollo3") version "4.0.0-beta.3" + id("com.apollographql.apollo3") version "4.0.0-beta.4" } ``` @@ -76,7 +76,7 @@ Add the runtime dependency: ```kotlin dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4") } ``` @@ -168,7 +168,7 @@ Releases are hosted on [Maven Central](https://repo1.maven.org/maven2/com/apollo ```kotlin plugins { - id("com.apollographql.apollo3") version "4.0.0-beta.3" + id("com.apollographql.apollo3") version "4.0.0-beta.4" } repositories { @@ -176,13 +176,13 @@ repositories { } dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4") // optional: if you want to use the normalized cache - implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.4") // optional: if you just want the generated models and parsers and write your own HTTP code/cache code, you can remove apollo-runtime // and use apollo-api instead - implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.4") } ``` @@ -212,7 +212,7 @@ pluginManagement { } } ``` -And then use the `4.0.0-beta.4-SNAPSHOT` version for the plugin and libraries. +And then use the `4.0.0-beta.5-SNAPSHOT` version for the plugin and libraries. ### Android Studio / IntelliJ plugin diff --git a/docs/source/testing/apollo-debug-server.mdx b/docs/source/testing/apollo-debug-server.mdx index bb17aab13d1..fb3cda7d1c1 100644 --- a/docs/source/testing/apollo-debug-server.mdx +++ b/docs/source/testing/apollo-debug-server.mdx @@ -17,7 +17,7 @@ dependencies { // ... // For security, add the dependency to your debug builds only - debugImplementation("com.apollographql.apollo3:apollo-debug-server:4.0.0-beta.3") + debugImplementation("com.apollographql.apollo3:apollo-debug-server:4.0.0-beta.4") } ``` diff --git a/docs/source/testing/mocking-graphql-responses.mdx b/docs/source/testing/mocking-graphql-responses.mdx index 44d985705f7..458fbf6ccd0 100644 --- a/docs/source/testing/mocking-graphql-responses.mdx +++ b/docs/source/testing/mocking-graphql-responses.mdx @@ -10,7 +10,7 @@ Add the dependency to your project's `build.gradle` file: ```kotlin title="build.gradle[.kts]" dependencies { - testImplementation("com.apollographql.apollo3:apollo-testing-support:4.0.0-beta.3") + testImplementation("com.apollographql.apollo3:apollo-testing-support:4.0.0-beta.4") } ``` diff --git a/docs/source/testing/mocking-http-responses.mdx b/docs/source/testing/mocking-http-responses.mdx index 29de42c1cdd..c4301a5db57 100644 --- a/docs/source/testing/mocking-http-responses.mdx +++ b/docs/source/testing/mocking-http-responses.mdx @@ -12,7 +12,7 @@ Add the dependency to your project's `build.gradle` file: ```kotlin title="build.gradle[.kts]" dependencies { - testImplementation("com.apollographql.apollo3:apollo-mockserver:4.0.0-beta.3") + testImplementation("com.apollographql.apollo3:apollo-mockserver:4.0.0-beta.4") } ``` diff --git a/docs/source/testing/ui-tests.mdx b/docs/source/testing/ui-tests.mdx index 0200d98f867..c44476a9015 100644 --- a/docs/source/testing/ui-tests.mdx +++ b/docs/source/testing/ui-tests.mdx @@ -7,7 +7,7 @@ Apollo Kotlin provides a built-in [`IdlingResource`](https://developer.android.c Add the `apollo-idling-resource` dependency: ```kotlin title="build.gradle[.kts]" -implementation("com.apollographql.apollo3:apollo-idling-resource:4.0.0-beta.3") +implementation("com.apollographql.apollo3:apollo-idling-resource:4.0.0-beta.4") ``` > If you have multiple `ApolloClient`s, you need to create and register a different `ApolloIdlingResource` with a different name for each. Registering multiple `IdlingResource`s with the same name will cause your test suite to crash. diff --git a/docs/source/tutorial/01-configure-project.mdx b/docs/source/tutorial/01-configure-project.mdx index ce4048819f9..301efae93d5 100644 --- a/docs/source/tutorial/01-configure-project.mdx +++ b/docs/source/tutorial/01-configure-project.mdx @@ -35,7 +35,7 @@ Now let's add Apollo Kotlin to the project. You can find the latest version of Apollo Kotlin from the [GitHub releases page](https://github.com/apollographql/apollo-kotlin/releases). It is also displayed at the top of the [apollo-kotlin repo](https://github.com/apollographql/apollo-kotlin/). -This tutorial uses `4.0.0-beta.3` because it is the latest version at the time of writing. Feel free to use a more recent version if one is available. +This tutorial uses `4.0.0-beta.4` because it is the latest version at the time of writing. Feel free to use a more recent version if one is available. ## Apply the plugin @@ -45,7 +45,7 @@ Apply the Apollo plugin in `app/build.gradle.kts`. There are two `build.gradle.k plugins { id("com.android.application") // ... - id("com.apollographql.apollo3") version "4.0.0-beta.3" + id("com.apollographql.apollo3") version "4.0.0-beta.4" } ``` @@ -72,7 +72,7 @@ Now add `apollo-runtime` to the list of dependencies. This is the code that exec ```kotlin title="app/build.gradle.kts" dependencies { // ... - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4") } ``` diff --git a/gradle.properties b/gradle.properties index 6949d08a8ac..85a4be13354 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Publishing defaults, could ultimately be moved to build scripts GROUP=com.apollographql.apollo3 -VERSION_NAME=4.0.0-beta.4-SNAPSHOT +VERSION_NAME=4.0.0-beta.4 POM_URL=https://github.com/apollographql/apollo-kotlin/ POM_SCM_URL=https://github.com/apollographql/apollo-kotlin/ diff --git a/gradle/libraries.toml b/gradle/libraries.toml index 11c01cbcad4..8eeaeb289e5 100644 --- a/gradle/libraries.toml +++ b/gradle/libraries.toml @@ -13,7 +13,7 @@ android-sdkversion-benchmark-min = "24" android-sdkversion-target = "30" androidx-sqlite = "2.3.1" # This is used by the gradle integration tests to get the artifacts locally -apollo = "4.0.0-beta.4-SNAPSHOT" +apollo = "4.0.0-beta.4" # Used by the apollo-tooling project which uses a published version of Apollo apollo-published = "4.0.0-beta.2" cache = "2.0.2" diff --git a/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/v3tov4/ApolloV3ToV4MigrationProcessor.kt b/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/v3tov4/ApolloV3ToV4MigrationProcessor.kt index 5c66e67cc6d..26d8c652f0b 100644 --- a/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/v3tov4/ApolloV3ToV4MigrationProcessor.kt +++ b/intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/v3tov4/ApolloV3ToV4MigrationProcessor.kt @@ -24,7 +24,7 @@ import com.apollographql.ijplugin.refactoring.migration.v3tov4.item.UpdateThrowA import com.apollographql.ijplugin.refactoring.migration.v3tov4.item.UpdateWebSocketReconnectWhen import com.intellij.openapi.project.Project -private const val apollo4LatestVersion = "4.0.0-beta.3" +private const val apollo4LatestVersion = "4.0.0-beta.4" /** * Migrations of Apollo Kotlin v3 to v4. diff --git a/intellij-plugin/src/test/testData/inspection/Apollo4Available.gradle.kts b/intellij-plugin/src/test/testData/inspection/Apollo4Available.gradle.kts index dd905d97c53..946b5183e2c 100644 --- a/intellij-plugin/src/test/testData/inspection/Apollo4Available.gradle.kts +++ b/intellij-plugin/src/test/testData/inspection/Apollo4Available.gradle.kts @@ -2,12 +2,12 @@ plugins { kotlin("jvm") version "1.8.10" val myVar = "" - id("com.apollographql.apollo3") version "4.0.0-beta.3" + id("com.apollographql.apollo3") version "4.0.0-beta.4" id("com.apollographql.apollo3") version "3.8.2" // should report id("com.apollographql.apollo3") version myVar id("com.apollographql.apollo3") version "3${"8.2"}" - id("com.apollographql.apollo3").version("4.0.0-beta.3") + id("com.apollographql.apollo3").version("4.0.0-beta.4") id("com.apollographql.apollo3").version("3.8.2") // should report id("com.apollographql.apollo3").version(myVar) id("com.apollographql.apollo3").version("3${"8.2"}") @@ -20,14 +20,14 @@ plugins { dependencies { val myVar = "" implementation("com.apollographql.apollo3", "apollo-runtime") - implementation("com.apollographql.apollo3", "apollo-runtime", "4.0.0-beta.3") + implementation("com.apollographql.apollo3", "apollo-runtime", "4.0.0-beta.4") implementation("com.apollographql.apollo3", "apollo-runtime", "3.8.2") // should report implementation("com.apollographql.apollo3", "apollo-runtime", myVar) implementation("com.apollographql.apollo3", "apollo-runtime", "3${"8.2"}") implementation("some.other.group", "some.artifact", "3.8.2") implementation("com.apollographql.apollo3:apollo-runtime") - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4") implementation("com.apollographql.apollo3:apollo-runtime:3.8.2") // should report implementation("com.apollographql.apollo3:apollo-runtime:${myVar}") implementation("com.apollographql.apollo3:apollo-runtime:3${"8.2"}") diff --git a/intellij-plugin/src/test/testData/migration/v3-to-v4/updateGradleDependenciesInLibsVersionsToml_after.versions.toml b/intellij-plugin/src/test/testData/migration/v3-to-v4/updateGradleDependenciesInLibsVersionsToml_after.versions.toml index 81cbbc884dd..21ef00b1859 100644 --- a/intellij-plugin/src/test/testData/migration/v3-to-v4/updateGradleDependenciesInLibsVersionsToml_after.versions.toml +++ b/intellij-plugin/src/test/testData/migration/v3-to-v4/updateGradleDependenciesInLibsVersionsToml_after.versions.toml @@ -1,17 +1,17 @@ [versions] # gradlePlugin versions androidBuildTools = "7.2.1" -apollo = "4.0.0-beta.3" +apollo = "4.0.0-beta.4" [libraries] accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" } -apollo-runtime-short = "com.apollographql.apollo3:apollo-runtime:4.0.0-beta.3" -apollo-runtime-medium-version = { module = "com.apollographql.apollo3:apollo-runtime", version = "4.0.0-beta.3" } +apollo-runtime-short = "com.apollographql.apollo3:apollo-runtime:4.0.0-beta.4" +apollo-runtime-medium-version = { module = "com.apollographql.apollo3:apollo-runtime", version = "4.0.0-beta.4" } apollo-runtime-medium-ref = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "apollo" } -apollo-runtime-long-version = { group = "com.apollographql.apollo3", name = "apollo-runtime", version = "4.0.0-beta.3" } +apollo-runtime-long-version = { group = "com.apollographql.apollo3", name = "apollo-runtime", version = "4.0.0-beta.4" } apollo-runtime-long-ref = { group = "com.apollographql.apollo3", name = "apollo-runtime", version.ref = "apollo" } [plugins] -apollo-shortNotation = "com.apollographql.apollo3:4.0.0-beta.3" +apollo-shortNotation = "com.apollographql.apollo3:4.0.0-beta.4" apollo-longNotation = { id = "com.apollographql.apollo3", version.ref = "apollo" } -apollo-referenceNotation = { id = "com.apollographql.apollo3", version = "4.0.0-beta.3" } +apollo-referenceNotation = { id = "com.apollographql.apollo3", version = "4.0.0-beta.4" } diff --git a/intellij-plugin/src/test/testData/migration/v3-to-v4/upgradeGradlePluginInBuildGradleKts_after.gradle.kts b/intellij-plugin/src/test/testData/migration/v3-to-v4/upgradeGradlePluginInBuildGradleKts_after.gradle.kts index 6e118ba1b1e..1ebc81db990 100644 --- a/intellij-plugin/src/test/testData/migration/v3-to-v4/upgradeGradlePluginInBuildGradleKts_after.gradle.kts +++ b/intellij-plugin/src/test/testData/migration/v3-to-v4/upgradeGradlePluginInBuildGradleKts_after.gradle.kts @@ -2,16 +2,16 @@ plugins { java kotlin("jvm") version "1.6.10" id("com.apollographql.apollo3") - id("com.apollographql.apollo3") version "4.0.0-beta.3" - id("com.apollographql.apollo3") version "4.0.0-beta.3" apply false - // TODO: Update version to 4.0.0-beta.3 + id("com.apollographql.apollo3") version "4.0.0-beta.4" + id("com.apollographql.apollo3") version "4.0.0-beta.4" apply false + // TODO: Update version to 4.0.0-beta.4 id("com.apollographql.apollo3") version someClass.someConstant - // TODO: Update version to 4.0.0-beta.3 + // TODO: Update version to 4.0.0-beta.4 id("com.apollographql.apollo3") version "${someClass.someConstant}" - id("com.apollographql.apollo3") version "4.0.0-beta.3" - id("com.apollographql.apollo3") version "4.0.0-beta.3" apply false - // TODO: Update version to 4.0.0-beta.3 + id("com.apollographql.apollo3") version "4.0.0-beta.4" + id("com.apollographql.apollo3") version "4.0.0-beta.4" apply false + // TODO: Update version to 4.0.0-beta.4 id("com.apollographql.apollo3") version someClass.someConstant - // TODO: Update version to 4.0.0-beta.3 + // TODO: Update version to 4.0.0-beta.4 id("com.apollographql.apollo3") version "${someClass.someConstant}" }