Skip to content

Commit

Permalink
Reverts architecture check.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kzaher
kzaher committed Sep 20, 2018
1 parent a582064 commit 0df62b4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ All notable changes to this project will be documented in this file.

#### Anomalies

* Fixes the warning for arm64_32 architecture (watchOS 5) in RxCocoa for Swift versions priror to 4.2.
* Fixes issues with CocoaPods and Swift 4.2 version.

## [4.3.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.3.0)
Expand Down
10 changes: 1 addition & 9 deletions RxCocoa/Foundation/KVORepresentable+CoreGraphics.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ import class Foundation.NSValue
let CGRectType = "{CGRect={CGPoint=dd}{CGSize=dd}}"
let CGSizeType = "{CGSize=dd}"
let CGPointType = "{CGPoint=dd}"
#elseif arch(i386) || arch(arm)
#elseif arch(i386) || arch(arm) || arch(arm64_32)
let CGRectType = "{CGRect={CGPoint=ff}{CGSize=ff}}"
let CGSizeType = "{CGSize=ff}"
let CGPointType = "{CGPoint=ff}"
#else
#if swift(>=4.2)
#if arch(arm64_32)
let CGRectType = "{CGRect={CGPoint=ff}{CGSize=ff}}"
let CGSizeType = "{CGSize=ff}"
let CGPointType = "{CGPoint=ff}"
#endif
#endif
#endif

extension CGRect : KVORepresentable {
Expand Down

3 comments on commit 0df62b4

@freak4pc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this reversion mean it can't build for watchOS 5 anymore? (which means also for iOS targets that have watchOS companions, possibly?)

@radex
Copy link
Contributor

@radex radex commented on 0df62b4 Sep 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@freak4pc looks more like a refactoring, not a revert. Unless I'm missing something, the changed code does the same thing

@freak4pc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh it reverted to my original commit, sorry, misread :)

Please sign in to comment.