diff --git a/README.md b/README.md index c420e2b0bf6..41360811785 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Add the plugin to your `build.gradle.kts`: ```kotlin plugins { - id("com.apollographql.apollo3") version "4.0.0-beta.5" + id("com.apollographql.apollo3") version "4.0.0-beta.6" } ``` @@ -96,7 +96,7 @@ Add the runtime dependency: ```kotlin dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.5") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6") } ``` @@ -188,7 +188,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.5" + id("com.apollographql.apollo3") version "4.0.0-beta.6" } repositories { @@ -196,13 +196,13 @@ repositories { } dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.5") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6") // optional: if you want to use the normalized cache - implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.5") + implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.6") // 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.5") + implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.6") } ``` @@ -233,7 +233,7 @@ pluginManagement { } ``` -And then use the `4.0.0-beta.6-SNAPSHOT` version for the plugin and libraries. +And then use the `4.0.0-beta.7-SNAPSHOT` version for the plugin and libraries. These snapshots are updated on each push to `main`. diff --git a/docs/source/advanced/apollo-ast.mdx b/docs/source/advanced/apollo-ast.mdx index 96c8aa211ab..81f69cd0053 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.5") + implementation("com.apollographql.apollo3:apollo-ast:4.0.0-beta.6") } ``` diff --git a/docs/source/advanced/compiler-plugins.mdx b/docs/source/advanced/compiler-plugins.mdx index ce68930aafc..2b93672fe5f 100644 --- a/docs/source/advanced/compiler-plugins.mdx +++ b/docs/source/advanced/compiler-plugins.mdx @@ -27,7 +27,7 @@ plugins { dependencies { // Add apollo-compiler as a dependency - implementation("com.apollographql.apollo3:apollo-compiler:4.0.0-beta.4") + implementation("com.apollographql.apollo3:apollo-compiler:4.0.0-beta.6") } ``` diff --git a/docs/source/advanced/java.mdx b/docs/source/advanced/java.mdx index 0cd6c1e2afd..042a7c40fc8 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.5") + implementation("com.apollographql.apollo3:apollo-runtime-java:4.0.0-beta.6") } ``` diff --git a/docs/source/advanced/no-runtime.mdx b/docs/source/advanced/no-runtime.mdx index 4eef85f21a7..1005cd8364e 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.5") +implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.6") ``` ## Composing an HTTP request body diff --git a/docs/source/caching/http-cache.mdx b/docs/source/caching/http-cache.mdx index 8fdc79a88a1..5aa15e25a9d 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.5") + implementation("com.apollographql.apollo3:apollo-http-cache:4.0.0-beta.6") } ``` diff --git a/docs/source/caching/normalized-cache.mdx b/docs/source/caching/normalized-cache.mdx index 6c806f64ad5..3cd787b9082 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.5") + implementation("com.apollographql.apollo3:apollo-normalized-cache:4.0.0-beta.6") } ``` @@ -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.5") + implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.6") } ``` diff --git a/docs/source/essentials/custom-scalars.mdx b/docs/source/essentials/custom-scalars.mdx index 7a3351cb052..7d1a9babe62 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.5") + implementation("com.apollographql.apollo3:apollo-adapters:4.0.0-beta.6") } apollo { diff --git a/docs/source/index.md b/docs/source/index.md index 26e900742b4..ae0f32e4fe1 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.5" + id("com.apollographql.apollo3") version "4.0.0-beta.6" } ``` @@ -76,7 +76,7 @@ Add the runtime dependency: ```kotlin dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.5") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6") } ``` @@ -169,7 +169,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.5" + id("com.apollographql.apollo3") version "4.0.0-beta.6" } repositories { @@ -177,13 +177,13 @@ repositories { } dependencies { - implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.5") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6") // optional: if you want to use the normalized cache - implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.5") + implementation("com.apollographql.apollo3:apollo-normalized-cache-sqlite:4.0.0-beta.6") // 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.5") + implementation("com.apollographql.apollo3:apollo-api:4.0.0-beta.6") } ``` @@ -213,7 +213,7 @@ pluginManagement { } } ``` -And then use the `4.0.0-beta.6-SNAPSHOT` version for the plugin and libraries. +And then use the `4.0.0-beta.7-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 7a6d3b462b8..6f7d82bda6c 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.5") + debugImplementation("com.apollographql.apollo3:apollo-debug-server:4.0.0-beta.6") } ``` diff --git a/docs/source/testing/mocking-graphql-responses.mdx b/docs/source/testing/mocking-graphql-responses.mdx index f8d3dd095b2..dd66f4f9163 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.5") + testImplementation("com.apollographql.apollo3:apollo-testing-support:4.0.0-beta.6") } ``` diff --git a/docs/source/testing/mocking-http-responses.mdx b/docs/source/testing/mocking-http-responses.mdx index 8d9078185f1..1f28ffa2790 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.5") + testImplementation("com.apollographql.apollo3:apollo-mockserver:4.0.0-beta.6") } ``` diff --git a/docs/source/testing/ui-tests.mdx b/docs/source/testing/ui-tests.mdx index 024575848f0..44d31018737 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.5") +implementation("com.apollographql.apollo3:apollo-idling-resource:4.0.0-beta.6") ``` > 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 9b0cbc398d1..c453462395b 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.5` 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.6` 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.5" + id("com.apollographql.apollo3") version "4.0.0-beta.6" } ``` @@ -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.5") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6") } ``` diff --git a/gradle.properties b/gradle.properties index ff7008cbf66..57229399ed2 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.6-SNAPSHOT +VERSION_NAME=4.0.0-beta.6 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 73561f21571..d18368b5596 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-beta.6-SNAPSHOT" +apollo = "4.0.0-beta.6" # Used by the apollo-tooling project which uses a published version of Apollo apollo-published = "4.0.0-beta.3" atomicfu = "0.23.1" 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 6da4eaeb9dd..ddf1d1d7436 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 @@ -29,7 +29,7 @@ import com.intellij.openapi.project.Project */ class ApolloV3ToV4MigrationProcessor(project: Project) : ApolloMigrationRefactoringProcessor(project) { companion object { - const val apollo4LatestVersion = "4.0.0-beta.5" + const val apollo4LatestVersion = "4.0.0-beta.6" } override val refactoringName = ApolloBundle.message("ApolloV3ToV4MigrationProcessor.title") diff --git a/intellij-plugin/src/test/testData/inspection/Apollo4Available.gradle.kts b/intellij-plugin/src/test/testData/inspection/Apollo4Available.gradle.kts index 279e886dbac..d832b184ab6 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.5" + id("com.apollographql.apollo3") version "4.0.0-beta.6" 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.5") + id("com.apollographql.apollo3").version("4.0.0-beta.6") 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.5") + implementation("com.apollographql.apollo3", "apollo-runtime", "4.0.0-beta.6") 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.5") + implementation("com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6") 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 6dddfdc0e4f..2a936818d4b 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.5" +apollo = "4.0.0-beta.6" [libraries] accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" } -apollo-runtime-short = "com.apollographql.apollo3:apollo-runtime:4.0.0-beta.5" -apollo-runtime-medium-version = { module = "com.apollographql.apollo3:apollo-runtime", version = "4.0.0-beta.5" } +apollo-runtime-short = "com.apollographql.apollo3:apollo-runtime:4.0.0-beta.6" +apollo-runtime-medium-version = { module = "com.apollographql.apollo3:apollo-runtime", version = "4.0.0-beta.6" } 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.5" } +apollo-runtime-long-version = { group = "com.apollographql.apollo3", name = "apollo-runtime", version = "4.0.0-beta.6" } apollo-runtime-long-ref = { group = "com.apollographql.apollo3", name = "apollo-runtime", version.ref = "apollo" } [plugins] -apollo-shortNotation = "com.apollographql.apollo3:4.0.0-beta.5" +apollo-shortNotation = "com.apollographql.apollo3:4.0.0-beta.6" apollo-longNotation = { id = "com.apollographql.apollo3", version.ref = "apollo" } -apollo-referenceNotation = { id = "com.apollographql.apollo3", version = "4.0.0-beta.5" } +apollo-referenceNotation = { id = "com.apollographql.apollo3", version = "4.0.0-beta.6" } 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 25e4a6f919a..ffaf5c43a26 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.5" - id("com.apollographql.apollo3") version "4.0.0-beta.5" apply false - // TODO: Update version to 4.0.0-beta.5 + id("com.apollographql.apollo3") version "4.0.0-beta.6" + id("com.apollographql.apollo3") version "4.0.0-beta.6" apply false + // TODO: Update version to 4.0.0-beta.6 id("com.apollographql.apollo3") version someClass.someConstant - // TODO: Update version to 4.0.0-beta.5 + // TODO: Update version to 4.0.0-beta.6 id("com.apollographql.apollo3") version "${someClass.someConstant}" - id("com.apollographql.apollo3") version "4.0.0-beta.5" - id("com.apollographql.apollo3") version "4.0.0-beta.5" apply false - // TODO: Update version to 4.0.0-beta.5 + id("com.apollographql.apollo3") version "4.0.0-beta.6" + id("com.apollographql.apollo3") version "4.0.0-beta.6" apply false + // TODO: Update version to 4.0.0-beta.6 id("com.apollographql.apollo3") version someClass.someConstant - // TODO: Update version to 4.0.0-beta.5 + // TODO: Update version to 4.0.0-beta.6 id("com.apollographql.apollo3") version "${someClass.someConstant}" }