Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

[Refactoring] Adopt Objective-C Nullability, Lightweight Generics Annotations #995

Merged
merged 55 commits into from
Dec 26, 2015
Merged

[Refactoring] Adopt Objective-C Nullability, Lightweight Generics Annotations #995

merged 55 commits into from
Dec 26, 2015

Conversation

appleguy
Copy link
Contributor

This supersedes #664 - now merged with latest master.

Thanks so much @Adlai-Holler for crafting the original version of this PR! I'm quite excited to resurrect it this Christmas Day 2015!

@Adlai-Holler
Add nullability annotations for public API
814f725
@Adlai-Holler
More updates
262d65e
@Adlai-Holler
Re-add nil tests
04690c0
@Adlai-Holler
Restore old ASCollectionNode init
30ed0bd
@Adlai-Holler
More objective-C cleanup
a7240ba
@Adlai-Holler
hitTest:withEvent: return value should be nullable
e4dc823
@Adlai-Holler
Bump the .travis.yml OS X image requirement for Xcode 7
6bcd245
@Adlai-Holler
Merge branch 'master' into update-objc
cde7901
@Adlai-Holler
Merge latest master and update Layout headers
717df1c
@Adlai-Holler
In ASLayoutOptions, make initWithLayoutable: take a nullable argument
309ecca
@Adlai-Holler
Update all the files in the Details group
c010dda
@Adlai-Holler
Fix nullability in ASImageDownloaderProtocol completion handler
38706d0
@Adlai-Holler
Fix nullability of ASImageDownloaderProtocol to conform to ASBasicIma…
ba9a742 
…geDownloader behavior
@Adlai-Holler
Make image download token optional
fd3a90a
@Adlai-Holler
Add some nullables in ASTextNode
f20a0d4
@Adlai-Holler
Give a prefix to make ASImageIdentifier typealias
f37a88d
@Adlai-Holler
Point travis at 9.0 SDK
ffbf84f
@Adlai-Holler
Revert "Point travis at 9.0 SDK"
dc5650d 
This reverts commit ffbf84f.
@Adlai-Holler
Bump SDK in build.sh
70c5582
@Adlai-Holler
Merge branch 'master' into update-objc
37e2a53
@Adlai-Holler
Merge branch 'master' into update-objc
9d6b3b6 
Conflicts:
	AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h
@Adlai-Holler
Update types for drawParameters
441a0e6
@Adlai-Holler
Simplify ASImageIdentifier definition
73af8f1
@Adlai-Holler
Merge branch 'master' into update-objc
8bb9d17 
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
	AsyncDisplayKit/ASMultiplexImageNode.h
	AsyncDisplayKit/ASViewController.h
	AsyncDisplayKit/Details/ASDataController.h
@Adlai-Holler
Annotate ASCollectionViewProtocols.h
ee970d4
@Adlai-Holler
Merge branch 'master' into update-objc
b1e60a9
@Adlai-Holler
Fix nullability in MultiplexImageNodeDataSource
fb03412
@Adlai-Holler
Merge branch 'master' into update-objc
8e104f4 
Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASDisplayNode.h
	AsyncDisplayKit/Details/ASDataController.h
	AsyncDisplayKit/Details/UIView+ASConvenience.h
	AsyncDisplayKit/Layout/ASLayoutSpec.h
@Adlai-Holler
Fix UIView+ASConvenience.h merge
0e90d05
@Adlai-Holler
Fix test build by casting test image identifiers
f2a095a
Adlai-Holler and others added 15 commits November 13, 2015 12:03
@Adlai-Holler
Merge branch 'master' into update-objc
762be97
@Adlai-Holler
(Re?)add type annotations on touchesBegan:withEvent: et al
7922895
@Adlai-Holler
touchesCancelled:withEvent: has a nullable touches argument in UIKit …
ab326fc 
…for some reason
@Adlai-Holler
Merge branch 'master' into update-objc
ecaabc8 
Conflicts:
	AsyncDisplayKit/Details/UIView+ASConvenience.h
@Adlai-Holler
Merge branch 'master' into update-objc
dfc098f 
Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASTableView.h
	AsyncDisplayKit/Details/ASLayoutController.h
	AsyncDisplayKit/Details/ASRangeController.h
@Adlai-Holler
Revert minor deletion
628bb7e
@Adlai-Holler
Merge branch 'master' into update-objc
fdfe188 
Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h
@Adlai-Holler
Add some more annotations
8e75c59
@Adlai-Holler
Annotate ASAsciiArtBoxCreator.h
1fd65c2
@Adlai-Holler
Merge branch 'master' into update-objc
73b9002
@Adlai-Holler
Merge branch 'master' into update-objc
b16a9e2 
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
@Adlai-Holler
Merge branch 'master' into update-objc
7079a9c 
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
@Adlai-Holler
Annotate some new stuff
e202b18
@Adlai-Holler
Merge branch 'master' into update-objc
69767d5 
Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
Merge branch 'master' into pr/664
882d4b3
@appleguy appleguy added this to the 1.9.4 milestone Dec 25, 2015
@appleguy appleguy mentioned this pull request Dec 25, 2015
Closed
@Adlai-Holler
Copy link
Contributor

Awesome, thanks @appleguy for taking this over. It really makes working with the framework in Swift easier!

@appleguy
Copy link
Contributor Author

Woah.
screen shot 2015-12-25 at 7 52 37 pm

appleguy added a commit that referenced this pull request Dec 26, 2015
@appleguy
Merge pull request #995 from facebook/pr/664
88bfd3e 
[Refactoring] Adopt Objective-C Nullability, Lightweight Generics Annotations
@appleguy appleguy merged commit 88bfd3e into master Dec 26, 2015
@appleguy appleguy deleted the pr/664 branch December 26, 2015 03:57
@Adlai-Holler
Copy link
Contributor

Woah indeed.

Sent from my iPhone

On Dec 25, 2015, at 10:57 PM, appleguy notifications@github.com wrote:

Merged #995.

—
Reply to this email directly or view it on GitHub.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

CLA Signed Refactoring

Projects

None yet

Milestone

1.9.4

Development

Successfully merging this pull request may close these issues.

3 participants

@appleguy @Adlai-Holler @facebook-github-bot