From 8ab7a21d8ff66b1b52dcea9389d33c6b651a5af6 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Wed, 10 Jan 2024 15:53:37 -0800 Subject: [PATCH 01/15] Update CI to build for visionOS --- .github/workflows/main.yml | 88 ++++++++++++++++++++++---------------- Rakefile | 7 +-- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89d3770549..d52fa55ecc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - build-package-macos-13: + build-package-no-visionOS: name: "Build Package" runs-on: macos-13 strategy: @@ -16,17 +16,32 @@ jobs: xcode: - '14.1' # Swift 5.7 - '14.3' # Swift 5.8 - - '15.0' # Swift 5.9 steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup with: xcode: ${{ matrix.xcode }} - name: Build Package - # Once there is a production Xcode version with the visionOS SDK, - # we will want to use that version without `SKIP_VISION_OS=true` + # Only Xcode 15.2 and later support visionOS, so exclude it on earlier versions. run: SKIP_VISION_OS=true bundle exec rake build:package:all + build-package: + name: "Build Package" + runs-on: macos-13 + strategy: + fail-fast: false + matrix: + xcode: + - '15.2' # Swift 5.9 + steps: + - uses: actions/checkout@v2 + - uses: ./.github/actions/setup + with: + xcode: ${{ matrix.xcode }} + - name: Build Package + run: bundle exec rake build:package:all + + build-example: name: "Build Example App" runs-on: macos-13 @@ -34,11 +49,9 @@ jobs: - uses: actions/checkout@v2 - uses: ./.github/actions/setup with: - xcode: '15.0' # Swift 5.9 + xcode: '15.2' # Swift 5.9 - name: Build Example - # Once there is a production Xcode version with the visionOS SDK, - # we will want to remove `SKIP_VISION_OS=true` - run: SKIP_VISION_OS=true bundle exec rake build:example:all + run: bundle exec rake build:example:all test-package: name: "Test Package" @@ -47,7 +60,7 @@ jobs: - uses: actions/checkout@v2 - uses: ./.github/actions/setup with: - xcode: '15.0' # Swift 5.9 + xcode: '15.2' # Swift 5.9 - name: Test Package run: bundle exec rake test:package - name: Process test artifacts @@ -72,7 +85,7 @@ jobs: EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_TOKEN }} PR_NUMBER: ${{ github.event.number }} - build-xcframework-macos-13: + build-xcframework-minimum-supported-version: name: "Build XCFramework" runs-on: macos-13 strategy: @@ -83,6 +96,8 @@ jobs: # will be able to use these XCFrameworks and the lottie-spm package. # This should be the minimum Xcode version permitted by the App Store. # As of April 2023, this is Xcode 14.1: https://developer.apple.com/news/?id=jd9wcyov + # - TODO: Once this minimum supported Xcode version is 15.2 or later, + # we can remove the `build-xcframework-with-visionOS-support` job below. - '14.1' # Swift 5.7.1 steps: - uses: actions/checkout@v2 @@ -95,19 +110,36 @@ jobs: with: xcode: ${{ matrix.xcode }} - name: Build XCFramework - # Once there is a production Xcode version with the visionOS SDK, we will - # need to also build an XCFramework using that version but without `SKIP_VISION_OS=true` run: SKIP_VISION_OS=true bundle exec rake build:xcframework[Lottie-Xcode-${{ matrix.xcode }}] - name: Upload XCFramework uses: actions/upload-artifact@v2 with: name: BuildProducts - # The xcframework is at the path `.build/archives/Lottie.xcframework.zip`. - # GitHub always zips the artifacts before uploading, so if we uploaded the .xframework.zip - # directly then it would actually upload a double-zip (a .zip containing our `Lottie.xcframework.zip`). - # This is confusing especially since macOS Archive Utility automatially unzips both layers at once. - # Instead, we upload the entire archives folder, resulting in an `XCFramework.zip` that unzips - # to an `archives` directory containing our `Lottie.xcframework.zip`. + path: .build/archives + + build-xcframework-with-visionOS-support: + name: "Build XCFramework" + runs-on: macos-13 + strategy: + matrix: + xcode: + - '15.2' # Swift 5.9.2, first Xcode version with visionOS support. + steps: + - uses: actions/checkout@v2 + - uses: apple-actions/import-codesign-certs@v2 + continue-on-error: true + with: + p12-file-base64: ${{ secrets.SIGNING_CERTIFICATE_BASE_64 }} + p12-password: ${{ secrets.SIGNING_CERTIFICATE_PASSWORD }} + - uses: ./.github/actions/setup + with: + xcode: ${{ matrix.xcode }} + - name: Build XCFramework + run: bundle exec rake build:xcframework[Lottie-Xcode-${{ matrix.xcode }}] + - name: Upload XCFramework + uses: actions/upload-artifact@v2 + with: + name: BuildProducts path: .build/archives cocoapod: @@ -127,7 +159,7 @@ jobs: strategy: matrix: xcode: - - '15.0' # Swift 5.9 + - '15.2' # Swift 5.9 steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup @@ -137,22 +169,6 @@ jobs: - name: Test Swift Package Manager support run: bundle exec rake test:spm - spm-xcode-14: - name: "Test Swift Package Manager" - runs-on: macos-13 - strategy: - matrix: - xcode: - - '15.0' # Swift 5.9 - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/setup - with: - install-mint: true - xcode: ${{ matrix.xcode }} - - name: Test Swift Package Manager support - run: SKIP_VISION_OS=true bundle exec rake test:spm - carthage: name: "Test Carthage support" runs-on: macos-13 @@ -162,7 +178,7 @@ jobs: with: install-mint: true install-carthage: true - xcode: '15.0' # Swift 5.9 + xcode: '15.2' # Swift 5.9 - name: Test Carthage support run: bundle exec rake test:carthage diff --git a/Rakefile b/Rakefile index 4358b517a0..0e69f3c3e4 100644 --- a/Rakefile +++ b/Rakefile @@ -247,16 +247,11 @@ def xcodebuild(command) end # Runs the given code block, unless `SKIP_VISION_OS=true`. -# This can be removed once CI only uses Xcode 15+. +# TODO: Remove this once CI only uses Xcode 15.2+. def ifVisionOSEnabled if ENV["SKIP_VISION_OS"] == "true" puts "Skipping visionOS build" else - # As of 9/5/23 the GitHub Actions runner doesn't include the visionOS SDK by default, - # so we have to download it manually. Following the suggested workaround from - # https://github.com/actions/runner-images/issues/8144#issuecomment-1702786388 - `brew install xcodesorg/made/xcodes` - `xcodes runtimes install 'visionOS 1.0-beta3'` yield end end From 449e685f6e79d92a94f9d6ad62c1657e318c930e Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Fri, 12 Jan 2024 10:05:02 -0800 Subject: [PATCH 02/15] test build with verbose logging --- Rakefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index 0e69f3c3e4..ac735bed41 100644 --- a/Rakefile +++ b/Rakefile @@ -239,11 +239,14 @@ def xcodebuild(command) # Check if the mint tool is installed -- if so, pipe the xcodebuild output through xcbeautify `which mint` - if $?.success? - sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" - else + ## + ## TODO: REVERT, TESTING WITH VERBOSE LOGGING + ## + # if $?.success? + # sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" + # else sh "xcodebuild #{command}" - end + # end end # Runs the given code block, unless `SKIP_VISION_OS=true`. From 4ee1f10cd85ea02619db823aebd14d309558b195 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Fri, 12 Jan 2024 10:25:56 -0800 Subject: [PATCH 03/15] Disable flaky test --- Tests/AnimationViewTests.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/AnimationViewTests.swift b/Tests/AnimationViewTests.swift index 9b2268b32b..882304e01d 100644 --- a/Tests/AnimationViewTests.swift +++ b/Tests/AnimationViewTests.swift @@ -48,7 +48,9 @@ final class AnimationViewTests: XCTestCase { expectation.fulfill() }) - wait(for: [expectation], timeout: 1.0) + XCTExpectFailure("This test case has been flaky in CI", strict: false) { + wait(for: [expectation], timeout: 1.0) + } } func testLoadDotLottieFileAsyncWithDidLoadClosure() { From 336ccff046b4e7ea59364314b89b4f7e8df8e09d Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Fri, 12 Jan 2024 10:26:52 -0800 Subject: [PATCH 04/15] Download visionOS platform if necessary --- Rakefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rakefile b/Rakefile index ac735bed41..a118e4985f 100644 --- a/Rakefile +++ b/Rakefile @@ -255,6 +255,8 @@ def ifVisionOSEnabled if ENV["SKIP_VISION_OS"] == "true" puts "Skipping visionOS build" else + # Download visionOS SDK if necessary + xcodebuild("-downloadPlatform visionOS") yield end end From 3e9aa58719fde2dd28e9afd83edaa7ed34b045c0 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Fri, 12 Jan 2024 10:34:57 -0800 Subject: [PATCH 05/15] Revert "test build with verbose logging" This reverts commit 449e685f6e79d92a94f9d6ad62c1657e318c930e. --- Rakefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index a118e4985f..97d10a0044 100644 --- a/Rakefile +++ b/Rakefile @@ -239,14 +239,11 @@ def xcodebuild(command) # Check if the mint tool is installed -- if so, pipe the xcodebuild output through xcbeautify `which mint` - ## - ## TODO: REVERT, TESTING WITH VERBOSE LOGGING - ## - # if $?.success? - # sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" - # else + if $?.success? + sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" + else sh "xcodebuild #{command}" - # end + end end # Runs the given code block, unless `SKIP_VISION_OS=true`. From 40666874d072f804fe7967cdfb079b8290d7dbb1 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Fri, 12 Jan 2024 10:34:58 -0800 Subject: [PATCH 06/15] Revert "Download visionOS platform if necessary" This reverts commit 336ccff046b4e7ea59364314b89b4f7e8df8e09d. --- Rakefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rakefile b/Rakefile index 97d10a0044..0e69f3c3e4 100644 --- a/Rakefile +++ b/Rakefile @@ -252,8 +252,6 @@ def ifVisionOSEnabled if ENV["SKIP_VISION_OS"] == "true" puts "Skipping visionOS build" else - # Download visionOS SDK if necessary - xcodebuild("-downloadPlatform visionOS") yield end end From 108b2130cc7ac856f679b3f58241306482dfb0f0 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Fri, 12 Jan 2024 10:40:56 -0800 Subject: [PATCH 07/15] Use macos-13-xlarge runner (Apple Silicon) for jobs that build for visionOS --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d52fa55ecc..ee2fcbeec3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: build-package: name: "Build Package" - runs-on: macos-13 + runs-on: macos-13-xlarge strategy: fail-fast: false matrix: @@ -44,7 +44,7 @@ jobs: build-example: name: "Build Example App" - runs-on: macos-13 + runs-on: macos-13-xlarge steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup @@ -119,7 +119,7 @@ jobs: build-xcframework-with-visionOS-support: name: "Build XCFramework" - runs-on: macos-13 + runs-on: macos-13-xlarge strategy: matrix: xcode: @@ -155,7 +155,7 @@ jobs: spm-xcode-15: name: "Test Swift Package Manager" - runs-on: macos-13 + runs-on: macos-13-xlarge strategy: matrix: xcode: @@ -171,7 +171,7 @@ jobs: carthage: name: "Test Carthage support" - runs-on: macos-13 + runs-on: macos-13-xlarge steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup From b3ffe68e64b3be0bb193a4d5d90bae8a5bc92679 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Sat, 20 Jan 2024 08:25:25 -0800 Subject: [PATCH 08/15] Revert "Revert "Download visionOS platform if necessary"" This reverts commit 40666874d072f804fe7967cdfb079b8290d7dbb1. --- Rakefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rakefile b/Rakefile index 0e69f3c3e4..97d10a0044 100644 --- a/Rakefile +++ b/Rakefile @@ -252,6 +252,8 @@ def ifVisionOSEnabled if ENV["SKIP_VISION_OS"] == "true" puts "Skipping visionOS build" else + # Download visionOS SDK if necessary + xcodebuild("-downloadPlatform visionOS") yield end end From 3c6124843620ceb04063ea04acc7ebac6c15c24a Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Sat, 20 Jan 2024 08:25:34 -0800 Subject: [PATCH 09/15] Revert "Use macos-13-xlarge runner (Apple Silicon) for jobs that build for visionOS" This reverts commit 108b2130cc7ac856f679b3f58241306482dfb0f0. --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee2fcbeec3..d52fa55ecc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: build-package: name: "Build Package" - runs-on: macos-13-xlarge + runs-on: macos-13 strategy: fail-fast: false matrix: @@ -44,7 +44,7 @@ jobs: build-example: name: "Build Example App" - runs-on: macos-13-xlarge + runs-on: macos-13 steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup @@ -119,7 +119,7 @@ jobs: build-xcframework-with-visionOS-support: name: "Build XCFramework" - runs-on: macos-13-xlarge + runs-on: macos-13 strategy: matrix: xcode: @@ -155,7 +155,7 @@ jobs: spm-xcode-15: name: "Test Swift Package Manager" - runs-on: macos-13-xlarge + runs-on: macos-13 strategy: matrix: xcode: @@ -171,7 +171,7 @@ jobs: carthage: name: "Test Carthage support" - runs-on: macos-13-xlarge + runs-on: macos-13 steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup From 1223abcd892bc8c48b06101fe34237a8e181e829 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Sat, 20 Jan 2024 08:27:58 -0800 Subject: [PATCH 10/15] Enable visionOS support on Intel --- Rakefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Rakefile b/Rakefile index 97d10a0044..8a6956e453 100644 --- a/Rakefile +++ b/Rakefile @@ -252,8 +252,14 @@ def ifVisionOSEnabled if ENV["SKIP_VISION_OS"] == "true" puts "Skipping visionOS build" else + # visionOS is unsupported by default on Intel, but we can override this + # https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070 + sh 'defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES' + sh 'defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES' + # Download visionOS SDK if necessary xcodebuild("-downloadPlatform visionOS") + yield end end From a5f6128219691cf533227c12365bffa365c730cd Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Sat, 20 Jan 2024 09:51:38 -0800 Subject: [PATCH 11/15] Install visionOS before testing Carthage support, update CarthageTest to support visionOS and tvOS --- Rakefile | 30 +- .../CarthageTest-macOS/AppDelegate.swift | 7 - .../AccentColor.colorset/Contents.json | 11 - .../AppIcon.appiconset/Contents.json | 58 -- .../Assets.xcassets/Contents.json | 6 - .../Base.lproj/Main.storyboard | 717 ------------------ .../CarthageTest-macOS/ViewController.swift | 15 - .../CarthageTest.xcodeproj/project.pbxproj | 338 +++------ .../CarthageTest/AppDelegate.swift | 26 - .../AccentColor.colorset/Contents.json | 11 - .../AppIcon.appiconset/Contents.json | 98 --- .../Assets.xcassets/Contents.json | 6 - .../Base.lproj/LaunchScreen.storyboard | 25 - .../CarthageTest/Base.lproj/Main.storyboard | 24 - .../CarthageTest.entitlements} | 0 .../CarthageTest/CarthageTestApp.swift | 13 + .../CarthageTest/ContentView.swift | 18 + script/test-carthage/CarthageTest/Info.plist | 66 -- .../CarthageTest/LottieLogo1.json | 1 + .../CarthageTest/SceneDelegate.swift | 10 - .../CarthageTest/ViewController.swift | 15 - 21 files changed, 147 insertions(+), 1348 deletions(-) delete mode 100644 script/test-carthage/CarthageTest-macOS/AppDelegate.swift delete mode 100644 script/test-carthage/CarthageTest-macOS/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 script/test-carthage/CarthageTest-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 script/test-carthage/CarthageTest-macOS/Assets.xcassets/Contents.json delete mode 100644 script/test-carthage/CarthageTest-macOS/Base.lproj/Main.storyboard delete mode 100644 script/test-carthage/CarthageTest-macOS/ViewController.swift delete mode 100644 script/test-carthage/CarthageTest/AppDelegate.swift delete mode 100644 script/test-carthage/CarthageTest/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 script/test-carthage/CarthageTest/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 script/test-carthage/CarthageTest/Assets.xcassets/Contents.json delete mode 100644 script/test-carthage/CarthageTest/Base.lproj/LaunchScreen.storyboard delete mode 100644 script/test-carthage/CarthageTest/Base.lproj/Main.storyboard rename script/test-carthage/{CarthageTest-macOS/CarthageTest_macOS.entitlements => CarthageTest/CarthageTest.entitlements} (100%) create mode 100644 script/test-carthage/CarthageTest/CarthageTestApp.swift create mode 100644 script/test-carthage/CarthageTest/ContentView.swift delete mode 100644 script/test-carthage/CarthageTest/Info.plist create mode 100755 script/test-carthage/CarthageTest/LottieLogo1.json delete mode 100644 script/test-carthage/CarthageTest/SceneDelegate.swift delete mode 100644 script/test-carthage/CarthageTest/ViewController.swift diff --git a/Rakefile b/Rakefile index 8a6956e453..bf58a29aa3 100644 --- a/Rakefile +++ b/Rakefile @@ -146,7 +146,9 @@ namespace :test do sh 'cp -R [^script]* script/test-carthage/Carthage/Checkouts/lottie-ios' Dir.chdir('script/test-carthage') do - # Build the LottieCarthage framework scheme + installVisionOSIfNecessary() + + # Build the Lottie framework scheme sh 'carthage build --use-xcframeworks' # Delete Carthage's derived data to verify that the built .xcframework doesn't depend on any @@ -154,9 +156,11 @@ namespace :test do # https://github.com/airbnb/lottie-ios/issues/1492 sh 'rm -rf ~/Library/Caches/org.carthage.CarthageKit/DerivedData' - # Build a test app that imports and uses the LottieCarthage framework - xcodebuild('build -scheme CarthageTest -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)"') - xcodebuild('build -scheme CarthageTest-macOS') + # Build a test app that imports and uses the Lottie framework built via Carthage + xcodebuild('build -scheme CarthageTest -destination generic/platform=iOS') + xcodebuild('build -scheme CarthageTest -destination generic/platform=macOS') + xcodebuild('build -scheme CarthageTest -destination generic/platform=tvOS') + xcodebuild('build -scheme CarthageTest -destination generic/platform=visionOS') end end @@ -252,14 +256,16 @@ def ifVisionOSEnabled if ENV["SKIP_VISION_OS"] == "true" puts "Skipping visionOS build" else - # visionOS is unsupported by default on Intel, but we can override this - # https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070 - sh 'defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES' - sh 'defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES' - - # Download visionOS SDK if necessary - xcodebuild("-downloadPlatform visionOS") - + installVisionOSIfNecessary() yield end end + +def installVisionOSIfNecessary + # visionOS is unsupported by default on Intel, but we can override this + # https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070 + sh 'defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES' + sh 'defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES' + + xcodebuild("-downloadPlatform visionOS") +end diff --git a/script/test-carthage/CarthageTest-macOS/AppDelegate.swift b/script/test-carthage/CarthageTest-macOS/AppDelegate.swift deleted file mode 100644 index 7f89ec001b..0000000000 --- a/script/test-carthage/CarthageTest-macOS/AppDelegate.swift +++ /dev/null @@ -1,7 +0,0 @@ -// Created by Cal Stephens on 7/8/22. -// Copyright © 2022 Airbnb Inc. All rights reserved. - -import Cocoa - -@main -class AppDelegate: NSObject, NSApplicationDelegate { } diff --git a/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AccentColor.colorset/Contents.json b/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897008..0000000000 --- a/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 3f00db43ec..0000000000 --- a/script/test-carthage/CarthageTest-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/script/test-carthage/CarthageTest-macOS/Assets.xcassets/Contents.json b/script/test-carthage/CarthageTest-macOS/Assets.xcassets/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/script/test-carthage/CarthageTest-macOS/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/script/test-carthage/CarthageTest-macOS/Base.lproj/Main.storyboard b/script/test-carthage/CarthageTest-macOS/Base.lproj/Main.storyboard deleted file mode 100644 index b998eceaf5..0000000000 --- a/script/test-carthage/CarthageTest-macOS/Base.lproj/Main.storyboard +++ /dev/null @@ -1,717 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/script/test-carthage/CarthageTest-macOS/ViewController.swift b/script/test-carthage/CarthageTest-macOS/ViewController.swift deleted file mode 100644 index a799357995..0000000000 --- a/script/test-carthage/CarthageTest-macOS/ViewController.swift +++ /dev/null @@ -1,15 +0,0 @@ -// Created by Cal Stephens on 7/8/22. -// Copyright © 2022 Airbnb Inc. All rights reserved. - -import Cocoa -import Lottie - -class ViewController: NSViewController { - - override func viewDidLoad() { - super.viewDidLoad() - let animationView = LottieAnimationView() - view.addSubview(animationView) - } - -} diff --git a/script/test-carthage/CarthageTest.xcodeproj/project.pbxproj b/script/test-carthage/CarthageTest.xcodeproj/project.pbxproj index 7e0d5f8850..a0aceea8f8 100644 --- a/script/test-carthage/CarthageTest.xcodeproj/project.pbxproj +++ b/script/test-carthage/CarthageTest.xcodeproj/project.pbxproj @@ -3,45 +3,25 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 08B627792878AE70004526F1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08B627782878AE70004526F1 /* AppDelegate.swift */; }; - 08B6277B2878AE70004526F1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08B6277A2878AE70004526F1 /* ViewController.swift */; }; - 08B6277D2878AE72004526F1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 08B6277C2878AE72004526F1 /* Assets.xcassets */; }; - 08B627802878AE72004526F1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 08B6277E2878AE72004526F1 /* Main.storyboard */; }; - 08B627852878B04E004526F1 /* Lottie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */; }; - 08B627862878B04E004526F1 /* Lottie.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 2E6DBE0327723E0900EBD89E /* Lottie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */; }; - 2E6DBE0427723E0900EBD89E /* Lottie.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 2ED64E5F2770FAB2006AA0F3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED64E5E2770FAB2006AA0F3 /* AppDelegate.swift */; }; - 2ED64E612770FAB2006AA0F3 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED64E602770FAB2006AA0F3 /* SceneDelegate.swift */; }; - 2ED64E632770FAB2006AA0F3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED64E622770FAB2006AA0F3 /* ViewController.swift */; }; - 2ED64E662770FAB2006AA0F3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2ED64E642770FAB2006AA0F3 /* Main.storyboard */; }; - 2ED64E682770FAB3006AA0F3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2ED64E672770FAB3006AA0F3 /* Assets.xcassets */; }; - 2ED64E6B2770FAB3006AA0F3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2ED64E692770FAB3006AA0F3 /* LaunchScreen.storyboard */; }; + 2E47CCBC2B5C3BD500FBAB56 /* CarthageTestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E47CCBB2B5C3BD500FBAB56 /* CarthageTestApp.swift */; }; + 2E47CCBE2B5C3BD500FBAB56 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E47CCBD2B5C3BD500FBAB56 /* ContentView.swift */; }; + 2E47CCC92B5C3C8D00FBAB56 /* LottieLogo1.json in Resources */ = {isa = PBXBuildFile; fileRef = 2E47CCC82B5C3C8D00FBAB56 /* LottieLogo1.json */; }; + 2E47CCCA2B5C47C400FBAB56 /* Lottie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */; }; + 2E47CCCB2B5C47C400FBAB56 /* Lottie.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 08B627872878B04E004526F1 /* Embed Frameworks */ = { + 2E47CCCC2B5C47C400FBAB56 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 08B627862878B04E004526F1 /* Lottie.xcframework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 2E6DBE0527723E0900EBD89E /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 2E6DBE0427723E0900EBD89E /* Lottie.xcframework in Embed Frameworks */, + 2E47CCCB2B5C47C400FBAB56 /* Lottie.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -49,60 +29,41 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 08B627762878AE70004526F1 /* CarthageTest-macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "CarthageTest-macOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 08B627782878AE70004526F1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 08B6277A2878AE70004526F1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 08B6277C2878AE72004526F1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 08B6277F2878AE72004526F1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 08B627812878AE72004526F1 /* CarthageTest_macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CarthageTest_macOS.entitlements; sourceTree = ""; }; - 2ED64E5B2770FAB2006AA0F3 /* CarthageTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CarthageTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 2ED64E5E2770FAB2006AA0F3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 2ED64E602770FAB2006AA0F3 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 2ED64E622770FAB2006AA0F3 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 2ED64E652770FAB2006AA0F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 2ED64E672770FAB3006AA0F3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 2ED64E6A2770FAB3006AA0F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 2ED64E6C2770FAB3006AA0F3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 2E47CCB92B5C3BD400FBAB56 /* CarthageTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CarthageTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 2E47CCBB2B5C3BD500FBAB56 /* CarthageTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarthageTestApp.swift; sourceTree = ""; }; + 2E47CCBD2B5C3BD500FBAB56 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 2E47CCC12B5C3BD600FBAB56 /* CarthageTest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CarthageTest.entitlements; sourceTree = ""; }; + 2E47CCC82B5C3C8D00FBAB56 /* LottieLogo1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = LottieLogo1.json; sourceTree = ""; }; 2ED64E792770FBE1006AA0F3 /* Lottie.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Lottie.xcframework; path = Carthage/Build/Lottie.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 08B627732878AE70004526F1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 08B627852878B04E004526F1 /* Lottie.xcframework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2ED64E582770FAB2006AA0F3 /* Frameworks */ = { + 2E47CCB62B5C3BD400FBAB56 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2E6DBE0327723E0900EBD89E /* Lottie.xcframework in Frameworks */, + 2E47CCCA2B5C47C400FBAB56 /* Lottie.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 08B627772878AE70004526F1 /* CarthageTest-macOS */ = { + 2E47CCBA2B5C3BD400FBAB56 /* CarthageTest */ = { isa = PBXGroup; children = ( - 08B627782878AE70004526F1 /* AppDelegate.swift */, - 08B6277A2878AE70004526F1 /* ViewController.swift */, - 08B6277C2878AE72004526F1 /* Assets.xcassets */, - 08B6277E2878AE72004526F1 /* Main.storyboard */, - 08B627812878AE72004526F1 /* CarthageTest_macOS.entitlements */, + 2E47CCBB2B5C3BD500FBAB56 /* CarthageTestApp.swift */, + 2E47CCBD2B5C3BD500FBAB56 /* ContentView.swift */, + 2E47CCC82B5C3C8D00FBAB56 /* LottieLogo1.json */, + 2E47CCC12B5C3BD600FBAB56 /* CarthageTest.entitlements */, ); - path = "CarthageTest-macOS"; + path = CarthageTest; sourceTree = ""; }; 2ED64E522770FAB2006AA0F3 = { isa = PBXGroup; children = ( - 2ED64E5D2770FAB2006AA0F3 /* CarthageTest */, - 08B627772878AE70004526F1 /* CarthageTest-macOS */, + 2E47CCBA2B5C3BD400FBAB56 /* CarthageTest */, 2ED64E5C2770FAB2006AA0F3 /* Products */, 2ED64E722770FABF006AA0F3 /* Frameworks */, ); @@ -111,26 +72,11 @@ 2ED64E5C2770FAB2006AA0F3 /* Products */ = { isa = PBXGroup; children = ( - 2ED64E5B2770FAB2006AA0F3 /* CarthageTest.app */, - 08B627762878AE70004526F1 /* CarthageTest-macOS.app */, + 2E47CCB92B5C3BD400FBAB56 /* CarthageTest.app */, ); name = Products; sourceTree = ""; }; - 2ED64E5D2770FAB2006AA0F3 /* CarthageTest */ = { - isa = PBXGroup; - children = ( - 2ED64E5E2770FAB2006AA0F3 /* AppDelegate.swift */, - 2ED64E602770FAB2006AA0F3 /* SceneDelegate.swift */, - 2ED64E622770FAB2006AA0F3 /* ViewController.swift */, - 2ED64E642770FAB2006AA0F3 /* Main.storyboard */, - 2ED64E672770FAB3006AA0F3 /* Assets.xcassets */, - 2ED64E692770FAB3006AA0F3 /* LaunchScreen.storyboard */, - 2ED64E6C2770FAB3006AA0F3 /* Info.plist */, - ); - path = CarthageTest; - sourceTree = ""; - }; 2ED64E722770FABF006AA0F3 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -142,32 +88,14 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 08B627752878AE70004526F1 /* CarthageTest-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 08B627842878AE72004526F1 /* Build configuration list for PBXNativeTarget "CarthageTest-macOS" */; - buildPhases = ( - 08B627722878AE70004526F1 /* Sources */, - 08B627732878AE70004526F1 /* Frameworks */, - 08B627742878AE70004526F1 /* Resources */, - 08B627872878B04E004526F1 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "CarthageTest-macOS"; - productName = "CarthageTest-macOS"; - productReference = 08B627762878AE70004526F1 /* CarthageTest-macOS.app */; - productType = "com.apple.product-type.application"; - }; - 2ED64E5A2770FAB2006AA0F3 /* CarthageTest */ = { + 2E47CCB82B5C3BD400FBAB56 /* CarthageTest */ = { isa = PBXNativeTarget; - buildConfigurationList = 2ED64E6F2770FAB3006AA0F3 /* Build configuration list for PBXNativeTarget "CarthageTest" */; + buildConfigurationList = 2E47CCC52B5C3BD600FBAB56 /* Build configuration list for PBXNativeTarget "CarthageTest" */; buildPhases = ( - 2ED64E572770FAB2006AA0F3 /* Sources */, - 2ED64E582770FAB2006AA0F3 /* Frameworks */, - 2ED64E592770FAB2006AA0F3 /* Resources */, - 2E6DBE0527723E0900EBD89E /* Embed Frameworks */, + 2E47CCB52B5C3BD400FBAB56 /* Sources */, + 2E47CCB62B5C3BD400FBAB56 /* Frameworks */, + 2E47CCB72B5C3BD400FBAB56 /* Resources */, + 2E47CCCC2B5C47C400FBAB56 /* Embed Frameworks */, ); buildRules = ( ); @@ -175,7 +103,7 @@ ); name = CarthageTest; productName = CarthageTest; - productReference = 2ED64E5B2770FAB2006AA0F3 /* CarthageTest.app */; + productReference = 2E47CCB92B5C3BD400FBAB56 /* CarthageTest.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -184,14 +112,11 @@ 2ED64E532770FAB2006AA0F3 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1330; + LastSwiftUpdateCheck = 1520; LastUpgradeCheck = 1250; TargetAttributes = { - 08B627752878AE70004526F1 = { - CreatedOnToolsVersion = 13.3.1; - }; - 2ED64E5A2770FAB2006AA0F3 = { - CreatedOnToolsVersion = 12.5.1; + 2E47CCB82B5C3BD400FBAB56 = { + CreatedOnToolsVersion = 15.2; }; }; }; @@ -208,137 +133,115 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 2ED64E5A2770FAB2006AA0F3 /* CarthageTest */, - 08B627752878AE70004526F1 /* CarthageTest-macOS */, + 2E47CCB82B5C3BD400FBAB56 /* CarthageTest */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 08B627742878AE70004526F1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 08B6277D2878AE72004526F1 /* Assets.xcassets in Resources */, - 08B627802878AE72004526F1 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2ED64E592770FAB2006AA0F3 /* Resources */ = { + 2E47CCB72B5C3BD400FBAB56 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2ED64E6B2770FAB3006AA0F3 /* LaunchScreen.storyboard in Resources */, - 2ED64E682770FAB3006AA0F3 /* Assets.xcassets in Resources */, - 2ED64E662770FAB2006AA0F3 /* Main.storyboard in Resources */, + 2E47CCC92B5C3C8D00FBAB56 /* LottieLogo1.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 08B627722878AE70004526F1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 08B6277B2878AE70004526F1 /* ViewController.swift in Sources */, - 08B627792878AE70004526F1 /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2ED64E572770FAB2006AA0F3 /* Sources */ = { + 2E47CCB52B5C3BD400FBAB56 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2ED64E632770FAB2006AA0F3 /* ViewController.swift in Sources */, - 2ED64E5F2770FAB2006AA0F3 /* AppDelegate.swift in Sources */, - 2ED64E612770FAB2006AA0F3 /* SceneDelegate.swift in Sources */, + 2E47CCBE2B5C3BD500FBAB56 /* ContentView.swift in Sources */, + 2E47CCBC2B5C3BD500FBAB56 /* CarthageTestApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXVariantGroup section */ - 08B6277E2878AE72004526F1 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 08B6277F2878AE72004526F1 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 2ED64E642770FAB2006AA0F3 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2ED64E652770FAB2006AA0F3 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 2ED64E692770FAB3006AA0F3 /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2ED64E6A2770FAB3006AA0F3 /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ - 08B627822878AE72004526F1 /* Debug */ = { + 2E47CCC62B5C3BD600FBAB56 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CODE_SIGN_ENTITLEMENTS = "CarthageTest-macOS/CarthageTest_macOS.entitlements"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CODE_SIGN_ENTITLEMENTS = CarthageTest/CarthageTest.entitlements; CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INFOPLIST_KEY_NSMainStoryboardFile = Main; - INFOPLIST_KEY_NSPrincipalClass = NSApplication; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 12.3; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 17.2; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.airbnb.lottie.CarthageTest-macOS"; + PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.lottie.CarthageTest; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; + SDKROOT = auto; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3,7"; }; name = Debug; }; - 08B627832878AE72004526F1 /* Release */ = { + 2E47CCC72B5C3BD600FBAB56 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CODE_SIGN_ENTITLEMENTS = "CarthageTest-macOS/CarthageTest_macOS.entitlements"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CODE_SIGN_ENTITLEMENTS = CarthageTest/CarthageTest.entitlements; CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INFOPLIST_KEY_NSMainStoryboardFile = Main; - INFOPLIST_KEY_NSPrincipalClass = NSApplication; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 12.3; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 17.2; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.airbnb.lottie.CarthageTest-macOS"; + PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.lottie.CarthageTest; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; + SDKROOT = auto; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3,7"; }; name = Release; }; @@ -458,52 +361,14 @@ }; name = Release; }; - 2ED64E702770FAB3006AA0F3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = CarthageTest/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.lottie.CarthageTest; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 2ED64E712770FAB3006AA0F3 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = CarthageTest/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.airbnb.lottie.CarthageTest; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 08B627842878AE72004526F1 /* Build configuration list for PBXNativeTarget "CarthageTest-macOS" */ = { + 2E47CCC52B5C3BD600FBAB56 /* Build configuration list for PBXNativeTarget "CarthageTest" */ = { isa = XCConfigurationList; buildConfigurations = ( - 08B627822878AE72004526F1 /* Debug */, - 08B627832878AE72004526F1 /* Release */, + 2E47CCC62B5C3BD600FBAB56 /* Debug */, + 2E47CCC72B5C3BD600FBAB56 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -517,15 +382,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2ED64E6F2770FAB3006AA0F3 /* Build configuration list for PBXNativeTarget "CarthageTest" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2ED64E702770FAB3006AA0F3 /* Debug */, - 2ED64E712770FAB3006AA0F3 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 2ED64E532770FAB2006AA0F3 /* Project object */; diff --git a/script/test-carthage/CarthageTest/AppDelegate.swift b/script/test-carthage/CarthageTest/AppDelegate.swift deleted file mode 100644 index d6f1514fdd..0000000000 --- a/script/test-carthage/CarthageTest/AppDelegate.swift +++ /dev/null @@ -1,26 +0,0 @@ -// Created by Cal Stephens on 12/20/21. -// Copyright © 2021 Airbnb Inc. All rights reserved. - -import UIKit - -@main -class AppDelegate: UIResponder, UIApplicationDelegate { - - func application( - _: UIApplication, - didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) - -> Bool - { - true - } - - func application( - _: UIApplication, - configurationForConnecting connectingSceneSession: UISceneSession, - options _: UIScene.ConnectionOptions) - -> UISceneConfiguration - { - UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) - } - -} diff --git a/script/test-carthage/CarthageTest/Assets.xcassets/AccentColor.colorset/Contents.json b/script/test-carthage/CarthageTest/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897008..0000000000 --- a/script/test-carthage/CarthageTest/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/script/test-carthage/CarthageTest/Assets.xcassets/AppIcon.appiconset/Contents.json b/script/test-carthage/CarthageTest/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 9221b9bb1a..0000000000 --- a/script/test-carthage/CarthageTest/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/script/test-carthage/CarthageTest/Assets.xcassets/Contents.json b/script/test-carthage/CarthageTest/Assets.xcassets/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/script/test-carthage/CarthageTest/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/script/test-carthage/CarthageTest/Base.lproj/LaunchScreen.storyboard b/script/test-carthage/CarthageTest/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 865e9329f3..0000000000 --- a/script/test-carthage/CarthageTest/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/script/test-carthage/CarthageTest/Base.lproj/Main.storyboard b/script/test-carthage/CarthageTest/Base.lproj/Main.storyboard deleted file mode 100644 index 25a763858e..0000000000 --- a/script/test-carthage/CarthageTest/Base.lproj/Main.storyboard +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/script/test-carthage/CarthageTest-macOS/CarthageTest_macOS.entitlements b/script/test-carthage/CarthageTest/CarthageTest.entitlements similarity index 100% rename from script/test-carthage/CarthageTest-macOS/CarthageTest_macOS.entitlements rename to script/test-carthage/CarthageTest/CarthageTest.entitlements diff --git a/script/test-carthage/CarthageTest/CarthageTestApp.swift b/script/test-carthage/CarthageTest/CarthageTestApp.swift new file mode 100644 index 0000000000..354a809038 --- /dev/null +++ b/script/test-carthage/CarthageTest/CarthageTestApp.swift @@ -0,0 +1,13 @@ +// Created by Cal Stephens on 1/20/24. +// Copyright © 2024 Airbnb Inc. All rights reserved. + +import SwiftUI + +@main +struct ExampleApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/script/test-carthage/CarthageTest/ContentView.swift b/script/test-carthage/CarthageTest/ContentView.swift new file mode 100644 index 0000000000..46f051de3c --- /dev/null +++ b/script/test-carthage/CarthageTest/ContentView.swift @@ -0,0 +1,18 @@ +// Created by Cal Stephens on 1/20/24. +// Copyright © 2024 Airbnb Inc. All rights reserved. + +import Lottie +import SwiftUI + +struct ContentView: View { + var body: some View { + VStack { + Spacer() + Text("CarthageTest") + Spacer() + + LottieView(animation: .named("LottieLogo1")) + .playing(loopMode: .loop) + } + } +} diff --git a/script/test-carthage/CarthageTest/Info.plist b/script/test-carthage/CarthageTest/Info.plist deleted file mode 100644 index 5b531f7b27..0000000000 --- a/script/test-carthage/CarthageTest/Info.plist +++ /dev/null @@ -1,66 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneConfigurationName - Default Configuration - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate - UISceneStoryboardFile - Main - - - - - UIApplicationSupportsIndirectInputEvents - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/script/test-carthage/CarthageTest/LottieLogo1.json b/script/test-carthage/CarthageTest/LottieLogo1.json new file mode 100755 index 0000000000..51dbe4f0fc --- /dev/null +++ b/script/test-carthage/CarthageTest/LottieLogo1.json @@ -0,0 +1 @@ +{"assets":[],"layers":[{"ddd":0,"ind":0,"ty":1,"nm":"MASTER","ks":{"o":{"k":0},"r":{"k":0},"p":{"k":[214.457,347.822,0]},"a":{"k":[60,60,0]},"s":{"k":[100,100,100]}},"ao":0,"sw":120,"sh":120,"sc":"#ffffff","ip":12,"op":179,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":1,"ty":4,"nm":"S5-Y 4","parent":0,"ks":{"o":{"k":100},"r":{"k":-89.1},"p":{"k":[53.205,131.606,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[142.038,29.278],[131.282,21.807]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[87],"e":[50.633]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":79,"s":[50.633],"e":[0]},{"t":83}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[100],"e":[75.856]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":79,"s":[75.856],"e":[0]},{"t":83}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":76,"op":84,"st":40,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"S4-Y 4","parent":0,"ks":{"o":{"k":100},"r":{"k":-89.1},"p":{"k":[53.205,131.606,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[142.183,-5.112],[130.029,5.016]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[87],"e":[43.833]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":79,"s":[43.833],"e":[0]},{"t":83}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":79,"s":[66.356],"e":[0]},{"t":83}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":76,"op":84,"st":40,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"S3-Y 4","parent":0,"ks":{"o":{"k":100},"r":{"k":-89.1},"p":{"k":[53.205,131.606,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[147.699,13.025],[133.195,13.21]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[87],"e":[42.133]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":79,"s":[42.133],"e":[0]},{"t":83}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":76,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":79,"s":[66.356],"e":[0]},{"t":83}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":76,"op":84,"st":40,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"S5-Y 3","parent":0,"ks":{"o":{"k":100},"r":{"k":97.9},"p":{"k":[58.205,-39.394,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[145.677,22.22],[134.922,14.749]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":75,"s":[87],"e":[50.633]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":78,"s":[50.633],"e":[0]},{"t":82}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":75,"s":[100],"e":[75.856]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":78,"s":[75.856],"e":[0]},{"t":82}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":75,"op":83,"st":39,"bm":0,"sr":1},{"ddd":0,"ind":5,"ty":4,"nm":"S4-Y 3","parent":0,"ks":{"o":{"k":100},"r":{"k":97.9},"p":{"k":[58.205,-39.394,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[144.429,-5.397],[132.275,4.731]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":75,"s":[87],"e":[43.833]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":78,"s":[43.833],"e":[0]},{"t":82}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":75,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":78,"s":[66.356],"e":[0]},{"t":82}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":75,"op":83,"st":39,"bm":0,"sr":1},{"ddd":0,"ind":6,"ty":4,"nm":"S3-Y 3","parent":0,"ks":{"o":{"k":100},"r":{"k":97.9},"p":{"k":[58.205,-39.394,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[149.624,8.244],[136.648,10.156]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":75,"s":[87],"e":[42.133]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":78,"s":[42.133],"e":[0]},{"t":82}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":75,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":78,"s":[66.356],"e":[0]},{"t":82}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":75,"op":83,"st":39,"bm":0,"sr":1},{"ddd":0,"ind":7,"ty":4,"nm":"S13","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[128,3.65],[78.25,3.5]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":85,"s":[87],"e":[21.233]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":90,"s":[21.233],"e":[0]},{"t":94}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":85,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":90,"s":[66.356],"e":[0]},{"t":94}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":85,"op":95,"st":49,"bm":0,"sr":1},{"ddd":0,"ind":8,"ty":4,"nm":"S12","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[119.25,-20.05],[63.5,-20.5]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[87],"e":[21.233]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":87,"s":[21.233],"e":[0]},{"t":91}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":87,"s":[66.356],"e":[0]},{"t":91}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":84,"op":94,"st":48,"bm":0,"sr":1},{"ddd":0,"ind":9,"ty":4,"nm":"S11","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[119.5,-45.05],[82.75,-44.75]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":80,"s":[87],"e":[21.233]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":83,"s":[21.233],"e":[0]},{"t":87}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":80,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":83,"s":[66.356],"e":[0]},{"t":87}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":80,"op":90,"st":44,"bm":0,"sr":1},{"ddd":0,"ind":10,"ty":4,"nm":"S5-Y 2","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[169.5,18.073],[137.481,11.365]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":97,"s":[87],"e":[50.633]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":100,"s":[50.633],"e":[0]},{"t":107}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":97,"s":[100],"e":[75.856]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":100,"s":[75.856],"e":[0]},{"t":107}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":97,"op":107,"st":61,"bm":0,"sr":1},{"ddd":0,"ind":11,"ty":4,"nm":"S4-Y 2","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[156.45,-23.05],[132,2.75]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":97,"s":[87],"e":[43.833]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":100,"s":[43.833],"e":[0]},{"t":107}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":97,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":100,"s":[66.356],"e":[0]},{"t":107}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":97,"op":107,"st":61,"bm":0,"sr":1},{"ddd":0,"ind":12,"ty":4,"nm":"S3-Y 2","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[166.731,-7.927],[136.731,7.115]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":97,"s":[87],"e":[42.133]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":100,"s":[42.133],"e":[0]},{"t":107}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":97,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":100,"s":[66.356],"e":[0]},{"t":107}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":97,"op":107,"st":61,"bm":0,"sr":1},{"ddd":0,"ind":13,"ty":4,"nm":"S6-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-87.5,20.95],[-48.75,54.75]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[87],"e":[43.933]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[43.933],"e":[0]},{"t":64}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[100],"e":[70.456]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[70.456],"e":[0]},{"t":64}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":54,"op":64,"st":18,"bm":0,"sr":1},{"ddd":0,"ind":14,"ty":4,"nm":"S5-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-94.5,37.073],[-48.769,55.365]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[87],"e":[50.633]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[50.633],"e":[0]},{"t":64}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[100],"e":[75.856]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[75.856],"e":[0]},{"t":64}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":54,"op":64,"st":18,"bm":0,"sr":1},{"ddd":0,"ind":15,"ty":4,"nm":"S4-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.45,21.95],[-32.75,55.75]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[87],"e":[43.833]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[43.833],"e":[0]},{"t":64}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[66.356],"e":[0]},{"t":64}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":54,"op":64,"st":18,"bm":0,"sr":1},{"ddd":0,"ind":16,"ty":4,"nm":"S3-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[16.231,39.073],[-32.769,57.365]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[87],"e":[42.133]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[42.133],"e":[0]},{"t":64}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57,"s":[66.356],"e":[0]},{"t":64}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":2},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":54,"op":64,"st":18,"bm":0,"sr":1},{"ddd":0,"ind":17,"ty":4,"nm":"S8","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[-0.148,14.256],[10.476,0],[0,0]],"o":[[0,0],[-8.551,-8.263],[-21.454,0],[0,0]],"v":[[-3,35.95],[-1.352,-6.756],[-32.046,-20.579],[-42.25,4.25]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":65,"s":[87],"e":[21.233]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":70,"s":[21.233],"e":[0]},{"t":75}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":65,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":70,"s":[66.356],"e":[0]},{"t":75}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":65,"op":75,"st":29,"bm":0,"sr":1},{"ddd":0,"ind":18,"ty":4,"nm":"S7","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[27,1.45],[31.046,-1.421],[0,0]],"o":[[-27,-1.45],[-26.426,1.21],[0,0]],"v":[[34.5,-13.05],[-35.046,-35.579],[-62.25,-5.75]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":65,"s":[87],"e":[21.233]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":70,"s":[21.233],"e":[0]},{"t":75}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":65,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":70,"s":[66.356],"e":[0]},{"t":75}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":65,"op":75,"st":29,"bm":0,"sr":1},{"ddd":0,"ind":19,"ty":4,"nm":"S2-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[1.9,-10.768],[1,-19]],"o":[[0,0],[-3.167,17.951],[-1,19]],"v":[[-67.25,-105.5],[-72.333,-84.201],[-76.5,-37.75]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":29,"s":[87],"e":[25.333]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[25.333],"e":[0]},{"t":36}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":29,"s":[100],"e":[69.056]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[69.056],"e":[0]},{"t":36}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":30,"op":37,"st":-7,"bm":0,"sr":1},{"ddd":0,"ind":20,"ty":4,"nm":"S1-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[25.043,45.678,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[1.9,-10.768],[1,-19]],"o":[[0,0],[-3.167,17.951],[-1,19]],"v":[[-67.125,-112],[-75.458,-89.951],[-80.375,-39.25]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":29,"s":[87],"e":[37.533]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[37.533],"e":[0]},{"t":36}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":29,"s":[100],"e":[66.356]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[66.356],"e":[0]},{"t":36}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":1.5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1"}],"ip":30,"op":37,"st":-7,"bm":0,"sr":1},{"ddd":0,"ind":21,"ty":4,"nm":"Dot1","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.823,"y":0},"n":"0p833_0p833_0p823_0","t":-3,"s":[295.771,108.994,0],"e":[35.771,108.994,0],"to":[0,0,0],"ti":[0,0,0]},{"t":16}]},"a":{"k":[196.791,266.504,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"k":[9.4,9.4]},"p":{"k":[0.8,-0.5]},"nm":"Ellipse Path 1"},{"ty":"fl","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"nm":"Fill 1"},{"ty":"tr","p":{"k":[196,267],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1"}],"ip":-5,"op":17,"st":-36,"bm":0,"sr":1},{"ddd":0,"ind":22,"ty":4,"nm":"L-B","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[25.671,-4.167],[1.456,6.902],[-8.481,1.863],[-47.562,13.01],[-0.501,0.133],[-71.423,-2.315]],"o":[[0,0],[-8.224,1.335],[-1.456,-6.903],[23.817,-5.233],[0.16,-0.044],[0.501,-0.133],[0,0]],"v":[[-8.837,-58.229],[-35.834,33.662],[-51.688,23.148],[-41.174,7.293],[51.797,44.178],[53.188,43.741],[140.394,43.672]],"c":false}},"nm":"Path 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":9.194},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[166.029,270.643],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8"},{"ty":"tm","s":{"k":[{"i":{"x":[0.703],"y":[0.821]},"o":{"x":[0.167],"y":[0.167]},"n":["0p703_0p821_0p167_0p167"],"t":18,"s":[80],"e":[50]},{"i":{"x":[0.263],"y":[1]},"o":{"x":[0.037],"y":[0.168]},"n":["0p263_1_0p037_0p168"],"t":23,"s":[50],"e":[30]},{"t":55}],"ix":1},"e":{"k":[{"i":{"x":[0.337],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p337_1_0p167_0p167"],"t":18,"s":[81],"e":[73.4]},{"t":29}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"}],"ip":18,"op":179,"st":8,"bm":0,"sr":1},{"ddd":0,"ind":23,"ty":4,"nm":"L-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[25.671,-4.167],[1.456,6.902],[-8.481,1.863],[-47.562,13.01],[-0.501,0.133],[-71.423,-2.315]],"o":[[0,0],[-8.224,1.335],[-1.456,-6.903],[23.817,-5.233],[0.16,-0.044],[0.501,-0.133],[0,0]],"v":[[-8.837,-58.229],[-35.834,33.662],[-51.688,23.148],[-41.174,7.293],[51.797,44.178],[53.188,43.741],[140.394,43.672]],"c":false}},"nm":"Path 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":8.4},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[166.029,270.643],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8"},{"ty":"tm","s":{"k":[{"i":{"x":[0.703],"y":[0.857]},"o":{"x":[0.167],"y":[0.167]},"n":["0p703_0p857_0p167_0p167"],"t":16,"s":[80],"e":[50]},{"i":{"x":[0.938],"y":[1]},"o":{"x":[0.333],"y":[0.202]},"n":["0p938_1_0p333_0p202"],"t":20,"s":[50],"e":[0]},{"t":28}],"ix":1},"e":{"k":[{"i":{"x":[0.337],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p337_1_0p167_0p167"],"t":16,"s":[81],"e":[73.4]},{"t":27}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"}],"ip":16,"op":179,"st":8,"bm":0,"sr":1},{"ddd":0,"ind":24,"ty":1,"nm":"N","parent":0,"ks":{"o":{"k":0},"r":{"k":0},"p":{"k":[{"i":{"x":0.26,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p26_1_0p167_0p167","t":28,"s":[-33.667,8.182,0],"e":[-33.667,-72.818,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.74,"y":0},"n":"0p833_0p833_0p74_0","t":40,"s":[-33.667,-72.818,0],"e":[-33.667,102.057,0],"to":[0,0,0],"ti":[0,0,0]},{"t":54}]},"a":{"k":[60,60,0]},"s":{"k":[100,100,100]}},"ao":0,"sw":120,"sh":120,"sc":"#ffffff","ip":28,"op":54,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":25,"ty":4,"nm":"Dot-Y","parent":24,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":28,"s":[39.875,60,0],"e":[79.375,60,0],"to":[6.58333349227905,0,0],"ti":[-6.58333349227905,0,0]},{"t":54}]},"a":{"k":[196.791,266.504,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"k":[9.4,9.4]},"p":{"k":[0.8,-0.5]},"nm":"Ellipse Path 1"},{"ty":"fl","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"nm":"Fill 1"},{"ty":"tr","p":{"k":[196,267],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1"}],"ip":28,"op":54,"st":4,"bm":0,"sr":1},{"ddd":0,"ind":26,"ty":4,"nm":"T1a-B","parent":36,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[250,250,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[-0.5,9.501],[-0.048,5.655],[0.054,0.06],[0.946,1.486],[-9.967,8.05],[-40.546,0]],"o":[[0.031,-0.594],[0.076,-8.978],[-1.161,-1.3],[-5.939,-9.327],[24.677,-19.929],[0,0]],"v":[[-30.72,63.761],[-30.741,45.192],[-37.397,27.014],[-40.698,22.661],[-37.873,-7.117],[49.506,11.559]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":24.9,"ix":1},"e":{"k":[{"i":{"x":[0.673],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p673_1_0p167_0p167"],"t":70,"s":[24.9],"e":[89.1]},{"t":84}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.194},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[227.677,234.375],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9"}],"ip":70,"op":179,"st":17,"bm":0,"sr":1},{"ddd":0,"ind":27,"ty":4,"nm":"T2a-B","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1.681,-29.992],[-1.681,29.992]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.06],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p06_1_0p167_0p167"],"t":75,"s":[50],"e":[0]},{"t":85}],"ix":1},"e":{"k":[{"i":{"x":[0.06],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p06_1_0p167_0p167"],"t":75,"s":[50],"e":[100]},{"t":85}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":9.194},"lc":3,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[277.698,247.258],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7"}],"ip":75,"op":179,"st":15,"bm":0,"sr":1},{"ddd":0,"ind":28,"ty":4,"nm":"T1a-Y 2","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p667_1_0p167_0p167","t":56,"s":[39.043,48.678,0],"e":[39.043,45.678,0],"to":[0,0,0],"ti":[0,0,0]},{"t":64}]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[-0.5,9.501],[-0.048,5.655],[0.054,0.06],[0.946,1.486],[-9.967,8.05],[-40.546,0]],"o":[[0.031,-0.594],[0.076,-8.978],[-1.161,-1.3],[-5.939,-9.327],[24.677,-19.929],[0,0]],"v":[[-30.72,63.761],[-30.741,45.192],[-37.397,27.014],[-40.698,22.661],[-37.873,-7.117],[49.506,11.559]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0p833_1_0p301_0"],"t":54,"s":[0],"e":[24.9]},{"t":70}],"ix":1},"e":{"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0p667_1_0p301_0"],"t":54,"s":[0],"e":[100]},{"t":78}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":8.4},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[227.677,234.375],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9"}],"ip":59,"op":179,"st":12,"bm":0,"sr":1},{"ddd":0,"ind":29,"ty":4,"nm":"O-B","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":31,"s":[-62.792,73.057,0],"e":[-53.792,7.557,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.638,"y":1},"o":{"x":0.167,"y":0.198},"n":"0p638_1_0p167_0p198","t":35.257,"s":[-53.792,7.557,0],"e":[-33.667,-72.818,0],"to":[0,0,0],"ti":[-19.1562919616699,1.73831975460052,0]},{"i":{"x":0.795,"y":1},"o":{"x":0.523,"y":0},"n":"0p795_1_0p523_0","t":44,"s":[-33.667,-72.818,0],"e":[-14.167,102.182,0],"to":[16.2075271606445,-1.47073686122894,0],"ti":[0,0,0]},{"i":{"x":0.348,"y":1},"o":{"x":0.18,"y":0},"n":"0p348_1_0p18_0","t":54,"s":[-14.167,102.182,0],"e":[-14.167,59.182,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.27,"y":1},"o":{"x":0.693,"y":0},"n":"0p27_1_0p693_0","t":63,"s":[-14.167,59.182,0],"e":[-14.167,62.182,0],"to":[0,0,0],"ti":[0,0,0]},{"t":73}]},"a":{"k":[196.791,266.504,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":54,"s":[3,3],"e":[44.6,44.6]},{"t":61}]},"p":{"k":[0.8,-0.5]},"nm":"Ellipse Path 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":9.194},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[196,267],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[0],"e":[30]},{"i":{"x":[0.432],"y":[1]},"o":{"x":[0.167],"y":[1.124]},"n":["0p432_1_0p167_1p124"],"t":63,"s":[30],"e":[39.9]},{"t":91}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":54,"s":[100],"e":[88]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[88],"e":[88]},{"t":91}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"}],"ip":54,"op":179,"st":4,"bm":0,"sr":1},{"ddd":0,"ind":30,"ty":4,"nm":"O-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":31,"s":[-62.792,73.057,0],"e":[-53.792,7.557,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.638,"y":1},"o":{"x":0.167,"y":0.198},"n":"0p638_1_0p167_0p198","t":35.257,"s":[-53.792,7.557,0],"e":[-33.667,-72.818,0],"to":[0,0,0],"ti":[-19.1562919616699,1.73831975460052,0]},{"i":{"x":0.795,"y":1},"o":{"x":0.523,"y":0},"n":"0p795_1_0p523_0","t":44,"s":[-33.667,-72.818,0],"e":[-14.167,102.182,0],"to":[16.2075271606445,-1.47073686122894,0],"ti":[0,0,0]},{"i":{"x":0.348,"y":1},"o":{"x":0.18,"y":0},"n":"0p348_1_0p18_0","t":54,"s":[-14.167,102.182,0],"e":[-14.167,59.182,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.27,"y":1},"o":{"x":0.693,"y":0},"n":"0p27_1_0p693_0","t":63,"s":[-14.167,59.182,0],"e":[-14.167,62.182,0],"to":[0,0,0],"ti":[0,0,0]},{"t":73}]},"a":{"k":[196.791,266.504,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":54,"s":[3,3],"e":[44.6,44.6]},{"t":61}]},"p":{"k":[0.8,-0.5]},"nm":"Ellipse Path 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":8.8},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[196,267],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1"}],"ip":54,"op":179,"st":4,"bm":0,"sr":1},{"ddd":0,"ind":31,"ty":4,"nm":"T1b-B","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1.768,-25.966],[-1.768,25.966]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":0,"ix":1},"e":{"k":[{"i":{"x":[0.21],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p21_1_0p167_0p167"],"t":81,"s":[11.7],"e":[100]},{"t":88}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.194},"lc":2,"lj":2,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[242.756,265.581],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10"}],"ip":81,"op":179,"st":26,"bm":0,"sr":1},{"ddd":0,"ind":32,"ty":4,"nm":"T1b-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1.768,-25.966],[-1.768,25.966]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":70,"s":[0],"e":[0]},{"t":75}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":70,"s":[11.7],"e":[100]},{"t":75}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":8.4},"lc":2,"lj":2,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[242.756,265.581],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10"}],"ip":70,"op":161,"st":15,"bm":0,"sr":1},{"ddd":0,"ind":33,"ty":4,"nm":"T2b-B","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[246.65,213.814],[340.956,213.628]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":82,"s":[29],"e":[0]},{"t":91}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":82,"s":[41.1],"e":[66.5]},{"t":91}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":9.194},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5"}],"ip":82,"op":179,"st":-17,"bm":0,"sr":1},{"ddd":0,"ind":34,"ty":4,"nm":"T2a-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1.681,-29.992],[-1.681,29.992]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.06],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p06_1_0p167_0p167"],"t":72,"s":[50],"e":[0]},{"t":82}],"ix":1},"e":{"k":[{"i":{"x":[0.06],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p06_1_0p167_0p167"],"t":72,"s":[50],"e":[100]},{"t":82}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.194},"lc":3,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[277.698,247.258],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7"}],"ip":72,"op":89,"st":12,"bm":0,"sr":1},{"ddd":0,"ind":35,"ty":4,"nm":"T2b-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[39.043,45.678,0]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[246.65,213.814],[340.956,213.628]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":76,"s":[29],"e":[0]},{"t":85}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":76,"s":[41.1],"e":[66.5]},{"t":85}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.194},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5"}],"ip":76,"op":92,"st":-23,"bm":0,"sr":1},{"ddd":0,"ind":36,"ty":4,"nm":"T1a-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p667_1_0p167_0p167","t":56,"s":[39.043,48.678,0],"e":[39.043,45.678,0],"to":[0,0,0],"ti":[0,0,0]},{"t":64}]},"a":{"k":[250,250,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[-0.5,9.501],[-0.048,5.655],[0.054,0.06],[0.946,1.486],[-9.967,8.05],[-40.546,0]],"o":[[0.031,-0.594],[0.076,-8.978],[-1.161,-1.3],[-5.939,-9.327],[24.677,-19.929],[0,0]],"v":[[-30.72,63.761],[-30.741,45.192],[-37.397,27.014],[-40.698,22.661],[-37.873,-7.117],[49.506,11.559]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0p833_1_0p301_0"],"t":54,"s":[0],"e":[24.9]},{"t":70}],"ix":1},"e":{"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0p667_1_0p301_0"],"t":54,"s":[0],"e":[100]},{"t":74}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":8.4},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[227.677,234.375],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9"}],"ip":59,"op":156,"st":12,"bm":0,"sr":1},{"ddd":0,"ind":37,"ty":4,"nm":"E1-B","parent":38,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[344.672,214.842,0]},"a":{"k":[344.672,214.842,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-13.664,-0.145],[62.163,0.29]],"c":false}},"nm":"Path 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.562},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[344.672,214.842],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[0.12]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_0p12_0p167_0p167"],"t":84,"s":[0],"e":[0]},{"t":93}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":84,"s":[0],"e":[37.5]},{"t":93}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"}],"ip":84,"op":179,"st":84,"bm":0,"sr":1},{"ddd":0,"ind":38,"ty":4,"nm":"E1-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.12,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p12_1_0p167_0p167","t":79,"s":[113.715,9.146,0],"e":[137.715,9.146,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.12,"y":1},"o":{"x":0.167,"y":0},"n":"0p12_1_0p167_0","t":88,"s":[137.715,9.146,0],"e":[133.715,9.146,0],"to":[0,0,0],"ti":[0,0,0]},{"t":92}]},"a":{"k":[344.672,214.842,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-13.664,-0.145],[62.163,0.29]],"c":false}},"nm":"Path 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":8.4},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[344.672,214.842],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[0.12]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_0p12_0p167_0p167"],"t":79,"s":[0],"e":[0]},{"t":88}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":79,"s":[0],"e":[37.5]},{"t":88}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"}],"ip":79,"op":94,"st":79,"bm":0,"sr":1},{"ddd":0,"ind":39,"ty":4,"nm":"E2-B","parent":40,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[332.05,237.932,0]},"a":{"k":[332.05,237.932,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-26.67,-0.283],[99.171,0.066]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[0.12]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_0p12_0p167_0p167"],"t":86,"s":[0],"e":[0]},{"t":95}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":86,"s":[0],"e":[43]},{"t":95}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.562},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[331.664,238.14],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3"}],"ip":86,"op":179,"st":86,"bm":0,"sr":1},{"ddd":0,"ind":40,"ty":4,"nm":"E2-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.12,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p12_1_0p167_0p167","t":83,"s":[109.092,33.61,0],"e":[121.092,33.61,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.12,"y":0.12},"o":{"x":0.167,"y":0.167},"n":"0p12_0p12_0p167_0p167","t":92,"s":[121.092,33.61,0],"e":[121.092,33.61,0],"to":[0,0,0],"ti":[0,0,0]},{"t":96}]},"a":{"k":[332.05,237.932,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-26.67,-0.283],[99.171,0.066]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[0.12]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_0p12_0p167_0p167"],"t":83,"s":[0],"e":[0]},{"t":92}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":83,"s":[0],"e":[43]},{"t":92}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":8.4},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[331.664,238.14],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3"}],"ip":83,"op":96,"st":83,"bm":0,"sr":1},{"ddd":0,"ind":41,"ty":4,"nm":"I-B","parent":42,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[303.802,282.182,0]},"a":{"k":[303.802,282.182,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.859,-21.143],[-4.359,70.392]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[0.12]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_0p12_0p167_0p167"],"t":81,"s":[0],"e":[0]},{"t":91}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":81,"s":[0],"e":[45.7]},{"t":91}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.194},"lc":3,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[304.135,282.409],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6"}],"ip":81,"op":179,"st":18,"bm":0,"sr":1},{"ddd":0,"ind":42,"ty":4,"nm":"I-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.12,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p12_1_0p167_0p167","t":78,"s":[93.594,62.861,0],"e":[92.626,82.829,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.12,"y":1},"o":{"x":0.167,"y":0},"n":"0p12_1_0p167_0","t":88,"s":[92.626,82.829,0],"e":[92.844,77.861,0],"to":[0,0,0],"ti":[0,0,0]},{"t":92}]},"a":{"k":[303.802,282.182,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.859,-21.143],[-4.359,70.392]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.12],"y":[0.12]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_0p12_0p167_0p167"],"t":78,"s":[0],"e":[0]},{"t":88}],"ix":1},"e":{"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0p12_1_0p167_0p167"],"t":78,"s":[0],"e":[45.7]},{"t":88}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":8.4},"lc":3,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[304.135,282.409],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6"}],"ip":78,"op":93,"st":15,"bm":0,"sr":1},{"ddd":0,"ind":43,"ty":4,"nm":"E3-B","parent":44,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[345.189,261.801,0]},"a":{"k":[345.124,261.801,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-13.664,-0.145],[75.663,0.29]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":92,"s":[0],"e":[0]},{"t":97}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":92,"s":[0],"e":[31.6]},{"t":97}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 2"},{"ty":"st","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"w":{"k":9.562},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[344.674,261.877],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1"}],"ip":92,"op":179,"st":29,"bm":0,"sr":1},{"ddd":0,"ind":44,"ty":4,"nm":"E3-Y","parent":0,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p667_1_0p167_0p167","t":84,"s":[119.167,57.479,0],"e":[137.167,57.479,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0},"n":"0p667_1_0p167_0","t":92,"s":[137.167,57.479,0],"e":[134.167,57.479,0],"to":[0,0,0],"ti":[0,0,0]},{"t":96}]},"a":{"k":[345.124,261.801,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-13.664,-0.145],[75.663,0.29]],"c":false}},"nm":"Path 1"},{"ty":"tm","s":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[0],"e":[0]},{"t":92}],"ix":1},"e":{"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[0],"e":[31.6]},{"t":92}],"ix":2},"o":{"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 2"},{"ty":"st","fillEnabled":true,"c":{"k":[0,0.48,0.53,1]},"o":{"k":100},"w":{"k":9.562},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1"},{"ty":"tr","p":{"k":[344.674,261.877],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1"}],"ip":84,"op":102,"st":21,"bm":0,"sr":1},{"ddd":0,"ind":45,"ty":4,"nm":"Dot-Y","parent":46,"ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[{"i":{"x":0,"y":0.812},"o":{"x":0,"y":0},"n":"0_0p812_0_0","t":96,"s":[43.263,59.75,0],"e":[62.513,59.75,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.708,"y":1},"o":{"x":0.39,"y":0.707},"n":"0p708_1_0p39_0p707","t":108,"s":[62.513,59.75,0],"e":[63.763,59.75,0],"to":[0,0,0],"ti":[0,0,0]},{"t":115}]},"a":{"k":[196.791,266.504,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"k":[9.2,9.2]},"p":{"k":[0.8,-0.5]},"nm":"Ellipse Path 1"},{"ty":"fl","fillEnabled":true,"c":{"k":[1,1,1,1]},"o":{"k":100},"nm":"Fill 1"},{"ty":"tr","p":{"k":[196,267],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1"}],"ip":96,"op":182,"st":65,"bm":0,"sr":1},{"ddd":0,"ind":46,"ty":1,"nm":"Bncr","parent":0,"ks":{"o":{"k":0},"r":{"k":0},"p":{"k":[{"i":{"x":0.18,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p18_1_0p167_0p167","t":96,"s":[164.782,57.473,0],"e":[164.782,55.473,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.82,"y":0},"n":"0p833_0p833_0p82_0","t":99,"s":[164.782,55.473,0],"e":[164.782,57.473,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.18,"y":1},"o":{"x":0.167,"y":0.167},"n":"0p18_1_0p167_0p167","t":102,"s":[164.782,57.473,0],"e":[164.782,56.909,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.82,"y":0},"n":"0p833_0p833_0p82_0","t":105,"s":[164.782,56.909,0],"e":[164.782,57.473,0],"to":[0,0,0],"ti":[0,0,0]},{"t":108}]},"a":{"k":[60,60,0]},"s":{"k":[100,100,100]}},"ao":0,"sw":120,"sh":120,"sc":"#ffffff","ip":96,"op":182,"st":15,"bm":0,"sr":1},{"ddd":0,"ind":47,"ty":4,"nm":"BG","ks":{"o":{"k":100},"r":{"k":0},"p":{"k":[187.5,333.5,0]},"a":{"k":[0,0,0]},"s":{"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"k":[375,667]},"p":{"k":[0,0]},"r":{"k":0},"nm":"Rectangle Path 1"},{"ty":"fl","fillEnabled":true,"c":{"k":[0,0.82,0.76,1]},"o":{"k":100},"nm":"Fill 1"},{"ty":"tr","p":{"k":[0,0],"ix":2},"a":{"k":[0,0],"ix":1},"s":{"k":[100,100],"ix":3},"r":{"k":0,"ix":6},"o":{"k":100,"ix":7},"sk":{"k":0,"ix":4},"sa":{"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1"}],"ip":0,"op":179,"st":0,"bm":0,"sr":1}],"v":"4.4.26","ddd":0,"ip":0,"op":179,"fr":30,"w":375,"h":667} \ No newline at end of file diff --git a/script/test-carthage/CarthageTest/SceneDelegate.swift b/script/test-carthage/CarthageTest/SceneDelegate.swift deleted file mode 100644 index b51ef8e1e5..0000000000 --- a/script/test-carthage/CarthageTest/SceneDelegate.swift +++ /dev/null @@ -1,10 +0,0 @@ -// Created by Cal Stephens on 12/20/21. -// Copyright © 2021 Airbnb Inc. All rights reserved. - -import UIKit - -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - - var window: UIWindow? - -} diff --git a/script/test-carthage/CarthageTest/ViewController.swift b/script/test-carthage/CarthageTest/ViewController.swift deleted file mode 100644 index 0049aff0fd..0000000000 --- a/script/test-carthage/CarthageTest/ViewController.swift +++ /dev/null @@ -1,15 +0,0 @@ -// Created by Cal Stephens on 12/20/21. -// Copyright © 2021 Airbnb Inc. All rights reserved. - -import Lottie -import UIKit - -class ViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - let animationView = LottieAnimationView() - view.addSubview(animationView) - } - -} From dc90817f02da6ee368ef84a5a334f93718dab671 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Mon, 22 Jan 2024 11:02:56 -0800 Subject: [PATCH 12/15] Test with debug logs --- Rakefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index bf58a29aa3..b02899a4bb 100644 --- a/Rakefile +++ b/Rakefile @@ -243,11 +243,12 @@ def xcodebuild(command) # Check if the mint tool is installed -- if so, pipe the xcodebuild output through xcbeautify `which mint` - if $?.success? - sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" - else + # TODO: REVERT + #if $?.success? + # sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" + #else sh "xcodebuild #{command}" - end + #end end # Runs the given code block, unless `SKIP_VISION_OS=true`. From fee84c50f78d4cdc17ebd28e02a228955178eb88 Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Mon, 22 Jan 2024 11:35:57 -0800 Subject: [PATCH 13/15] Use simulators instead of generic platforms that require codesigning --- Rakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index b02899a4bb..833f77b8a1 100644 --- a/Rakefile +++ b/Rakefile @@ -157,10 +157,10 @@ namespace :test do sh 'rm -rf ~/Library/Caches/org.carthage.CarthageKit/DerivedData' # Build a test app that imports and uses the Lottie framework built via Carthage - xcodebuild('build -scheme CarthageTest -destination generic/platform=iOS') + xcodebuild('build -scheme CarthageTest -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)"') xcodebuild('build -scheme CarthageTest -destination generic/platform=macOS') - xcodebuild('build -scheme CarthageTest -destination generic/platform=tvOS') - xcodebuild('build -scheme CarthageTest -destination generic/platform=visionOS') + xcodebuild('build -scheme CarthageTest -destination "platform=tvOS Simulator,name=Apple TV"') + xcodebuild('build -scheme CarthageTest -destination "platform=visionOS Simulator,name=Apple Vision Pro"') end end From 9018ec7dc7507b43e4689d80c2cdb2e71e0b0d1c Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Mon, 22 Jan 2024 12:41:36 -0800 Subject: [PATCH 14/15] Clean up --- .github/workflows/main.yml | 8 +++++--- Rakefile | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d52fa55ecc..3ffd99448b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,8 +96,10 @@ jobs: # will be able to use these XCFrameworks and the lottie-spm package. # This should be the minimum Xcode version permitted by the App Store. # As of April 2023, this is Xcode 14.1: https://developer.apple.com/news/?id=jd9wcyov - # - TODO: Once this minimum supported Xcode version is 15.2 or later, - # we can remove the `build-xcframework-with-visionOS-support` job below. + # - TODO: Once this minimum supported Xcode version is 15.0 or later, + # we can use Xcode 15.2 here and remove the `build-xcframework-with-visionOS-support` job. + # Testing in https://github.com/airbnb/lottie-spm/pull/12 shows that Xcode 15.0 can + # use an XCFramework built by Xcode 15.2. - '14.1' # Swift 5.7.1 steps: - uses: actions/checkout@v2 @@ -123,7 +125,7 @@ jobs: strategy: matrix: xcode: - - '15.2' # Swift 5.9.2, first Xcode version with visionOS support. + - '15.2' # Swift 5.9, first Xcode version with visionOS support. steps: - uses: actions/checkout@v2 - uses: apple-actions/import-codesign-certs@v2 diff --git a/Rakefile b/Rakefile index 833f77b8a1..57aba866ce 100644 --- a/Rakefile +++ b/Rakefile @@ -243,12 +243,11 @@ def xcodebuild(command) # Check if the mint tool is installed -- if so, pipe the xcodebuild output through xcbeautify `which mint` - # TODO: REVERT - #if $?.success? - # sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" - #else + if $?.success? + sh "set -o pipefail && xcodebuild #{command} | mint run thii/xcbeautify@0.10.2" + else sh "xcodebuild #{command}" - #end + end end # Runs the given code block, unless `SKIP_VISION_OS=true`. From 9254fb58572c97a2265aef79553e43fbe32b1bac Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Mon, 22 Jan 2024 12:44:45 -0800 Subject: [PATCH 15/15] Fix visionOS support in LRUCache --- Sources/Private/EmbeddedLibraries/LRUCache/LRUCache.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Private/EmbeddedLibraries/LRUCache/LRUCache.swift b/Sources/Private/EmbeddedLibraries/LRUCache/LRUCache.swift index 8253d80240..9a0e033391 100644 --- a/Sources/Private/EmbeddedLibraries/LRUCache/LRUCache.swift +++ b/Sources/Private/EmbeddedLibraries/LRUCache/LRUCache.swift @@ -33,7 +33,7 @@ import Foundation -#if os(iOS) || os(tvOS) +#if canImport(UIKit) import UIKit /// Notification that cache should be cleared