Revert "Rolling back CI to known version for now (#585)"

This reverts commit 40551c7.

Author: garrettmoon

Source/Details/_ASDisplayViewAccessiblity.mm

@@ -84,7 +84,7 @@ + (ASAccessibilityElement *)accessibilityElementWithContainer:(UIView *)containe
   accessibilityElement.accessibilityHint = node.accessibilityHint;
   accessibilityElement.accessibilityValue = node.accessibilityValue;
   accessibilityElement.accessibilityTraits = node.accessibilityTraits;
-  if (@available(iOS 11, *)) {
+  if (AS_AT_LEAST_IOS11) {
     [accessibilityElement setValue:node.accessibilityAttributedLabel forKey:@"accessibilityAttributedLabel"];
     [accessibilityElement setValue:node.accessibilityAttributedHint forKey:@"accessibilityAttributedHint"];
     [accessibilityElement setValue:node.accessibilityAttributedValue forKey:@"accessibilityAttributedValue"];

Source/Private/_ASPendingState.mm

@@ -1216,7 +1216,7 @@ + (_ASPendingState *)pendingViewStateFromView:(UIView *)view
   pendingState.accessibilityLabel = view.accessibilityLabel;
   pendingState.accessibilityHint = view.accessibilityHint;
   pendingState.accessibilityValue = view.accessibilityValue;
-  if (@available(iOS 11, *)) {
+  if (AS_AT_LEAST_IOS11) {
     pendingState.accessibilityAttributedLabel = [view valueForKey: @"accessibilityAttributedLabel"];
     pendingState.accessibilityAttributedHint = [view valueForKey: @"accessibilityAttributedHint"];
     pendingState.accessibilityAttributedValue = [view valueForKey: @"accessibilityAttributedValue"];

Tests/ASDisplayNodeTests.mm

@@ -353,11 +353,11 @@ - (void)checkValuesMatchDefaults:(ASDisplayNode *)node isLayerBacked:(BOOL)isLay
   XCTAssertEqual((id)nil, node.accessibilityLabel, @"default accessibilityLabel is broken %@", hasLoadedView);
   XCTAssertEqual((id)nil, node.accessibilityHint, @"default accessibilityHint is broken %@", hasLoadedView);
   XCTAssertEqual((id)nil, node.accessibilityValue, @"default accessibilityValue is broken %@", hasLoadedView);
-//  if (AS_AT_LEAST_IOS11) {
-//    XCTAssertEqual((id)nil, node.accessibilityAttributedLabel, @"default accessibilityAttributedLabel is broken %@", hasLoadedView);
-//    XCTAssertEqual((id)nil, node.accessibilityAttributedHint, @"default accessibilityAttributedHint is broken %@", hasLoadedView);
-//    XCTAssertEqual((id)nil, node.accessibilityAttributedValue, @"default accessibilityAttributedValue is broken %@", hasLoadedView);
-//  }
+  if (AS_AT_LEAST_IOS11) {
+    XCTAssertEqual((id)nil, node.accessibilityAttributedLabel, @"default accessibilityAttributedLabel is broken %@", hasLoadedView);
+    XCTAssertEqual((id)nil, node.accessibilityAttributedHint, @"default accessibilityAttributedHint is broken %@", hasLoadedView);
+    XCTAssertEqual((id)nil, node.accessibilityAttributedValue, @"default accessibilityAttributedValue is broken %@", hasLoadedView);
+  }
   XCTAssertEqual(UIAccessibilityTraitNone, node.accessibilityTraits, @"default accessibilityTraits is broken %@", hasLoadedView);
   XCTAssertTrue(CGRectEqualToRect(CGRectZero, node.accessibilityFrame), @"default accessibilityFrame is broken %@", hasLoadedView);
   XCTAssertEqual((id)nil, node.accessibilityLanguage, @"default accessibilityLanguage is broken %@", hasLoadedView);
@@ -458,11 +458,11 @@ - (void)checkValuesMatchSetValues:(ASDisplayNode *)node isLayerBacked:(BOOL)isLa
   XCTAssertEqualObjects(@"1 of 2", node.accessibilityValue, @"accessibilityValue broken %@", hasLoadedView);
 
   // setting the accessibilityLabel, accessibilityHint and accessibilityValue is supposed to be bridged to the attributed versions
-//  if (AS_AT_LEAST_IOS11) {
-//    XCTAssertEqualObjects(@"Ship love", node.accessibilityAttributedLabel.string, @"accessibilityAttributedLabel is broken %@", hasLoadedView);
-//    XCTAssertEqualObjects(@"Awesome things will happen", node.accessibilityAttributedHint.string, @"accessibilityAttributedHint is broken %@", hasLoadedView);
-//    XCTAssertEqualObjects(@"1 of 2", node.accessibilityAttributedValue.string, @"accessibilityAttributedValue is broken %@", hasLoadedView);
-//  }
+  if (AS_AT_LEAST_IOS11) {
+    XCTAssertEqualObjects(@"Ship love", node.accessibilityAttributedLabel.string, @"accessibilityAttributedLabel is broken %@", hasLoadedView);
+    XCTAssertEqualObjects(@"Awesome things will happen", node.accessibilityAttributedHint.string, @"accessibilityAttributedHint is broken %@", hasLoadedView);
+    XCTAssertEqualObjects(@"1 of 2", node.accessibilityAttributedValue.string, @"accessibilityAttributedValue is broken %@", hasLoadedView);
+  }
   XCTAssertEqual(UIAccessibilityTraitSelected | UIAccessibilityTraitButton, node.accessibilityTraits, @"accessibilityTraits broken %@", hasLoadedView);
   XCTAssertTrue(CGRectEqualToRect(CGRectMake(1, 2, 3, 4), node.accessibilityFrame), @"accessibilityFrame broken %@", hasLoadedView);
   XCTAssertEqualObjects(@"mas", node.accessibilityLanguage, @"accessibilityLanguage broken %@", hasLoadedView);

build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PLATFORM="platform=iOS Simulator,OS=10.2,name=iPhone 7"
-SDK="iphonesimulator11.0"
+PLATFORM="platform=iOS Simulator,name=iPhone 7"
+SDK="iphonesimulator"
 DERIVED_DATA_PATH="~/ASDKDerivedData"
 
 

smoke-tests/Framework/Sample.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		050E7C7419D22E19004363C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 050E7C7319D22E19004363C2 /* AppDelegate.swift */; };
 		050E7C7619D22E19004363C2 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 050E7C7519D22E19004363C2 /* ViewController.swift */; };
 		05DDD8DB19D2336300013C30 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 05DDD8DA19D2336300013C30 /* [email protected] */; };
+		34566CAA1BC1204100715E6B /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34566CA91BC1202A00715E6B /* AsyncDisplayKit.framework */; };
+		34566CAB1BC1204100715E6B /* AsyncDisplayKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34566CA91BC1202A00715E6B /* AsyncDisplayKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6C5053DB19EE266A00E385DE /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 6C5053D919EE266A00E385DE /* [email protected] */; };
 		6C5053DC19EE266A00E385DE /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 6C5053DA19EE266A00E385DE /* [email protected] */; };
 /* End PBXBuildFile section */
