Skip to content

Commit faff28f

Browse files
committed
Merge remote-tracking branch 'texture/master' into fix-tablenode-accessibility
2 parents 07160ba + e894389 commit faff28f

File tree

262 files changed

+2294
-1432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+2294
-1432
lines changed

.github/workflows/ci-master-only.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
jobs:
99
cocoapods-lint:
1010
env:
11-
DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
11+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
1212
name: Verify that podspec lints
13-
runs-on: macOS-latest
13+
runs-on: macos-latest
1414
steps:
1515
- name: Checkout the Git repository
1616
uses: actions/checkout@v2

.github/workflows/ci-pull-requests-only.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
buildsh:
1010
env:
11-
DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
11+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
1212
strategy:
1313
matrix:
1414
mode: [cocoapods-lint-default-subspecs, cocoapods-lint-other-subspecs]
@@ -18,7 +18,7 @@ jobs:
1818
- mode: cocoapods-lint-other-subspecs
1919
name: Verify that other subspecs lint
2020
name: ${{ matrix.name }}
21-
runs-on: macOS-latest
21+
runs-on: macos-latest
2222
steps:
2323
- name: Checkout the Git repository
2424
uses: actions/checkout@v2

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
55
jobs:
66
buildsh:
77
env:
8-
DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
8+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
99
strategy:
1010
matrix:
1111
mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4]
@@ -27,7 +27,7 @@ jobs:
2727
- mode: examples-pt4
2828
name: Build examples (examples-pt4)
2929
name: ${{ matrix.name }}
30-
runs-on: macOS-latest
30+
runs-on: macos-latest
3131
steps:
3232
- name: Checkout the Git repository
3333
uses: actions/checkout@v2

.github_changelog_generator

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
issues=false
2-
since-tag=3.1.0
3-
future-release=3.2.0
2+
since-tag=3.2.0
3+
future-release=3.3.0

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.3.8

AsyncDisplayKit.xcodeproj/project.pbxproj

Lines changed: 90 additions & 46 deletions
Large diffs are not rendered by default.

AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## [3.2.0](https://github.com/TextureGroup/Texture/tree/3.2.0) (2024-05-21)
4+
5+
[Full Changelog](https://github.com/TextureGroup/Texture/compare/3.1.0...3.2.0)
6+
7+
**Merged pull requests:**
8+
9+
- Update to Xcode 15 [\#2107](https://github.com/TextureGroup/Texture/pull/2107) ([andyfinnell](https://github.com/andyfinnell))
10+
- Fix build errors and a crash in xcode 15 [\#2093](https://github.com/TextureGroup/Texture/pull/2093) ([cacmartinez](https://github.com/cacmartinez))
11+
- Trying to get CI to work [\#2085](https://github.com/TextureGroup/Texture/pull/2085) ([rcancro](https://github.com/rcancro))
12+
- \[ASCellNodeVisibilityEvent\] Add a new event when scrolling stops [\#2084](https://github.com/TextureGroup/Texture/pull/2084) ([rcancro](https://github.com/rcancro))
13+
- Docs: Fix references of ASViewController/ASNavigationController \(non-existent\) to ASDKViewController/ASDKNavigationController [\#2072](https://github.com/TextureGroup/Texture/pull/2072) ([JoeFerrucci](https://github.com/JoeFerrucci))
14+
- fix typo: ASStackLayoutElement.h [\#2067](https://github.com/TextureGroup/Texture/pull/2067) ([Ueeek](https://github.com/Ueeek))
15+
- \[ASTextKitRenderer\] Adding locking when accessing the text renderer cache [\#2075](https://github.com/TextureGroup/Texture/pull/2075) ([rcancro](https://github.com/rcancro))
16+
- Switch UITextWritingDirection to NSWritingDirection [\#2071](https://github.com/TextureGroup/Texture/pull/2071) ([garrettmoon](https://github.com/garrettmoon))
17+
- Increase default diskCache byte limit from 20 to 50MB\(PINCache default\) [\#2002](https://github.com/TextureGroup/Texture/pull/2002) ([MussaCharles](https://github.com/MussaCharles))
18+
- Bring back ASInitializeFrameworkMainThread so we don't break the API [\#2050](https://github.com/TextureGroup/Texture/pull/2050) ([rcancro](https://github.com/rcancro))
19+
- Try to fix the CI [\#2047](https://github.com/TextureGroup/Texture/pull/2047) ([rcancro](https://github.com/rcancro))
20+
- Xcode 13 ASLoadFrameworkInitializer dead lock fix on running unit test [\#2032](https://github.com/TextureGroup/Texture/pull/2032) ([GeekTree0101](https://github.com/GeekTree0101))
21+
322
## [3.1.0](https://github.com/TextureGroup/Texture/tree/3.1.0) (2021-09-09)
423

524
[Full Changelog](https://github.com/TextureGroup/Texture/compare/3.0.0...3.1.0)

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "pinterest/PINRemoteImage" "3.0.0-beta.14"
2-
github "pinterest/PINCache" "3.0.1-beta.7"
1+
github "pinterest/PINRemoteImage" "3.0.4"
2+
github "pinterest/PINCache" "3.0.4"

Cartfile.resolved

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
git "https://chromium.googlesource.com/webm/libwebp" "v0.6.0"
2-
github "pinterest/PINCache" "3.0.1-beta.7"
3-
github "pinterest/PINOperation" "1.1.2"
4-
github "pinterest/PINRemoteImage" "3.0.0-beta.14"
1+
github "pinterest/PINCache" "3.0.4"
2+
github "pinterest/PINOperation" "1.2.3"
3+
github "pinterest/PINRemoteImage" "3.0.4"

0 commit comments

Comments
 (0)