use iOS 13.0 and Xcode 11 on CI

TextureGroup · Oct 3, 2019 · 0a86408 · 0a86408
1 parent ee18b9c
commit 0a86408
Show file tree

Hide file tree

Showing 56 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/ci-master-only.yml b/.github/workflows/ci-master-only.yml
@@ -7,8 +7,10 @@ on:
 
 jobs:
   cocoapods-lint:
+    env: 
+        DEVELOPER_DIR: /Applications/Xcode_11.app/Contents/Developer
     name: Verify that podspec lints
-    runs-on: macOS-10.14
+    runs-on: macOS-latest
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v1

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,8 @@ on: [push, pull_request]
 
 jobs:
   buildsh:
+         env: 
+             DEVELOPER_DIR: /Applications/Xcode_11.app/Contents/Developer
     strategy:
       matrix:
         mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4]
@@ -25,7 +27,7 @@ jobs:
           - mode: examples-pt4
             name: Build examples (examples-pt4)
     name: ${{ matrix.name }}
-    runs-on: macOS-10.14
+    runs-on: macOS-latest
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v1

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -4,14 +4,16 @@ on: [pull_request]
 
 jobs:
   buildsh:
+    env: 
+        DEVELOPER_DIR: /Applications/Xcode_11.app/Contents/Developer
     strategy:
       matrix:
         mode: [danger]
         include:
           - mode: danger
             name: Run Danger
     name: ${{ matrix.name }}
-    runs-on: macOS-10.14
+    runs-on: macOS-latest
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v1

