diff --git a/apollo-ios-codegen/Sources/ApolloCodegenLib/Constants.swift b/apollo-ios-codegen/Sources/ApolloCodegenLib/Constants.swift index a93d7b134..f3bde4bf0 100644 --- a/apollo-ios-codegen/Sources/ApolloCodegenLib/Constants.swift +++ b/apollo-ios-codegen/Sources/ApolloCodegenLib/Constants.swift @@ -1,5 +1,5 @@ import Foundation public enum Constants { - public static let CodegenVersion: String = "1.25.2" + public static let CodegenVersion: String = "1.25.3" } diff --git a/apollo-ios-codegen/Sources/CodegenCLI/Constants.swift b/apollo-ios-codegen/Sources/CodegenCLI/Constants.swift index ec24c8529..6e1afd1d4 100644 --- a/apollo-ios-codegen/Sources/CodegenCLI/Constants.swift +++ b/apollo-ios-codegen/Sources/CodegenCLI/Constants.swift @@ -1,6 +1,6 @@ import Foundation public enum Constants { - public static let CLIVersion: String = "1.25.2" + public static let CLIVersion: String = "1.25.3" static let defaultFilePath: String = "./apollo-codegen-config.json" } diff --git a/apollo-ios/CHANGELOG.md b/apollo-ios/CHANGELOG.md index f152a0e84..f014fb058 100644 --- a/apollo-ios/CHANGELOG.md +++ b/apollo-ios/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## v1.25.3 + +### Fixed + +- **Include merged fields in selection set equality check ([#3602](https://github.com/apollographql/apollo-ios/issues/3602)):** When a field merged from a child object in a named fragment was merged, it was not being used for equality checks. Equality checks now use the types `__fulfilledFragments` and collects selections from all of them, instead of just traversing downward from `self.__selections`. This ensures all expected data is collected from merged fragments. See PR [#832](https://github.com/apollographql/apollo-ios-dev/pull/832). _Thank you to [@JOyo246](https://github.com/JOyo246) for raising the issue_. +- **Percent encode semicolons when using GET ([#812](https://github.com/apollographql/apollo-ios-dev/pull/812)):** Semicolons were not being correctly encoded into the query string when `useGETForQueries` was enabled. _Thank you to [@nevil](https://github.com/nevil) for the contribution_. + ## v1.25.2 This version has no new changes since v1.25.1 and is being created to fix an issue where the previous version was tagged incorrectly. diff --git a/apollo-ios/CLI/apollo-ios-cli.tar.gz b/apollo-ios/CLI/apollo-ios-cli.tar.gz index 821138226..a5b9266b7 100644 Binary files a/apollo-ios/CLI/apollo-ios-cli.tar.gz and b/apollo-ios/CLI/apollo-ios-cli.tar.gz differ diff --git a/apollo-ios/Sources/Apollo/Constants.swift b/apollo-ios/Sources/Apollo/Constants.swift index 73cabaa33..360f7a715 100644 --- a/apollo-ios/Sources/Apollo/Constants.swift +++ b/apollo-ios/Sources/Apollo/Constants.swift @@ -2,7 +2,7 @@ import Foundation public enum Constants { public static let ApolloClientName = "apollo-ios" - public static let ApolloClientVersion: String = "1.25.2" + public static let ApolloClientVersion: String = "1.25.3" @available(*, deprecated, renamed: "ApolloClientVersion") public static let ApolloVersion: String = ApolloClientVersion diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json index c71c5d847..a280a0935 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json @@ -703,11 +703,11 @@ "type" : "codeVoice" }, { - "text" : " conforms to ", + "text" : " is ", "type" : "text" }, { - "code" : "Hashable", + "code" : "String", "type" : "codeVoice" }, { @@ -719,11 +719,11 @@ "type" : "codeVoice" }, { - "text" : " conforms to ", + "text" : " is ", "type" : "text" }, { - "code" : "Hashable", + "code" : "AnyHashable", "type" : "codeVoice" }, { diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json index 4365be945..712818a68 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json @@ -934,7 +934,7 @@ "type" : "text" }, { - "code" : "JSONEncodable", + "code" : "AnyScalarType", "type" : "codeVoice" }, { diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/mutableselectionset/fragments.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/mutableselectionset/fragments.json index 0ebbf7edd..bc16b33f9 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/mutableselectionset/fragments.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/mutableselectionset/fragments.json @@ -351,7 +351,7 @@ "doc://ApolloAPI/documentation/ApolloAPI/SelectionSet/Fragments-swift.associatedtype": { "abstract" : [ { - "text" : "A type representing all of the fragments the ", + "text" : "A type representing all of the named fragments the ", "type" : "text" }, { diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset.json index 545be4ef6..804ae9419 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset.json @@ -135,6 +135,14 @@ ], "title" : "Associated Types" }, + { + "anchor" : "Initializers", + "generated" : true, + "identifiers" : [ + "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/SelectionSet\/init(unsafelyWithData:)" + ], + "title" : "Initializers" + }, { "anchor" : "Instance-Properties", "generated" : true, @@ -632,7 +640,7 @@ "doc://ApolloAPI/documentation/ApolloAPI/SelectionSet/Fragments-swift.associatedtype": { "abstract" : [ { - "text" : "A type representing all of the fragments the ", + "text" : "A type representing all of the named fragments the ", "type" : "text" }, { @@ -823,6 +831,53 @@ "type" : "topic", "url" : "\/documentation\/apolloapi\/selectionset\/fragments-swift.property" }, +"doc://ApolloAPI/documentation/ApolloAPI/SelectionSet/init(unsafelyWithData:)": { + "abstract" : [ + + ], + "fragments" : [ + { + "kind" : "identifier", + "text" : "init" + }, + { + "kind" : "text", + "text" : "(" + }, + { + "kind" : "externalParam", + "text" : "unsafelyWithData" + }, + { + "kind" : "text", + "text" : ": [" + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:SS", + "text" : "String" + }, + { + "kind" : "text", + "text" : " : " + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:9ApolloAPI9JSONValuea", + "text" : "JSONValue" + }, + { + "kind" : "text", + "text" : "])" + } + ], + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/SelectionSet\/init(unsafelyWithData:)", + "kind" : "symbol", + "role" : "symbol", + "title" : "init(unsafelyWithData:)", + "type" : "topic", + "url" : "\/documentation\/apolloapi\/selectionset\/init(unsafelywithdata:)" +}, "doc://ApolloAPI/s28CustomDebugStringConvertibleP": { "identifier" : "doc:\/\/ApolloAPI\/s28CustomDebugStringConvertibleP", "title" : "Swift.CustomDebugStringConvertible", diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.associatedtype.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.associatedtype.json index bf491f5d4..ae2c4d808 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.associatedtype.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.associatedtype.json @@ -1,7 +1,7 @@ { "abstract" : [ { - "text" : "A type representing all of the fragments the ", + "text" : "A type representing all of the named fragments the ", "type" : "text" }, { @@ -370,7 +370,7 @@ "doc://ApolloAPI/documentation/ApolloAPI/SelectionSet/Fragments-swift.associatedtype": { "abstract" : [ { - "text" : "A type representing all of the fragments the ", + "text" : "A type representing all of the named fragments the ", "type" : "text" }, { diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.property.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.property.json index 2dd4412fd..db1933641 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.property.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/fragments-swift.property.json @@ -269,7 +269,7 @@ "doc://ApolloAPI/documentation/ApolloAPI/SelectionSet/Fragments-swift.associatedtype": { "abstract" : [ { - "text" : "A type representing all of the fragments the ", + "text" : "A type representing all of the named fragments the ", "type" : "text" }, { diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/init(unsafelywithdata:).json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/init(unsafelywithdata:).json new file mode 100644 index 000000000..f17fa10a3 --- /dev/null +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/selectionset/init(unsafelywithdata:).json @@ -0,0 +1,350 @@ +{ + "hierarchy" : { + "paths" : [ + [ + "doc:\/\/ApolloAPI\/documentation\/ApolloAPI", + "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/SelectionSet" + ] + ] + }, + "identifier" : { + "interfaceLanguage" : "swift", + "url" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/SelectionSet\/init(unsafelyWithData:)" + }, + "kind" : "symbol", + "metadata" : { + "extendedModule" : "ApolloAPI", + "externalID" : "s:9ApolloAPI12SelectionSetPAAE16unsafelyWithDataxSDySSs11AnyHashableVG_tcfc", + "fragments" : [ + { + "kind" : "identifier", + "text" : "init" + }, + { + "kind" : "text", + "text" : "(" + }, + { + "kind" : "externalParam", + "text" : "unsafelyWithData" + }, + { + "kind" : "text", + "text" : ": [" + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:SS", + "text" : "String" + }, + { + "kind" : "text", + "text" : " : " + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:9ApolloAPI9JSONValuea", + "text" : "JSONValue" + }, + { + "kind" : "text", + "text" : "])" + } + ], + "modules" : [ + { + "name" : "ApolloAPI" + } + ], + "role" : "symbol", + "roleHeading" : "Initializer", + "symbolKind" : "init", + "title" : "init(unsafelyWithData:)" + }, + "primaryContentSections" : [ + { + "declarations" : [ + { + "languages" : [ + "swift" + ], + "platforms" : [ + "macOS" + ], + "tokens" : [ + { + "kind" : "keyword", + "text" : "init" + }, + { + "kind" : "text", + "text" : "(" + }, + { + "kind" : "externalParam", + "text" : "unsafelyWithData" + }, + { + "kind" : "text", + "text" : " " + }, + { + "kind" : "internalParam", + "text" : "data" + }, + { + "kind" : "text", + "text" : ": [" + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:SS", + "text" : "String" + }, + { + "kind" : "text", + "text" : " : " + }, + { + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/JSONValue", + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:9ApolloAPI9JSONValuea", + "text" : "JSONValue" + }, + { + "kind" : "text", + "text" : "])" + } + ] + } + ], + "kind" : "declarations" + } + ], + "schemaVersion" : { + "major" : 0, + "minor" : 3, + "patch" : 0 + }, + "sections" : [ + + ], + "variants" : [ + { + "paths" : [ + "\/documentation\/apolloapi\/selectionset\/init(unsafelywithdata:)" + ], + "traits" : [ + { + "interfaceLanguage" : "swift" + } + ] + } + ] +, +"references": { +"/documentation/apollo": { + "identifier" : "\/documentation\/apollo", + "title" : "Apollo", + "titleInlineContent" : [ + { + "code" : "Apollo", + "type" : "codeVoice" + } + ], + "type" : "link", + "url" : "\/documentation\/apollo" +}, +"/documentation/apollocodegenlib": { + "identifier" : "\/documentation\/apollocodegenlib", + "title" : "ApolloCodegenLib", + "titleInlineContent" : [ + { + "code" : "ApolloCodegenLib", + "type" : "codeVoice" + } + ], + "type" : "link", + "url" : "\/documentation\/apollocodegenlib" +}, +"doc://ApolloAPI/documentation/ApolloAPI": { + "abstract" : [ + { + "text" : "The internal models shared by the ", + "type" : "text" + }, + { + "identifier" : "\/documentation\/apollo", + "isActive" : true, + "type" : "reference" + }, + { + "text" : " client and the models generated by ", + "type" : "text" + }, + { + "identifier" : "\/documentation\/apollocodegenlib", + "isActive" : true, + "type" : "reference" + } + ], + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI", + "kind" : "symbol", + "role" : "collection", + "title" : "ApolloAPI", + "type" : "topic", + "url" : "\/documentation\/apolloapi" +}, +"doc://ApolloAPI/documentation/ApolloAPI/JSONObject": { + "abstract" : [ + { + "text" : "Represents a JSON Dictionary", + "type" : "text" + } + ], + "fragments" : [ + { + "kind" : "keyword", + "text" : "typealias" + }, + { + "kind" : "text", + "text" : " " + }, + { + "kind" : "identifier", + "text" : "JSONObject" + } + ], + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/JSONObject", + "kind" : "symbol", + "navigatorTitle" : [ + { + "kind" : "identifier", + "text" : "JSONObject" + } + ], + "role" : "symbol", + "title" : "JSONObject", + "type" : "topic", + "url" : "\/documentation\/apolloapi\/jsonobject" +}, +"doc://ApolloAPI/documentation/ApolloAPI/JSONValue": { + "abstract" : [ + { + "text" : "Represents a value in a ", + "type" : "text" + }, + { + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/JSONObject", + "isActive" : true, + "type" : "reference" + } + ], + "fragments" : [ + { + "kind" : "keyword", + "text" : "typealias" + }, + { + "kind" : "text", + "text" : " " + }, + { + "kind" : "identifier", + "text" : "JSONValue" + } + ], + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/JSONValue", + "kind" : "symbol", + "navigatorTitle" : [ + { + "kind" : "identifier", + "text" : "JSONValue" + } + ], + "role" : "symbol", + "title" : "JSONValue", + "type" : "topic", + "url" : "\/documentation\/apolloapi\/jsonvalue" +}, +"doc://ApolloAPI/documentation/ApolloAPI/SelectionSet": { + "abstract" : [ + + ], + "fragments" : [ + { + "kind" : "keyword", + "text" : "protocol" + }, + { + "kind" : "text", + "text" : " " + }, + { + "kind" : "identifier", + "text" : "SelectionSet" + } + ], + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/SelectionSet", + "kind" : "symbol", + "navigatorTitle" : [ + { + "kind" : "identifier", + "text" : "SelectionSet" + } + ], + "role" : "symbol", + "title" : "SelectionSet", + "type" : "topic", + "url" : "\/documentation\/apolloapi\/selectionset" +}, +"doc://ApolloAPI/documentation/ApolloAPI/SelectionSet/init(unsafelyWithData:)": { + "abstract" : [ + + ], + "fragments" : [ + { + "kind" : "identifier", + "text" : "init" + }, + { + "kind" : "text", + "text" : "(" + }, + { + "kind" : "externalParam", + "text" : "unsafelyWithData" + }, + { + "kind" : "text", + "text" : ": [" + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:SS", + "text" : "String" + }, + { + "kind" : "text", + "text" : " : " + }, + { + "kind" : "typeIdentifier", + "preciseIdentifier" : "s:9ApolloAPI9JSONValuea", + "text" : "JSONValue" + }, + { + "kind" : "text", + "text" : "])" + } + ], + "identifier" : "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/SelectionSet\/init(unsafelyWithData:)", + "kind" : "symbol", + "role" : "symbol", + "title" : "init(unsafelyWithData:)", + "type" : "topic", + "url" : "\/documentation\/apolloapi\/selectionset\/init(unsafelywithdata:)" +} +} +} \ No newline at end of file diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/dictionary.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/dictionary.json index 8560ec883..f39b140ff 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/dictionary.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/dictionary.json @@ -224,11 +224,11 @@ "type" : "codeVoice" }, { - "text" : " conforms to ", + "text" : " is ", "type" : "text" }, { - "code" : "Hashable", + "code" : "String", "type" : "codeVoice" }, { @@ -240,11 +240,11 @@ "type" : "codeVoice" }, { - "text" : " conforms to ", + "text" : " is ", "type" : "text" }, { - "code" : "Hashable", + "code" : "AnyHashable", "type" : "codeVoice" }, { diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json index c86fcb2aa..fd35cb3e0 100644 --- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json +++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json @@ -449,7 +449,7 @@ "type" : "text" }, { - "code" : "JSONEncodable", + "code" : "AnyScalarType", "type" : "codeVoice" }, {