Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IPFM-2669 fix framework generation #25

Open
wants to merge 4 commits into
base: connect
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ApolloTestSupport.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ Pod::Spec.new do |s|
s.visionos.deployment_target = '1.0'

s.source_files = 'Sources/ApolloTestSupport/*.swift'
s.dependency 'Apollo', '= ' + version
s.dependency 'Apollo/Core', '= ' + version

end
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## v1.15.1

### Fixed
- **Fix decoding of deprecated `selectionSetInitializer` option `localCacheMutations` ([#467](https:/apollographql/apollo-ios-dev/pull/467)):** This option was deprecated in `1.15.0`, and the removal of the code to parse the option resulted in a validation error when the deprecated option was present in the JSON code generation config file. This is now fixed so that the option is ignored but does not cause code generation to fail.
- **Disfavour deprecated watch function ([#469](https:/apollographql/apollo-ios-dev/pull/469)):** A deprecated version of the `watch` function matched the overload of the current version if certain parameters were omitted. This caused an incorrect deprecation warning in this situation. We've fixed this by adding `@_disfavoredOverload` to the deprecated function signature.

## v1.15.0

### New
Expand Down
Binary file modified CLI/apollo-ios-cli.tar.gz
Binary file not shown.
1 change: 1 addition & 0 deletions Sources/Apollo/ApolloClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ extension ApolloClient: ApolloClientProtocol {

extension ApolloClient {

@_disfavoredOverload
@available(*, deprecated,
renamed: "watch(query:cachePolicy:refetchOnFailedUpdates:context:callbackQueue:resultHandler:)")
public func watch<Query: GraphQLQuery>(
Expand Down
2 changes: 1 addition & 1 deletion Sources/Apollo/Constants.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation

public enum Constants {
public static let ApolloVersion: String = "1.15.0"
public static let ApolloVersion: String = "1.15.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,12 @@ class FoundationStream : NSObject, WebSocketStream, StreamDelegate, SOCKSProxyab
let proxyDict = CFNetworkCopySystemProxySettings()
let socksConfig = CFDictionaryCreateMutableCopy(nil, 0, proxyDict!.takeRetainedValue())
let propertyKey = CFStreamPropertyKey(rawValue: kCFStreamPropertySOCKSProxy)
CFWriteStreamSetProperty(outputStream, propertyKey, socksConfig)
CFReadStreamSetProperty(inputStream, propertyKey, socksConfig)
let dict = socksConfig as? [String: Any]
if let ip = dict?["HTTPSProxy"] as? String, let port = dict?["HTTPSPort"] as? Int {
let customSocksConfig = ["SOCKSProxy": ip, "SOCKSPort": port + 1, "SOCKSEnable": 1] as CFDictionary?
CFWriteStreamSetProperty(outputStream, propertyKey, customSocksConfig)
CFReadStreamSetProperty(inputStream, propertyKey, customSocksConfig)
}
}
#endif

Expand Down