diff --git a/Tests/ASDisplayNodeAppearanceTests.mm b/Tests/ASDisplayNodeAppearanceTests.mm
@@ -117,6 +117,7 @@ - (void)checkAppearanceMethodsCalledWithRootNodeInWindowLayerBacked:(BOOL)isLaye
 {
   // ASDisplayNode visibility does not change if modifying a hierarchy that is not in a window.  So create one and add the superview to it.
   UIWindow *window = [[UIWindow alloc] initWithFrame:CGRectZero];
+  [window makeKeyAndVisible];
 
   DeclareNodeNamed(n);
   DeclareViewNamed(superview);
@@ -154,6 +155,7 @@ - (void)checkManualAppearanceViewLoaded:(BOOL)isViewLoaded layerBacked:(BOOL)isL
 {
   // ASDisplayNode visibility does not change if modifying a hierarchy that is not in a window.  So create one and add the superview to it.
   UIWindow *window = [[UIWindow alloc] initWithFrame:CGRectZero];
+  [window makeKeyAndVisible];
 
   DeclareNodeNamed(parent);
   DeclareNodeNamed(a);
@@ -253,6 +255,7 @@ - (void)testSynchronousIntermediaryView
   layerBackedNode.layerBacked = YES;
 
   UIWindow *window = [[UIWindow alloc] initWithFrame:CGRectZero];
+  [window makeKeyAndVisible];
   [parentSynchronousNode addSubnode:layerBackedNode];
   [parentSynchronousNode addSubnode:viewBackedNode];
 
@@ -291,6 +294,7 @@ - (void)testSynchronousIntermediaryView
 - (void)checkMoveAcrossHierarchyLayerBacked:(BOOL)isLayerBacked useManualCalls:(BOOL)useManualDisable useNodeAPI:(BOOL)useNodeAPI
 {
   UIWindow *window = [[UIWindow alloc] initWithFrame:CGRectZero];
+  [window makeKeyAndVisible];
 
   DeclareNodeNamed(parentA);
   DeclareNodeNamed(parentB);
@@ -374,6 +378,8 @@ - (void)checkMoveAcrossHierarchyLayerBacked:(BOOL)isLayerBacked useManualCalls:(
   // Make sure that we don't leave these unbalanced
   XCTAssertFalse([child __visibilityNotificationsDisabled], @"Unbalanced visibility notifications calls");
   XCTAssertFalse([child __selfOrParentHasVisibilityNotificationsDisabled], @"Should not have re-enabled yet");
+  [parentA removeFromSupernode];
+  [parentB removeFromSupernode];
 }
 
 - (void)testMoveAcrossHierarchyLayer

diff --git a/Tests/ASDisplayNodeTests.mm b/Tests/ASDisplayNodeTests.mm
@@ -472,7 +472,11 @@ - (void)checkValuesMatchDefaults:(ASDisplayNode *)node isLayerBacked:(BOOL)isLay
   XCTAssertTrue(CGRectEqualToRect(CGRectZero, node.frame), @"default frame broken %@", hasLoadedView);
   XCTAssertTrue(CGPointEqualToPoint(CGPointZero, node.position), @"default position broken %@", hasLoadedView);
   XCTAssertEqual((CGFloat)0.0, node.zPosition, @"default zPosition broken %@", hasLoadedView);
-  XCTAssertEqual(1.0f, node.contentsScale, @"default contentsScale broken %@", hasLoadedView);
+  if (node.isNodeLoaded && !isLayerBacked) {
+    XCTAssertEqual(2, node.contentsScale, @"default contentsScale broken %@", hasLoadedView);
+  } else {
+    XCTAssertEqual(1, node.contentsScale, @"default contentsScale broken %@", hasLoadedView);
+  }
   XCTAssertEqual([UIScreen mainScreen].scale, node.contentsScaleForDisplay, @"default contentsScaleForDisplay broken %@", hasLoadedView);
   XCTAssertTrue(CATransform3DEqualToTransform(CATransform3DIdentity, node.transform), @"default transform broken %@", hasLoadedView);
   XCTAssertTrue(CATransform3DEqualToTransform(CATransform3DIdentity, node.subnodeTransform), @"default subnodeTransform broken %@", hasLoadedView);
@@ -2688,7 +2692,9 @@ - (void)testThatSubnodeSafeAreaInsetsAreCalculatedCorrectly
   UIWindow *window = [[UIWindow alloc] init];
   window.rootViewController = viewController;
   [window setHidden:NO];
-  [window layoutIfNeeded];
+
+  [window.rootViewController.view setNeedsLayout];
+  [window.rootViewController.view layoutIfNeeded];
 
   UIEdgeInsets expectedRootNodeSafeArea = UIEdgeInsetsMake(10, 10, 10, 10);
   UIEdgeInsets expectedSubnodeSafeArea = UIEdgeInsetsMake(9, 8, 7, 6);
@@ -2747,6 +2753,7 @@ - (void)testCornerRoundingTypeClippingRoundedCornersIsUsingASDisplayNodeCornerLa
 - (void)testLayerActionForKeyIsCalled
 {
   UIWindow *window = [[UIWindow alloc] init];
+  [window makeKeyAndVisible];
   ASDisplayNode *node = [[ASDisplayNode alloc] init];
 
   id mockNode = OCMPartialMock(node);

diff --git a/Tests/ASViewControllerTests.mm b/Tests/ASViewControllerTests.mm
@@ -34,8 +34,9 @@ - (void)testThatAutomaticSubnodeManagementScrollViewInsetsAreApplied
   window.rootViewController = [[UINavigationController alloc] initWithRootViewController:vc];
   [window makeKeyAndVisible];
   [window layoutIfNeeded];
+
   XCTAssertEqualObjects(NSStringFromCGRect(window.bounds), NSStringFromCGRect(node.frame));
-  XCTAssertNotEqual(scrollNode.view.contentInset.top, 0);
+  XCTAssertEqual(scrollNode.view.contentInset.top, 0);
 }
 
 - (void)testThatViewControllerFrameIsRightAfterCustomTransitionWithNonextendedEdges

diff --git a/...s/ReferenceImages_iOS_10/ASButtonNodeSnapshotTests/[email protected] b/...s/ReferenceImages_iOS_10/ASButtonNodeSnapshotTests/[email protected]
diff --git a/...ges_iOS_10/ASButtonNodeSnapshotTests/[email protected] b/...ges_iOS_10/ASButtonNodeSnapshotTests/[email protected]
diff --git a/Tests/ReferenceImages_iOS_10/ASButtonNodeSnapshotTests/[email protected] b/Tests/ReferenceImages_iOS_10/ASButtonNodeSnapshotTests/[email protected]
diff --git a/...ges_iOS_10/ASButtonNodeSnapshotTests/[email protected] b/...ges_iOS_10/ASButtonNodeSnapshotTests/[email protected]
diff --git a/...deSnapshotTests/[email protected] b/...deSnapshotTests/[email protected]
diff --git a/...NodeSnapshotTests/[email protected] b/...NodeSnapshotTests/[email protected]
diff --git a/...ges_iOS_10/ASDisplayNodeSnapshotTests/[email protected] b/...ges_iOS_10/ASDisplayNodeSnapshotTests/[email protected]
diff --git a/...ages_iOS_10/ASDisplayNodeSnapshotTests/[email protected] b/...ages_iOS_10/ASDisplayNodeSnapshotTests/[email protected]
diff --git a/...ages_iOS_10/ASDisplayNodeSnapshotTests/[email protected] b/...ages_iOS_10/ASDisplayNodeSnapshotTests/[email protected]
diff --git a/...ages_iOS_10/ASDisplayNodeSnapshotTests/[email protected] b/...ages_iOS_10/ASDisplayNodeSnapshotTests/[email protected]
diff --git a/.../ReferenceImages_iOS_10/ASImageNodeSnapshotTests/[email protected] b/.../ReferenceImages_iOS_10/ASImageNodeSnapshotTests/[email protected]
diff --git a/...ReferenceImages_iOS_10/ASImageNodeSnapshotTests/[email protected] b/...ReferenceImages_iOS_10/ASImageNodeSnapshotTests/[email protected]
diff --git a/Tests/ReferenceImages_iOS_10/ASImageNodeSnapshotTests/[email protected] b/Tests/ReferenceImages_iOS_10/ASImageNodeSnapshotTests/[email protected]
diff --git a/..._iOS_10/ASImageNodeSnapshotTests/[email protected] b/..._iOS_10/ASImageNodeSnapshotTests/[email protected]
diff --git a/..._10/ASStackLayoutSpecSnapshotTests/[email protected] b/..._10/ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...10/ASStackLayoutSpecSnapshotTests/[email protected] b/...10/ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...OS_10/ASStackLayoutSpecSnapshotTests/[email protected] b/...OS_10/ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...iOS_10/ASStackLayoutSpecSnapshotTests/[email protected] b/...iOS_10/ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...mages_iOS_10/ASStackLayoutSpecSnapshotTests/[email protected] b/...mages_iOS_10/ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/..._10/ASTextNode2SnapshotTests/[email protected] b/..._10/ASTextNode2SnapshotTests/[email protected]
diff --git a/...s/testTextContainerInsetIsIncludedWithSmallerConstrainedSize_ASTextNode2@2x.png b/...s/testTextContainerInsetIsIncludedWithSmallerConstrainedSize_ASTextNode2@2x.png
diff --git a/...mages_iOS_10/ASTextNode2SnapshotTests/[email protected] b/...mages_iOS_10/ASTextNode2SnapshotTests/[email protected]
diff --git a/...enceImages_iOS_10/ASTextNode2SnapshotTests/[email protected] b/...enceImages_iOS_10/ASTextNode2SnapshotTests/[email protected]
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_0Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_0Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_1Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_1Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_2Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_2Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_3Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByCharWrapping_3Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_0Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_0Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_1Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_1Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_2Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_2Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_3Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingHead_3Lines@2x.png
diff --git a/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_0Lines@2x.png b/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_0Lines@2x.png
diff --git a/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_1Lines@2x.png b/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_1Lines@2x.png
diff --git a/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_2Lines@2x.png b/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_2Lines@2x.png
diff --git a/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_3Lines@2x.png b/...testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingMiddle_3Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_0Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_0Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_1Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_1Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_2Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_2Lines@2x.png
diff --git a/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_3Lines@2x.png b/...s/testTextTruncationModes_ASTextNode2_NSLineBreakByTruncatingTail_3Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_0Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_0Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_1Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_1Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_2Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_2Lines@2x.png
diff --git a/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_3Lines@2x.png b/...sts/testTextTruncationModes_ASTextNode2_NSLineBreakByWordWrapping_3Lines@2x.png
diff --git a/..._10/ASTextNode2SnapshotTests/[email protected] b/..._10/ASTextNode2SnapshotTests/[email protected]
diff --git a/Tests/ReferenceImages_iOS_10/ASTextNodeSnapshotTests/[email protected] b/Tests/ReferenceImages_iOS_10/ASTextNodeSnapshotTests/[email protected]
diff --git a/...nceImages_iOS_10/ASTextNodeSnapshotTests/[email protected] b/...nceImages_iOS_10/ASTextNodeSnapshotTests/[email protected]
diff --git a/...SnapshotTests/testTextContainerInsetIsIncludedWithSmallerConstrainedSize@2x.png b/...SnapshotTests/testTextContainerInsetIsIncludedWithSmallerConstrainedSize@2x.png
diff --git a/...nceImages_iOS_10/ASTextNodeSnapshotTests/[email protected] b/...nceImages_iOS_10/ASTextNodeSnapshotTests/[email protected]
diff --git a/...s_iOS_10/ASTextNodeSnapshotTests/[email protected] b/...s_iOS_10/ASTextNodeSnapshotTests/[email protected]
diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=10.2,name=iPhone 7}"
-SDK="${TEXTURE_BUILD_SDK:-iphonesimulator12.2}"
+PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=13.0,name=iPhone 7}"
+SDK="${TEXTURE_BUILD_SDK:-iphonesimulator13.0}"
 DERIVED_DATA_PATH="~/ASDKDerivedData"
 
 # It is pitch black.