Skip to content

Commit 81950b5

Browse files
martinbonninBoD
andauthored
Bump version (#6447)
* bump version * Add ApolloVersion.V5 --------- Co-authored-by: BoD <BoD@JRAF.org>
1 parent d9991b4 commit 81950b5

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Publishing defaults, could ultimately be moved to build scripts
22
GROUP=com.apollographql.apollo
3-
VERSION_NAME=4.1.2-SNAPSHOT
3+
VERSION_NAME=5.0.0-SNAPSHOT
44

55
POM_URL=https://github.com/apollographql/apollo-kotlin/
66
POM_SCM_URL=https://github.com/apollographql/apollo-kotlin/

gradle/libraries.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android-sdkversion-benchmark-min = "24"
1515
android-sdkversion-target = "30"
1616
androidx-sqlite = "2.3.1"
1717
# This is used by the gradle integration tests to get the artifacts locally
18-
apollo = "4.1.2-SNAPSHOT"
18+
apollo = "5.0.0-SNAPSHOT"
1919
apollo-execution = "0.1.0"
2020
apollo-normalizedcache-incubating = "0.0.8"
2121
# Used by the apollo-tooling project which uses a published version of Apollo

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/project/ApolloProjectService.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ interface ApolloProjectService {
1111
V2,
1212
V3,
1313
V4,
14+
V5,
1415
;
1516
val isAtLeastV3 get() = this >= V3
1617
val isAtLeastV4 get() = this >= V4
18+
val isAtLeastV5 get() = this >= V5
1719
}
1820

1921
val apolloVersion: ApolloVersion

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/util/Apollo.kt

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import com.intellij.openapi.vfs.VirtualFile
1111
const val apollo2 = "com.apollographql.apollo"
1212
const val apollo3 = "com.apollographql.apollo3"
1313
const val apollo4 = "com.apollographql.apollo"
14+
const val apollo5 = "com.apollographql.apollo"
1415

1516
fun Project.getApolloVersion(): ApolloVersion {
1617
var foundVersion = ApolloVersion.NONE
1718
service<ProjectRootManager>().orderEntries().librariesOnly().forEachLibrary { library ->
1819
val mavenCoordinates = library.toMavenCoordinates() ?: return@forEachLibrary true
1920
@Suppress("DUPLICATE_LABEL_IN_WHEN")
2021
when (mavenCoordinates.group) {
21-
apollo2, apollo4 -> {
22+
apollo2, apollo4, apollo5 -> {
2223
when {
2324
mavenCoordinates.version.startsWith("2.") -> {
2425
foundVersion = ApolloVersion.V2
@@ -30,27 +31,20 @@ fun Project.getApolloVersion(): ApolloVersion {
3031
false
3132
}
3233

33-
else -> true
34-
}
35-
}
36-
37-
apollo3 -> {
38-
when {
39-
mavenCoordinates.version.startsWith("3.") -> {
40-
foundVersion = ApolloVersion.V3
41-
false
42-
}
43-
44-
// TODO Needed in tests until 4.0 with groupId com.apollographql.apollo is published
45-
mavenCoordinates.version.startsWith("4.") -> {
46-
foundVersion = ApolloVersion.V4
34+
mavenCoordinates.version.startsWith("5.") -> {
35+
foundVersion = ApolloVersion.V5
4736
false
4837
}
4938

5039
else -> true
5140
}
5241
}
5342

43+
apollo3 -> {
44+
foundVersion = ApolloVersion.V3
45+
false
46+
}
47+
5448
else -> true
5549
}
5650
}

0 commit comments

Comments
 (0)