Merge from https://github.com/TextureGroup/Texture

ASalavei · Aug 20, 2020 · 0cf562c · 0cf562c
2 parents 4eb7085 + d608bb9
commit 0cf562c
Show file tree

Hide file tree

Showing 387 changed files with 2,306 additions and 1,216 deletions.
diff --git a/.github/workflows/ci-master-only.yml b/.github/workflows/ci-master-only.yml
@@ -8,11 +8,11 @@ on:
 jobs:
   cocoapods-lint:
     env: 
-        DEVELOPER_DIR: /Applications/Xcode_11.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
     name: Verify that podspec lints
     runs-on: macOS-latest
     steps:
     - name: Checkout the Git repository
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Run build.sh with cocoapods-lint mode
       run: ./build.sh cocoapods-lint
diff --git a/.github/workflows/ci-pull-requests-only.yml b/.github/workflows/ci-pull-requests-only.yml
@@ -0,0 +1,26 @@
+name: CI (pull-requests-only jobs)
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  buildsh:
+    env:
+        DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
+    strategy:
+      matrix:
+        mode: [cocoapods-lint-default-subspecs, cocoapods-lint-other-subspecs]
+        include:
+          - mode: cocoapods-lint-default-subspecs
+            name: Verify that default subspecs lint
+          - mode: cocoapods-lint-other-subspecs
+            name: Verify that other subspecs lint
+    name: ${{ matrix.name }}
+    runs-on: macOS-latest
+    steps:
+    - name: Checkout the Git repository
+      uses: actions/checkout@v2
+    - name: Run build script
+      run: ./build.sh ${{ matrix.mode }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   buildsh:
     env:
-        DEVELOPER_DIR: /Applications/Xcode_11.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
     strategy:
       matrix:
         mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4]
@@ -30,6 +30,6 @@ jobs:
     runs-on: macOS-latest
     steps:
     - name: Checkout the Git repository
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Run build script
-      run: ./build.sh ${{ matrix.mode }}
+      run: ./build.sh ${{ matrix.mode }}
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -1,3 +1,3 @@
 issues=false
-since-tag=2.8.1
-future-release=2.9
+since-tag=3.0.0-rc.2
+future-release=3.0.0
diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
diff --git a/AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme b/AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B35061D91B010EDF0018CF92"
+            BuildableName = "AsyncDisplayKit.framework"
+            BlueprintName = "AsyncDisplayKit"
+            ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -38,23 +47,15 @@
                ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "ASCALayerTests">
+               </Test>
                <Test
                   Identifier = "ASTextNodePerformanceTests">
                </Test>
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B35061D91B010EDF0018CF92"
-            BuildableName = "AsyncDisplayKit.framework"
-            BlueprintName = "AsyncDisplayKit"
-            ReferencedContainer = "container:AsyncDisplayKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -82,8 +83,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"