@@ -36,6 +38,13 @@
 			remoteGlobalIDString = 057D02BF1AC0A66700C7AC3C;
 			remoteInfo = AsyncDisplayKitTestHost;
 		};
+		34566CA81BC1202A00715E6B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34566C9B1BC1202A00715E6B /* AsyncDisplayKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B35061DA1B010EDF0018CF92;
+			remoteInfo = "AsyncDisplayKit-iOS";
+		};
 		34566CAC1BC1204100715E6B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 34566C9B1BC1202A00715E6B /* AsyncDisplayKit.xcodeproj */;
@@ -52,6 +61,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				34566CAB1BC1204100715E6B /* AsyncDisplayKit.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -76,6 +86,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				34566CAA1BC1204100715E6B /* AsyncDisplayKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -139,6 +150,7 @@
 				34566CA31BC1202A00715E6B /* libAsyncDisplayKit.a */,
 				34566CA51BC1202A00715E6B /* AsyncDisplayKitTests.xctest */,
 				34566CA71BC1202A00715E6B /* AsyncDisplayKitTestHost.app */,
+				34566CA91BC1202A00715E6B /* AsyncDisplayKit.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -177,7 +189,7 @@
 				TargetAttributes = {
 					050E7C6D19D22E19004363C2 = {
 						CreatedOnToolsVersion = 6.0.1;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -208,8 +220,8 @@
 /* Begin PBXReferenceProxy section */
 		34566CA31BC1202A00715E6B /* libAsyncDisplayKit.a */ = {
 			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = AsyncDisplayKit.framework;
+			fileType = archive.ar;
+			path = libAsyncDisplayKit.a;
 			remoteRef = 34566CA21BC1202A00715E6B /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -227,6 +239,13 @@
 			remoteRef = 34566CA61BC1202A00715E6B /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		34566CA91BC1202A00715E6B /* AsyncDisplayKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AsyncDisplayKit.framework;
+			remoteRef = 34566CA81BC1202A00715E6B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -350,7 +369,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.AsyncDisplayKit.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -363,7 +382,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.AsyncDisplayKit.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

smoke-tests/Framework/Sample/AppDelegate.swift

@@ -22,9 +22,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-    let window = UIWindow(frame: UIScreen.main.bounds)
-    window.backgroundColor = UIColor.white
+  func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    let window = UIWindow(frame: UIScreen.mainScreen().bounds)
+    window.backgroundColor = UIColor.whiteColor()
     window.rootViewController = ViewController(nibName: nil, bundle: nil)
     window.makeKeyAndVisible()
     self.window = window

smoke-tests/Framework/Sample/ViewController.swift

@@ -25,7 +25,7 @@ class ViewController: UIViewController, ASTableDataSource, ASTableDelegate {
 
   // MARK: UIViewController.
 
-  override required init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+  override required init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
     self.tableNode = ASTableNode()
 
     super.init(nibName: nil, bundle: nil)
@@ -50,19 +50,19 @@ class ViewController: UIViewController, ASTableDataSource, ASTableDelegate {
 
   // MARK: ASTableView data source and delegate.
 
-  func tableNode(_ tableNode: ASTableNode, nodeForRowAt indexPath: IndexPath) -> ASCellNode {
+  func tableNode(tableNode: ASTableNode, nodeForRowAtIndexPath indexPath: NSIndexPath) -> ASCellNode {
     let patter = NSString(format: "[%ld.%ld] says hello!", indexPath.section, indexPath.row)
     let node = ASTextCellNode()
     node.text = patter as String
 
     return node
   }
 
-  func numberOfSections(in tableNode: ASTableNode) -> Int {
+  func numberOfSectionsInTableNode(tableNode: ASTableNode) -> Int {
     return 1
   }
 
-  func tableNode(_ tableNode: ASTableNode, numberOfRowsInSection section: Int) -> Int {
+  func tableNode(tableNode: ASTableNode, numberOfRowsInSection section: Int) -> Int {
     return 20
   }