diff --git a/Tests/StarWarsAPI/API.swift b/Tests/StarWarsAPI/API.swift
index a11c125e29..9832101ebf 100644
--- a/Tests/StarWarsAPI/API.swift
+++ b/Tests/StarWarsAPI/API.swift
@@ -72,7 +72,7 @@ public struct ReviewInput: GraphQLMapConvertible {
   /// Comment about the movie, optional
   public var commentary: Swift.Optional<String?> {
     get {
-      return graphQLMap["commentary"] as? Swift.Optional<String?> ?? .none
+      return graphQLMap["commentary"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
     }
     set {
       graphQLMap.updateValue(newValue, forKey: "commentary")
@@ -82,7 +82,7 @@ public struct ReviewInput: GraphQLMapConvertible {
   /// Favorite color, optional
   public var favoriteColor: Swift.Optional<ColorInput?> {
     get {
-      return graphQLMap["favorite_color"] as? Swift.Optional<ColorInput?> ?? .none
+      return graphQLMap["favorite_color"] as? Swift.Optional<ColorInput?> ?? Swift.Optional<ColorInput?>.none
     }
     set {
       graphQLMap.updateValue(newValue, forKey: "favorite_color")
diff --git a/scripts/check-and-run-apollo-cli.sh b/scripts/check-and-run-apollo-cli.sh
index c195d5f1b2..ea7eed2220 100755
--- a/scripts/check-and-run-apollo-cli.sh
+++ b/scripts/check-and-run-apollo-cli.sh
@@ -1,5 +1,5 @@
 # Only major and minor version should be specified here
-REQUIRED_APOLLO_CLI_VERSION=2.17
+REQUIRED_APOLLO_CLI_VERSION=2.18
 # Specify fully qualified version here. Ideally this should be a LTS version.
 REQUIRED_NODE_VERSION=10.16.0