diff --git a/docs/source/advanced/apollo-ast.mdx b/docs/source/advanced/apollo-ast.mdx index 07228d65183..0e8ac10c9c2 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.apollo:apollo-ast:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-ast:4.0.0-rc.2") } ``` diff --git a/docs/source/advanced/compiler-plugins.mdx b/docs/source/advanced/compiler-plugins.mdx index bdb0e3856de..49f149f1835 100644 --- a/docs/source/advanced/compiler-plugins.mdx +++ b/docs/source/advanced/compiler-plugins.mdx @@ -33,7 +33,7 @@ plugins { dependencies { // Add apollo-compiler as a dependency - implementation("com.apollographql.apollo:apollo-compiler:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-compiler:4.0.0-rc.2") } ``` diff --git a/docs/source/advanced/no-runtime.mdx b/docs/source/advanced/no-runtime.mdx index 782e788925c..380027f75a9 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.apollo:apollo-runtime` dependency and replace it with: ```kotlin title="build.gradle" -implementation("com.apollographql.apollo:apollo-api:4.0.0-rc.1") +implementation("com.apollographql.apollo:apollo-api:4.0.0-rc.2") ``` ## Composing an HTTP request body diff --git a/docs/source/caching/http-cache.mdx b/docs/source/caching/http-cache.mdx index a54150715e2..475995293ed 100644 --- a/docs/source/caching/http-cache.mdx +++ b/docs/source/caching/http-cache.mdx @@ -17,7 +17,7 @@ To enable HTTP cache support, add the dependency to your project's `build.gradle ```kotlin title="build.gradle[.kts]" dependencies { - implementation("com.apollographql.apollo:apollo-http-cache:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-http-cache:4.0.0-rc.2") } ``` diff --git a/docs/source/caching/normalized-cache.mdx b/docs/source/caching/normalized-cache.mdx index 03ad6db843e..2e9eb8e4a31 100644 --- a/docs/source/caching/normalized-cache.mdx +++ b/docs/source/caching/normalized-cache.mdx @@ -74,7 +74,7 @@ Apollo Kotlin's `MemoryCache` is a normalized, in-memory cache for storing objec ```kotlin title="build.gradle[.kts]" dependencies { - implementation("com.apollographql.apollo:apollo-normalized-cache:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-normalized-cache:4.0.0-rc.2") } ``` @@ -110,7 +110,7 @@ To enable SQLite cache support, add the `apollo-normalized-cache-sqlite` depende ```kotlin title="build.gradle.kts" dependencies { - implementation("com.apollographql.apollo:apollo-normalized-cache-sqlite:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-normalized-cache-sqlite:4.0.0-rc.2") } ``` diff --git a/docs/source/index.md b/docs/source/index.md index d4dd01c6ed2..2c5c58104f3 100644 --- a/docs/source/index.md +++ b/docs/source/index.md @@ -39,7 +39,7 @@ Add the plugin to your `build.gradle.kts`: ```kotlin plugins { - id("com.apollographql.apollo") version "4.0.0-rc.1" + id("com.apollographql.apollo") version "4.0.0-rc.2" } ``` @@ -47,7 +47,7 @@ Add the runtime dependency: ```kotlin dependencies { - implementation("com.apollographql.apollo:apollo-runtime:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-runtime:4.0.0-rc.2") } ``` @@ -159,7 +159,7 @@ Installation instructions and more information can be found [here](testing/andro ## Releases -The latest version is `4.0.0-rc.1`. +The latest version is `4.0.0-rc.2`. Check the [changelog](https://github.com/apollographql/apollo-kotlin/releases) for the release history. @@ -167,7 +167,7 @@ Releases are hosted on [Maven Central](https://repo1.maven.org/maven2/com/apollo ```kotlin plugins { - id("com.apollographql.apollo") version "4.0.0-rc.1" + id("com.apollographql.apollo") version "4.0.0-rc.2" } repositories { @@ -175,13 +175,13 @@ repositories { } dependencies { - implementation("com.apollographql.apollo:apollo-runtime:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-runtime:4.0.0-rc.2") // Optional: if you want to use the normalized cache - implementation("com.apollographql.apollo:apollo-normalized-cache-sqlite:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-normalized-cache-sqlite:4.0.0-rc.2") // 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.apollo:apollo-api:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-api:4.0.0-rc.2") } ``` @@ -212,7 +212,7 @@ pluginManagement { } ``` -And then use the `4.0.0-rc.2-SNAPSHOT` version for the plugin and libraries. +And then use the `4.0.0-rc.3-SNAPSHOT` version for the plugin and libraries. These snapshots are updated on each push to `main`. diff --git a/docs/source/testing/apollo-debug-server.mdx b/docs/source/testing/apollo-debug-server.mdx index 446541b41fb..d01c3863504 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.apollo:apollo-debug-server:4.0.0-rc.1") + debugImplementation("com.apollographql.apollo:apollo-debug-server:4.0.0-rc.2") } ``` diff --git a/docs/source/testing/mocking-graphql-responses.mdx b/docs/source/testing/mocking-graphql-responses.mdx index 78708530db6..61e7ab362a1 100644 --- a/docs/source/testing/mocking-graphql-responses.mdx +++ b/docs/source/testing/mocking-graphql-responses.mdx @@ -16,7 +16,7 @@ Add the dependency to your project's `build.gradle` file: ```kotlin title="build.gradle[.kts]" dependencies { - testImplementation("com.apollographql.apollo:apollo-testing-support:4.0.0-rc.1") + testImplementation("com.apollographql.apollo:apollo-testing-support:4.0.0-rc.2") } ``` diff --git a/docs/source/tutorial/01-configure-project.mdx b/docs/source/tutorial/01-configure-project.mdx index b8ea8c2c624..689f7816900 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-rc.1` 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-rc.2` 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.apollo") version "4.0.0-rc.1" + id("com.apollographql.apollo") version "4.0.0-rc.2" } ``` @@ -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.apollo:apollo-runtime:4.0.0-rc.1") + implementation("com.apollographql.apollo:apollo-runtime:4.0.0-rc.2") } ``` diff --git a/gradle.properties b/gradle.properties index 6ec506957fe..43638715afa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Publishing defaults, could ultimately be moved to build scripts GROUP=com.apollographql.apollo -VERSION_NAME=4.0.0-rc.2-SNAPSHOT +VERSION_NAME=4.0.0-rc.2 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 887b6946bb9..ff0094d2777 100644 --- a/gradle/libraries.toml +++ b/gradle/libraries.toml @@ -14,7 +14,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-rc.2-SNAPSHOT" +apollo = "4.0.0-rc.2" apollo-execution = "0.0.2" apollo-normalizedcache-incubating-snapshot = "0.0.3-SNAPSHOT" # Used by the apollo-tooling project which uses a published version of Apollo 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 425644196de..b21ba0dc397 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 @@ -34,7 +34,7 @@ import com.intellij.openapi.project.Project */ class ApolloV3ToV4MigrationProcessor(project: Project) : ApolloMigrationRefactoringProcessor(project) { companion object { - const val apollo4LatestVersion = "4.0.0-rc.1" + const val apollo4LatestVersion = "4.0.0-rc.2" } override val refactoringName = ApolloBundle.message("ApolloV3ToV4MigrationProcessor.title") 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 d0241d62fac..33e30cc95ae 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,19 +1,19 @@ [versions] # gradlePlugin versions androidBuildTools = "7.2.1" -apollo = "4.0.0-rc.1" +apollo = "4.0.0-rc.2" [libraries] accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" } -apollo-runtime-short = "com.apollographql.apollo:apollo-runtime:4.0.0-rc.1" -apollo-runtime-medium-version = { module = "com.apollographql.apollo:apollo-runtime", version = "4.0.0-rc.1" } +apollo-runtime-short = "com.apollographql.apollo:apollo-runtime:4.0.0-rc.2" +apollo-runtime-medium-version = { module = "com.apollographql.apollo:apollo-runtime", version = "4.0.0-rc.2" } apollo-runtime-medium-ref = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" } -apollo-runtime-long-version = { group = "com.apollographql.apollo", name = "apollo-runtime", version = "4.0.0-rc.1" } +apollo-runtime-long-version = { group = "com.apollographql.apollo", name = "apollo-runtime", version = "4.0.0-rc.2" } apollo-runtime-long-ref = { group = "com.apollographql.apollo", name = "apollo-runtime", version.ref = "apollo" } [plugins] -apollo-shortNotation = "com.apollographql.apollo:4.0.0-rc.1" +apollo-shortNotation = "com.apollographql.apollo:4.0.0-rc.2" apollo-longNotation = { id = "com.apollographql.apollo", version.ref = "apollo" } -apollo-referenceNotation = { id = "com.apollographql.apollo", version = "4.0.0-rc.1" } +apollo-referenceNotation = { id = "com.apollographql.apollo", version = "4.0.0-rc.2" } apollo-shortNotationNoVersion = "com.apollographql.apollo" apollo-longNotationNoVersion = { id = "com.apollographql.apollo" } 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 b5ef9596599..36656d9b9f4 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.apollo") - id("com.apollographql.apollo") version "4.0.0-rc.1" - id("com.apollographql.apollo") version "4.0.0-rc.1" apply false - // TODO: Update version to 4.0.0-rc.1 + id("com.apollographql.apollo") version "4.0.0-rc.2" + id("com.apollographql.apollo") version "4.0.0-rc.2" apply false + // TODO: Update version to 4.0.0-rc.2 id("com.apollographql.apollo") version someClass.someConstant - // TODO: Update version to 4.0.0-rc.1 + // TODO: Update version to 4.0.0-rc.2 id("com.apollographql.apollo") version "${someClass.someConstant}" - id("com.apollographql.apollo") version "4.0.0-rc.1" - id("com.apollographql.apollo") version "4.0.0-rc.1" apply false - // TODO: Update version to 4.0.0-rc.1 + id("com.apollographql.apollo") version "4.0.0-rc.2" + id("com.apollographql.apollo") version "4.0.0-rc.2" apply false + // TODO: Update version to 4.0.0-rc.2 id("com.apollographql.apollo") version someClass.someConstant - // TODO: Update version to 4.0.0-rc.1 + // TODO: Update version to 4.0.0-rc.2 id("com.apollographql.apollo") version "${someClass.someConstant}" }