From 871e99c50059eca9d16bf60e2e171b2d987da4a9 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:16:25 +0000 Subject: [PATCH 01/57] wip --- .github/workflows/build-and-test.yml | 59 -------- .github/workflows/ci.yml | 84 +++++++++++ Gemfile.lock | 202 +++++++++++++++------------ Podfile.lock | 2 +- fastlane/Fastfile | 52 +++++-- fastlane/Pluginfile | 2 - 6 files changed, 236 insertions(+), 165 deletions(-) delete mode 100644 .github/workflows/build-and-test.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml deleted file mode 100644 index bf17d9f5..00000000 --- a/.github/workflows/build-and-test.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Build and Test Package - -on: - push: - branches: - - master - pull_request: - branches: - - master - -concurrency: - group: ci-${{ github.ref }} - cancel-in-progress: true - -jobs: - build: - runs-on: macos-10.15 - steps: - - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Setup Xcode 12 - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '12.4' - - - name: Export macOS SDK - run: echo SDKROOT=$(xcrun --sdk macosx --show-sdk-path) >> $GITHUB_ENV - - - name: Install gem dependencies - uses: ruby/setup-ruby@v1 - with: - ruby-version: .ruby-version - bundler-cache: true - - - name: Cache cocoapods dependencies - uses: actions/cache@v3 - id: cache-pods - with: - path: Pods - key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} - restore-keys: ${{ runner.os }}-pods- - - - name: Install cocoapods dependencies - if: steps.cache-pods.outputs.cache-hit != 'true' - run: bundle exec pod install - - - name: Build Swift Package - run: swift build -j 2 --disable-index-store -v - - - name: Test Framework on iOS and tvOS - run: bundle exec fastlane ios test ci:github - - - name: Test Framework on macOS - run: bundle exec fastlane mac test ci:github - - - name: Lint podspec - run: bundle exec pod lib lint diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..9d164e82 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,84 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + branches: + - "**" + +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + +jobs: + ci: + name: ${{ matrix.platform }} ${{ matrix.platform_version }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - macos-11 + - macos-12 + platform: + - ios + # - mac + include: + - os: macos-11 + platform: ios + platform_version: 13 + xcode: 11.7 + - os: macos-11 + platform: ios + platform_version: 14 + xcode: 12.5.1 + - os: macos-12 + platform: ios + platform_version: 15 + xcode: 13.4.1 + - os: macos-12 + platform: ios + platform_version: 16 + xcode: 14.2 + + steps: + + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Select Xcode version + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: ${{ matrix.xcode }} + + # - name: Export macOS SDK + # run: echo SDKROOT=$(xcrun --sdk macosx --show-sdk-path) >> $GITHUB_ENV + + - name: Install gem dependencies + uses: ruby/setup-ruby@v1 + with: + ruby-version: .ruby-version + bundler-cache: true + + - name: Cache CocoaPods dependencies + uses: actions/cache@v3 + id: cache-pods + with: + path: Pods + key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} + restore-keys: ${{ runner.os }}-pods- + + - name: Install CocoaPods dependencies + if: steps.cache-pods.outputs.cache-hit != 'true' + run: bundle exec pod install + + - name: Build Swift Package + run: swift build -j 2 --disable-index-store -v + + - name: Run Tests + run: bundle exec fastlane ${{ matrix.platform }} test ${{ matrix.platform_version }} + + - name: Lint podspec + run: bundle exec pod lib lint diff --git a/Gemfile.lock b/Gemfile.lock index 2bd429a5..84f6de85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml activesupport (6.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -9,27 +9,28 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) + artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.384.0) - aws-sdk-core (3.109.1) + aws-eventstream (1.2.0) + aws-partitions (1.710.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.62.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.119.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -72,39 +73,58 @@ GEM cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) - colorize (0.8.1) - commander-fastlane (4.4.6) - highline (~> 1.7.2) + commander (4.6.0) + highline (~> 2.0.0) concurrent-ruby (1.1.10) declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.1) - rake (~> 13.0) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.0.0) + dotenv (2.8.1) + emoji_regex (3.2.3) escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) - excon (0.78.0) - faraday (1.1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + excon (0.99.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.0) - fastlane (2.164.0) + fastimage (2.2.6) + fastlane (2.211.0) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored - commander-fastlane (>= 4.4.6, < 5.0.0) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -113,18 +133,20 @@ GEM faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) @@ -133,95 +155,96 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-test_center (3.15.3) - colorize - json - plist - trainer - xcodeproj - xctest_list (>= 1.2.1) ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-api-client (0.38.0) + google-apis-androidpublisher_v3 (0.33.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-cloud-core (1.5.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.16.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-playcustomapp_v1 (0.12.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.4.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.29.1) - addressable (~> 2.5) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.44.0) + addressable (~> 2.8) digest-crc (~> 0.4) - google-api-client (~> 0.33) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.14.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.10.0) concurrent-ruby (~> 1.0) - jmespath (1.4.0) - json (2.6.1) - jwt (2.2.2) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) memoist (0.16.2) - mini_magick (4.10.1) - mini_mime (1.0.2) + mini_magick (4.12.0) + mini_mime (1.1.2) minitest (5.15.0) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) nap (1.1.0) - naturally (2.2.0) + naturally (2.2.1) netrc (0.11.0) - os (1.1.1) - plist (3.5.0) - public_suffix (4.0.6) - rake (13.0.1) - representable (3.0.4) + optparse (0.1.1) + os (1.1.4) + plist (3.6.0) + public_suffix (4.0.7) + rake (13.0.6) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) rexml (3.2.5) rouge (2.0.7) ruby-macho (2.5.1) - ruby2_keywords (0.0.2) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) security (0.1.3) - signet (0.14.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally - slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - trainer (0.9.1) - fastlane (>= 2.25.0) - plist (>= 3.1.0, < 4.0.0) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -233,10 +256,11 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) + webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.21.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -245,9 +269,8 @@ GEM rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.0) + xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - xctest_list (1.2.1) zeitwerk (2.5.4) PLATFORMS @@ -256,7 +279,6 @@ PLATFORMS DEPENDENCIES cocoapods (= 1.11.3) fastlane (~> 2.137) - fastlane-plugin-test_center BUNDLED WITH 1.17.3 diff --git a/Podfile.lock b/Podfile.lock index bcf76256..394cf30a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3558c3b60c01e8cff4f7b0ac1bd6ef19441afc81 -COCOAPODS: 1.10.0 +COCOAPODS: 1.11.3 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 07d836dd..d912dc89 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,22 +3,48 @@ skip_docs platform :ios do lane :test do |options| - puts 'Running on GitHub CI.' if options[:ci] == 'github' - multi_scan( - devices: ["iPhone 8", "iPad (8th generation)"], + ci = ENV['CI'] + puts 'Running on CI.' if ci + + devices = case options[:ios] || 13 + when 13 + [ + "iPhone 11 Pro (13.7)", + "iPad Pro (11-inch) (2nd generation) (13.7)" + ] + when 14 + [ + "iPhone 11 Pro (14.5)", + "iPad Pro (11-inch) (3rd generation) (14.5)" + ] + when 15 + [ + "iPhone 11 Pro (15.5)", + "iPad Pro (11-inch) (3rd generation) (15.5)" + ] + when 16 + [ + "iPhone 14 Pro (16.2)", + "iPad Pro (11-inch) (4th generation) (16.2)" + ] + else + puts "Unsupported iOS version: #{ios}" + exit 1 + end + run_tests( + devices: devices, + ensure_devices_found: true, scheme: "Introspect iOS", - skip_build: options[:ci] == 'github', - try_count: 3, - quit_simulators: false + # skip_build: ci, ) - multi_scan( - devices: ["Apple TV"], - scheme: "Introspect tvOS", - skip_build: options[:ci] == 'github', - try_count: 3, - quit_simulators: false - ) + # run_tests( + # devices: ["Apple TV"], + # scheme: "Introspect tvOS", + # skip_build: options[:ci] == 'github', + # try_count: 3, + # quit_simulators: false + # ) end end diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile index 139f3a77..273a6b6f 100644 --- a/fastlane/Pluginfile +++ b/fastlane/Pluginfile @@ -1,5 +1,3 @@ # Autogenerated by fastlane # # Ensure this file is checked in to source control! - -gem 'fastlane-plugin-test_center' From f2ab66eb7a01fddbfad9ea5b8dd783848b4f50f9 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:20:06 +0000 Subject: [PATCH 02/57] wip --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d164e82..57decc51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,22 +26,22 @@ jobs: - ios # - mac include: - - os: macos-11 - platform: ios - platform_version: 13 + - platform_version: 13 xcode: 11.7 - - os: macos-11 + os: macos-11 platform: ios - platform_version: 14 + - platform_version: 14 xcode: 12.5.1 - - os: macos-12 platform: ios - platform_version: 15 + os: macos-11 + - platform_version: 15 xcode: 13.4.1 - - os: macos-12 + os: macos-12 platform: ios - platform_version: 16 + - platform_version: 16 xcode: 14.2 + os: macos-12 + platform: ios steps: From 13c9e9ec26727a5d49d81c1b51d359f080a15e53 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:23:43 +0000 Subject: [PATCH 03/57] wip --- .github/workflows/ci.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57decc51..3b3999d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,25 +23,24 @@ jobs: - macos-11 - macos-12 platform: - - ios + - [ios, 13] + - [ios, 14] + - [ios, 15] + - [ios, 16] # - mac include: - - platform_version: 13 + - platform: [ios, 13] xcode: 11.7 os: macos-11 - platform: ios - - platform_version: 14 + - platform: [ios, 14] xcode: 12.5.1 - platform: ios os: macos-11 - - platform_version: 15 + - platform: [ios, 15] xcode: 13.4.1 os: macos-12 - platform: ios - - platform_version: 16 + - platform: [ios, 16] xcode: 14.2 os: macos-12 - platform: ios steps: From 965655e1a4bffe93e105a410f72b4fedd091d99f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:25:09 +0000 Subject: [PATCH 04/57] wip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b3999d3..899ef7c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: run: swift build -j 2 --disable-index-store -v - name: Run Tests - run: bundle exec fastlane ${{ matrix.platform }} test ${{ matrix.platform_version }} + run: bundle exec fastlane ${{ matrix.platform[0] }} test ${{ matrix.platform[1] }} - name: Lint podspec run: bundle exec pod lib lint From bc4c605c84b26390739693f3cc56e6d44b90d20b Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:25:50 +0000 Subject: [PATCH 05/57] wip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 899ef7c1..825eda3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ concurrency: jobs: ci: - name: ${{ matrix.platform }} ${{ matrix.platform_version }} + name: ${{ matrix.platform[0] }} ${{ matrix.platform[1] }} runs-on: ${{ matrix.os }} strategy: fail-fast: false From 3a3c94a7ba3a195f762db0c8fa6d0da72636f6d1 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:26:48 +0000 Subject: [PATCH 06/57] wip --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 825eda3b..4ce28481 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,17 +30,17 @@ jobs: # - mac include: - platform: [ios, 13] - xcode: 11.7 os: macos-11 + xcode: 11.7 - platform: [ios, 14] - xcode: 12.5.1 os: macos-11 + xcode: 12.5.1 - platform: [ios, 15] - xcode: 13.4.1 os: macos-12 + xcode: 13.4.1 - platform: [ios, 16] - xcode: 14.2 os: macos-12 + xcode: 14.2 steps: From ee7c1581dfd2d433946595ac0a40d58f037dbdb7 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:27:31 +0000 Subject: [PATCH 07/57] wip --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ce28481..9e239664 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,6 @@ jobs: strategy: fail-fast: false matrix: - os: - - macos-11 - - macos-12 platform: - [ios, 13] - [ios, 14] From 4748e55532a7567451a377bc725afeb352dd5c37 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:31:10 +0000 Subject: [PATCH 08/57] wip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e239664..5c88c3d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: ci on: push: @@ -74,7 +74,7 @@ jobs: run: swift build -j 2 --disable-index-store -v - name: Run Tests - run: bundle exec fastlane ${{ matrix.platform[0] }} test ${{ matrix.platform[1] }} + run: bundle exec fastlane ${{ matrix.platform[0] }} test ${{ matrix.platform[0] }}:${{ matrix.platform[1] }} - name: Lint podspec run: bundle exec pod lib lint From 6d84886d141ec0dfd39811f09f38cefa0f30603e Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:37:21 +0000 Subject: [PATCH 09/57] wip --- .github/workflows/ci.yml | 4 ++-- fastlane/Fastfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c88c3d8..a7abbaba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: # - name: Export macOS SDK # run: echo SDKROOT=$(xcrun --sdk macosx --show-sdk-path) >> $GITHUB_ENV - - name: Install gem dependencies + - name: Bundler uses: ruby/setup-ruby@v1 with: ruby-version: .ruby-version @@ -74,7 +74,7 @@ jobs: run: swift build -j 2 --disable-index-store -v - name: Run Tests - run: bundle exec fastlane ${{ matrix.platform[0] }} test ${{ matrix.platform[0] }}:${{ matrix.platform[1] }} + run: bundle exec fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} - name: Lint podspec run: bundle exec pod lib lint diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d912dc89..8addb790 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,7 +6,7 @@ platform :ios do ci = ENV['CI'] puts 'Running on CI.' if ci - devices = case options[:ios] || 13 + devices = case (options[:version] || 13).to_i when 13 [ "iPhone 11 Pro (13.7)", From 6b4c8f27c8754570b8ad20bc40664e94ed1a0f7d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:50:23 +0000 Subject: [PATCH 10/57] wip --- Introspect.xcodeproj/project.pbxproj | 4 ++-- Introspect/UIKitIntrospectionView.swift | 2 -- .../UIKitIntrospectionViewController.swift | 2 -- Introspect/ViewExtensions.swift | 2 -- IntrospectTests/UIKitTests.swift | 19 +------------------ Package.swift | 9 ++++----- 6 files changed, 7 insertions(+), 31 deletions(-) diff --git a/Introspect.xcodeproj/project.pbxproj b/Introspect.xcodeproj/project.pbxproj index 35a6f308..18766ff8 100644 --- a/Introspect.xcodeproj/project.pbxproj +++ b/Introspect.xcodeproj/project.pbxproj @@ -691,7 +691,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -750,7 +750,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; diff --git a/Introspect/UIKitIntrospectionView.swift b/Introspect/UIKitIntrospectionView.swift index a14eb789..d999a7ef 100644 --- a/Introspect/UIKitIntrospectionView.swift +++ b/Introspect/UIKitIntrospectionView.swift @@ -3,7 +3,6 @@ import UIKit import SwiftUI /// Introspection UIView that is inserted alongside the target view. -@available(iOS 13.0, *) public class IntrospectionUIView: UIView { var moveToWindowHandler: (() -> Void)? @@ -27,7 +26,6 @@ public class IntrospectionUIView: UIView { /// Introspection View that is injected into the UIKit hierarchy alongside the target view. /// After `updateUIView` is called, it calls `selector` to find the target view, then `customize` when the target view is found. -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) public struct UIKitIntrospectionView: UIViewRepresentable { /// Method that introspects the view hierarchy to find the target view. diff --git a/Introspect/UIKitIntrospectionViewController.swift b/Introspect/UIKitIntrospectionViewController.swift index fd8e437e..daeafd10 100644 --- a/Introspect/UIKitIntrospectionViewController.swift +++ b/Introspect/UIKitIntrospectionViewController.swift @@ -3,7 +3,6 @@ import SwiftUI import UIKit /// Introspection UIViewController that is inserted alongside the target view controller. -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) public class IntrospectionUIViewController: UIViewController { required init() { super.init(nibName: nil, bundle: nil) @@ -17,7 +16,6 @@ public class IntrospectionUIViewController: UIViewController { } /// This is the same logic as IntrospectionView but for view controllers. Please see details above. -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) public struct UIKitIntrospectionViewController: UIViewControllerRepresentable { let selector: (IntrospectionUIViewController) -> TargetViewControllerType? diff --git a/Introspect/ViewExtensions.swift b/Introspect/ViewExtensions.swift index d4abd396..b406c036 100644 --- a/Introspect/ViewExtensions.swift +++ b/Introspect/ViewExtensions.swift @@ -6,7 +6,6 @@ import AppKit import UIKit #endif -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) extension View { public func inject(_ view: SomeView) -> some View where SomeView: View { overlay(view.frame(width: 0, height: 0)) @@ -14,7 +13,6 @@ extension View { } #if canImport(UIKit) -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) extension View { /// Finds a `TargetView` from a `SwiftUI.View` diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index ff59be31..a573a26f 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -4,7 +4,6 @@ import SwiftUI @testable import Introspect -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) enum TestUtils { enum Constants { static let timeout: TimeInterval = 3 @@ -33,7 +32,6 @@ enum TestUtils { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct NavigationTestView: View { let spy: () -> Void var body: some View { @@ -49,7 +47,6 @@ private struct NavigationTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct SplitNavigationTestView: View { let spy: () -> Void var body: some View { @@ -65,7 +62,6 @@ private struct SplitNavigationTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct ViewControllerTestView: View { let spy: () -> Void var body: some View { @@ -80,7 +76,6 @@ private struct ViewControllerTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct NavigationRootTestView: View { let spy: () -> Void var body: some View { @@ -95,7 +90,6 @@ private struct NavigationRootTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct TabTestView: View { @State private var selection = 0 let spy: () -> Void @@ -110,7 +104,6 @@ private struct TabTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct TabRootTestView: View { @State private var selection = 0 let spy: () -> Void @@ -143,7 +136,6 @@ private struct PageTabViewStyleTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct ListTestView: View { let spy1: () -> Void @@ -152,7 +144,7 @@ private struct ListTestView: View { let spyCell2: () -> Void var body: some View { - if #available(iOS 16, tvOS 16, macOS 13, *) { + if #available(iOS 16, tvOS 16, *) { List { Text("Item 1") Text("Item 2") @@ -192,7 +184,6 @@ private struct ListTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct ScrollTestView: View { let spy1: (UIScrollView) -> Void @@ -216,7 +207,6 @@ private struct ScrollTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct NestedScrollTestView: View { let spy1: (UIScrollView) -> Void @@ -241,7 +231,6 @@ private struct NestedScrollTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct TextFieldTestView: View { let spy1: (UITextField) -> Void let spy2: (UITextField) -> Void @@ -285,7 +274,6 @@ private struct TextEditorTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) @available(tvOS, unavailable) private struct ToggleTestView: View { let spy: () -> Void @@ -298,7 +286,6 @@ private struct ToggleTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) @available(tvOS, unavailable) private struct SliderTestView: View { let spy: () -> Void @@ -311,7 +298,6 @@ private struct SliderTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) @available(tvOS, unavailable) private struct StepperTestView: View { let spy: () -> Void @@ -325,7 +311,6 @@ private struct StepperTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) @available(tvOS, unavailable) private struct DatePickerTestView: View { let spy: () -> Void @@ -340,7 +325,6 @@ private struct DatePickerTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) private struct SegmentedControlTestView: View { @State private var pickerValue = 0 let spy: () -> Void @@ -371,7 +355,6 @@ private struct ColorWellTestView: View { } } -@available(iOS 13.0, tvOS 13.0, macOS 10.15.0, *) class UIKitTests: XCTestCase { func testNavigation() { diff --git a/Package.swift b/Package.swift index d39f203b..603a0c16 100644 --- a/Package.swift +++ b/Package.swift @@ -1,20 +1,19 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.5 import PackageDescription let package = Package( name: "Introspect", platforms: [ - .macOS(.v10_13), - .iOS(.v11), - .tvOS(.v11) + .macOS(.v10_15), + .iOS(.v13), + .tvOS(.v13), ], products: [ .library(name: "Introspect", targets: ["Introspect"]), .library(name: "Introspect-Static", type: .static, targets: ["Introspect"]), .library(name: "Introspect-Dynamic", type: .dynamic, targets: ["Introspect"]), ], - dependencies: [], targets: [ .target( name: "Introspect", From 0ab6a2dabc13ae216e3c842ce93017122407fa2d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:59:22 +0000 Subject: [PATCH 11/57] wip --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7abbaba..ec0ecd0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,9 @@ jobs: if: steps.cache-pods.outputs.cache-hit != 'true' run: bundle exec pod install + - name: Install Homebrew dependencies + run: brew install xcbeautify + - name: Build Swift Package run: swift build -j 2 --disable-index-store -v From e2de5cc7f3c7c373cc093ac2f5319b8d61023b67 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:05:08 +0000 Subject: [PATCH 12/57] wip --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 603a0c16..3a55c61a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.2 import PackageDescription From f6a715d568ac39decd120ce5b35681964ce57c97 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:20:20 +0000 Subject: [PATCH 13/57] wip --- .github/workflows/ci.yml | 27 ++++++--------------------- Gemfile.lock | 16 ++++++++-------- Introspect.podspec | 10 +++++----- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec0ecd0f..a3e55f32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: steps: - - name: Checkout Repository + - name: Git Checkout uses: actions/checkout@v3 - name: Select Xcode version @@ -52,32 +52,17 @@ jobs: # - name: Export macOS SDK # run: echo SDKROOT=$(xcrun --sdk macosx --show-sdk-path) >> $GITHUB_ENV + - name: Install Homebrew dependencies + run: brew install xcbeautify + - name: Bundler uses: ruby/setup-ruby@v1 with: ruby-version: .ruby-version bundler-cache: true - - name: Cache CocoaPods dependencies - uses: actions/cache@v3 - id: cache-pods - with: - path: Pods - key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} - restore-keys: ${{ runner.os }}-pods- - - - name: Install CocoaPods dependencies - if: steps.cache-pods.outputs.cache-hit != 'true' - run: bundle exec pod install - - - name: Install Homebrew dependencies - run: brew install xcbeautify - - - name: Build Swift Package - run: swift build -j 2 --disable-index-store -v + - name: Lint Podspec + run: bundle exec pod lib lint - name: Run Tests run: bundle exec fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} - - - name: Lint podspec - run: bundle exec pod lib lint diff --git a/Gemfile.lock b/Gemfile.lock index 84f6de85..951b265f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (6.1.5) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -63,7 +63,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.1) + cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -75,7 +75,7 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) declarative (0.0.20) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) @@ -84,7 +84,7 @@ GEM dotenv (2.8.1) emoji_regex (3.2.3) escape (0.0.4) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) excon (0.99.0) faraday (1.10.3) @@ -201,7 +201,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) jmespath (1.6.2) json (2.6.3) @@ -209,7 +209,7 @@ GEM memoist (0.16.2) mini_magick (4.12.0) mini_mime (1.1.2) - minitest (5.15.0) + minitest (5.17.0) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) @@ -251,7 +251,7 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) @@ -271,7 +271,7 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.5.4) + zeitwerk (2.6.7) PLATFORMS ruby diff --git a/Introspect.podspec b/Introspect.podspec index 5182b2c8..ba876f34 100644 --- a/Introspect.podspec +++ b/Introspect.podspec @@ -10,10 +10,10 @@ Pod::Spec.new do |spec| tag: spec.version } - spec.source_files = 'Introspect/*.swift' + spec.source_files = 'Sources/*.swift' - spec.swift_version = '5.1' - spec.ios.deployment_target = '11.0' - spec.tvos.deployment_target = '11.0' - spec.osx.deployment_target = '10.13' + spec.swift_version = '5.2' + spec.ios.deployment_target = '13.0' + spec.tvos.deployment_target = '13.0' + spec.osx.deployment_target = '10.15' end From 690e9d9f032a46b62d4c269f0b68b67a77737061 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:36:52 +0000 Subject: [PATCH 14/57] wip --- .gitignore | 89 +- .../AppDelegate.swift | 0 .../ContentView.swift | 0 {IntrospectExamples => Examples}/Info.plist | 0 .../SceneDelegate.swift | 0 Introspect.xcodeproj/project.pbxproj | 1172 ----------------- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcschemes/xcschememanagement.plist | 62 - .../contents.xcworkspacedata | 5 +- .../xcschemes/Introspect-Dynamic.xcscheme | 28 +- .../xcschemes/Introspect-Static.xcscheme | 28 +- .../xcschemes/Introspect.xcscheme | 26 +- Introspect/Info.plist | 22 - Introspect/Introspect.h | 7 - IntrospectTests/Info.plist | 22 - Package.swift | 7 +- Podfile | 9 - Podfile.lock | 16 - .../AppKitIntrospectionView.swift | 0 {Introspect => Sources}/Introspect.swift | 0 .../UIKitIntrospectionView.swift | 0 .../UIKitIntrospectionViewController.swift | 0 {Introspect => Sources}/ViewExtensions.swift | 0 {IntrospectTests => Tests}/AppKitTests.swift | 0 {IntrospectTests => Tests}/UIKitTests.swift | 0 fastlane/report.xml | 20 + fastlane/test_output/report.html | 126 ++ fastlane/test_output/report.junit | 17 + 29 files changed, 203 insertions(+), 1468 deletions(-) rename {IntrospectExamples => Examples}/AppDelegate.swift (100%) rename {IntrospectExamples => Examples}/ContentView.swift (100%) rename {IntrospectExamples => Examples}/Info.plist (100%) rename {IntrospectExamples => Examples}/SceneDelegate.swift (100%) delete mode 100644 Introspect.xcodeproj/project.pbxproj delete mode 100644 Introspect.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 Introspect.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 Introspect.xcodeproj/xcuserdata/ldiqual.xcuserdatad/xcschemes/xcschememanagement.plist rename Introspect.xcodeproj/xcshareddata/xcschemes/Introspect tvOS.xcscheme => Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme (66%) rename Introspect.xcodeproj/xcshareddata/xcschemes/Introspect macOS.xcscheme => Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme (66%) rename Introspect.xcodeproj/xcshareddata/xcschemes/Introspect iOS.xcscheme => Introspect.xcworkspace/xcshareddata/xcschemes/Introspect.xcscheme (73%) delete mode 100644 Introspect/Info.plist delete mode 100644 Introspect/Introspect.h delete mode 100644 IntrospectTests/Info.plist delete mode 100644 Podfile delete mode 100644 Podfile.lock rename {Introspect => Sources}/AppKitIntrospectionView.swift (100%) rename {Introspect => Sources}/Introspect.swift (100%) rename {Introspect => Sources}/UIKitIntrospectionView.swift (100%) rename {Introspect => Sources}/UIKitIntrospectionViewController.swift (100%) rename {Introspect => Sources}/ViewExtensions.swift (100%) rename {IntrospectTests => Tests}/AppKitTests.swift (100%) rename {IntrospectTests => Tests}/UIKitTests.swift (100%) create mode 100644 fastlane/report.xml create mode 100644 fastlane/test_output/report.html create mode 100644 fastlane/test_output/report.junit diff --git a/.gitignore b/.gitignore index d43323d2..fb2382a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,87 +1,8 @@ .DS_Store - -# Xcode -# -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -## User settings +/.build +/.swiftpm +/Packages +/*.xcodeproj xcuserdata/ - -## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) -*.xcscmblueprint -*.xccheckout - -## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) -build/ DerivedData/ -*.moved-aside -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 - -## Obj-C/Swift specific -*.hmap - -## App packaging -*.ipa -*.dSYM.zip -*.dSYM - -## Playgrounds -timeline.xctimeline -playground.xcworkspace - -# Swift Package Manager -# -# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. -# Packages/ -# Package.pins -# Package.resolved -# *.xcodeproj -# -# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata -# hence it is not needed unless you have added a package configuration file to your project -# .swiftpm - -.build/ - -# CocoaPods -Pods/ -# -# Add this line if you want to avoid checking in source code from the Xcode workspace -# *.xcworkspace - -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build/ - -# Accio dependency management -Dependencies/ -.accio/ - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. -# Instead, use fastlane to re-generate the screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/#source-control - -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots/**/*.png -fastlane/test_output - -# Code Injection -# -# After new code Injection tools there's a generated folder /iOSInjectionProject -# https://github.com/johnno1962/injectionforxcode - -iOSInjectionProject/ +.netrc diff --git a/IntrospectExamples/AppDelegate.swift b/Examples/AppDelegate.swift similarity index 100% rename from IntrospectExamples/AppDelegate.swift rename to Examples/AppDelegate.swift diff --git a/IntrospectExamples/ContentView.swift b/Examples/ContentView.swift similarity index 100% rename from IntrospectExamples/ContentView.swift rename to Examples/ContentView.swift diff --git a/IntrospectExamples/Info.plist b/Examples/Info.plist similarity index 100% rename from IntrospectExamples/Info.plist rename to Examples/Info.plist diff --git a/IntrospectExamples/SceneDelegate.swift b/Examples/SceneDelegate.swift similarity index 100% rename from IntrospectExamples/SceneDelegate.swift rename to Examples/SceneDelegate.swift diff --git a/Introspect.xcodeproj/project.pbxproj b/Introspect.xcodeproj/project.pbxproj deleted file mode 100644 index 18766ff8..00000000 --- a/Introspect.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1172 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 51; - objects = { - -/* Begin PBXBuildFile section */ - C068701C238DE85D00DAFD3D /* Introspect.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0687012238DE85D00DAFD3D /* Introspect.framework */; }; - C0687023238DE85D00DAFD3D /* Introspect.h in Headers */ = {isa = PBXBuildFile; fileRef = C0687015238DE85D00DAFD3D /* Introspect.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C068702D238DE8FD00DAFD3D /* Introspect.swift in Sources */ = {isa = PBXBuildFile; fileRef = C068702C238DE8FD00DAFD3D /* Introspect.swift */; }; - C0796E2723F3CD18002BF033 /* Introspect.swift in Sources */ = {isa = PBXBuildFile; fileRef = C068702C238DE8FD00DAFD3D /* Introspect.swift */; }; - C0796E2823F3CD1D002BF033 /* UIKitIntrospectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341423F3A13C005FA859 /* UIKitIntrospectionView.swift */; }; - C0796E2923F3CD1D002BF033 /* UIKitIntrospectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341623F3A149005FA859 /* UIKitIntrospectionViewController.swift */; }; - C0796E3423F3CDA4002BF033 /* Introspect.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0796E1F23F3CCD2002BF033 /* Introspect.framework */; }; - C0C6D68E238E006B00DA6285 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0C6D68D238E006B00DA6285 /* AppDelegate.swift */; }; - C0C6D690238E006B00DA6285 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0C6D68F238E006B00DA6285 /* SceneDelegate.swift */; }; - C0C6D692238E006B00DA6285 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0C6D691238E006B00DA6285 /* ContentView.swift */; }; - C0C6D6A0238E00D300DA6285 /* Introspect.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0687012238DE85D00DAFD3D /* Introspect.framework */; }; - C0ED341123F39EA2005FA859 /* Introspect.swift in Sources */ = {isa = PBXBuildFile; fileRef = C068702C238DE8FD00DAFD3D /* Introspect.swift */; }; - C0ED341523F3A13C005FA859 /* UIKitIntrospectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341423F3A13C005FA859 /* UIKitIntrospectionView.swift */; }; - C0ED341723F3A149005FA859 /* UIKitIntrospectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341623F3A149005FA859 /* UIKitIntrospectionViewController.swift */; }; - C0ED341B23F3A258005FA859 /* AppKitIntrospectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341A23F3A258005FA859 /* AppKitIntrospectionView.swift */; }; - C0ED341D23F3A58B005FA859 /* ViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341C23F3A58B005FA859 /* ViewExtensions.swift */; }; - C0ED343A23F3AC43005FA859 /* Introspect.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0ED340923F39E93005FA859 /* Introspect.framework */; }; - C0ED344023F3AC7F005FA859 /* AppKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED342223F3AC14005FA859 /* AppKitTests.swift */; }; - C0ED345D23F48534005FA859 /* ViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341C23F3A58B005FA859 /* ViewExtensions.swift */; }; - C0ED345E23F48535005FA859 /* ViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341C23F3A58B005FA859 /* ViewExtensions.swift */; }; - C0ED345F23F48671005FA859 /* AppKitIntrospectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341A23F3A258005FA859 /* AppKitIntrospectionView.swift */; }; - C0ED346023F48672005FA859 /* AppKitIntrospectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341A23F3A258005FA859 /* AppKitIntrospectionView.swift */; }; - C0ED346123F486D0005FA859 /* UIKitIntrospectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341423F3A13C005FA859 /* UIKitIntrospectionView.swift */; }; - C0ED346223F48770005FA859 /* UIKitIntrospectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED341623F3A149005FA859 /* UIKitIntrospectionViewController.swift */; }; - C0ED346323F48776005FA859 /* Introspect.h in Headers */ = {isa = PBXBuildFile; fileRef = C0687015238DE85D00DAFD3D /* Introspect.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C0ED346423F48776005FA859 /* Introspect.h in Headers */ = {isa = PBXBuildFile; fileRef = C0687015238DE85D00DAFD3D /* Introspect.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C0ED346623F48992005FA859 /* UIKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0687030238DF3C900DAFD3D /* UIKitTests.swift */; }; - C0ED346723F489D5005FA859 /* AppKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED342223F3AC14005FA859 /* AppKitTests.swift */; }; - C0ED346823F489D5005FA859 /* UIKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0687030238DF3C900DAFD3D /* UIKitTests.swift */; }; - C0ED346923F489D6005FA859 /* AppKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0ED342223F3AC14005FA859 /* AppKitTests.swift */; }; - C0ED346A23F489D6005FA859 /* UIKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0687030238DF3C900DAFD3D /* UIKitTests.swift */; }; - E0B11E0609FFA04A7B6A1418 /* Pods_IntrospectExamples.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5785749C354BCF848BC4EAD9 /* Pods_IntrospectExamples.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - C068701D238DE85D00DAFD3D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C0687009238DE85D00DAFD3D /* Project object */; - proxyType = 1; - remoteGlobalIDString = C0687011238DE85D00DAFD3D; - remoteInfo = Introspect; - }; - C0796E3523F3CDA4002BF033 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C0687009238DE85D00DAFD3D /* Project object */; - proxyType = 1; - remoteGlobalIDString = C0796E1E23F3CCD2002BF033; - remoteInfo = "Introspect tvOS"; - }; - C0ED343B23F3AC43005FA859 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C0687009238DE85D00DAFD3D /* Project object */; - proxyType = 1; - remoteGlobalIDString = C0ED340823F39E93005FA859; - remoteInfo = "Introspect macOS"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 5785749C354BCF848BC4EAD9 /* Pods_IntrospectExamples.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IntrospectExamples.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9BBE78DB32CCDC560004DB54 /* Pods-IntrospectExamples.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IntrospectExamples.debug.xcconfig"; path = "Target Support Files/Pods-IntrospectExamples/Pods-IntrospectExamples.debug.xcconfig"; sourceTree = ""; }; - B826284199E111BBEA21E76B /* Pods-IntrospectExamples.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IntrospectExamples.release.xcconfig"; path = "Target Support Files/Pods-IntrospectExamples/Pods-IntrospectExamples.release.xcconfig"; sourceTree = ""; }; - C0687012238DE85D00DAFD3D /* Introspect.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Introspect.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - C0687015238DE85D00DAFD3D /* Introspect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Introspect.h; sourceTree = ""; }; - C0687016238DE85D00DAFD3D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C068701B238DE85D00DAFD3D /* Introspect iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Introspect iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - C0687022238DE85D00DAFD3D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C068702C238DE8FD00DAFD3D /* Introspect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Introspect.swift; sourceTree = ""; }; - C0687030238DF3C900DAFD3D /* UIKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitTests.swift; sourceTree = ""; }; - C0796E1F23F3CCD2002BF033 /* Introspect.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Introspect.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - C0796E2F23F3CDA4002BF033 /* Introspect tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Introspect tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - C0C6D68B238E006B00DA6285 /* IntrospectExamples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IntrospectExamples.app; sourceTree = BUILT_PRODUCTS_DIR; }; - C0C6D68D238E006B00DA6285 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - C0C6D68F238E006B00DA6285 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - C0C6D691238E006B00DA6285 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - C0C6D69B238E007100DA6285 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C0ED340923F39E93005FA859 /* Introspect.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Introspect.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - C0ED341423F3A13C005FA859 /* UIKitIntrospectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitIntrospectionView.swift; sourceTree = ""; }; - C0ED341623F3A149005FA859 /* UIKitIntrospectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitIntrospectionViewController.swift; sourceTree = ""; }; - C0ED341A23F3A258005FA859 /* AppKitIntrospectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppKitIntrospectionView.swift; sourceTree = ""; }; - C0ED341C23F3A58B005FA859 /* ViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewExtensions.swift; sourceTree = ""; }; - C0ED342223F3AC14005FA859 /* AppKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppKitTests.swift; sourceTree = ""; }; - C0ED343523F3AC43005FA859 /* Introspect macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Introspect macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - C068700F238DE85D00DAFD3D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0687018238DE85D00DAFD3D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C068701C238DE85D00DAFD3D /* Introspect.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E1C23F3CCD2002BF033 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E2C23F3CDA4002BF033 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C0796E3423F3CDA4002BF033 /* Introspect.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0C6D688238E006B00DA6285 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C0C6D6A0238E00D300DA6285 /* Introspect.framework in Frameworks */, - E0B11E0609FFA04A7B6A1418 /* Pods_IntrospectExamples.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED340623F39E93005FA859 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED343223F3AC43005FA859 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED343A23F3AC43005FA859 /* Introspect.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 0534532308DF3E515053BF9F /* Pods */ = { - isa = PBXGroup; - children = ( - 9BBE78DB32CCDC560004DB54 /* Pods-IntrospectExamples.debug.xcconfig */, - B826284199E111BBEA21E76B /* Pods-IntrospectExamples.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; - C0687008238DE85D00DAFD3D = { - isa = PBXGroup; - children = ( - C0687014238DE85D00DAFD3D /* Introspect */, - C068701F238DE85D00DAFD3D /* IntrospectTests */, - C0C6D68C238E006B00DA6285 /* IntrospectExamples */, - C0687013238DE85D00DAFD3D /* Products */, - C0C6D69F238E00D300DA6285 /* Frameworks */, - 0534532308DF3E515053BF9F /* Pods */, - ); - sourceTree = ""; - }; - C0687013238DE85D00DAFD3D /* Products */ = { - isa = PBXGroup; - children = ( - C0687012238DE85D00DAFD3D /* Introspect.framework */, - C068701B238DE85D00DAFD3D /* Introspect iOS Tests.xctest */, - C0C6D68B238E006B00DA6285 /* IntrospectExamples.app */, - C0ED340923F39E93005FA859 /* Introspect.framework */, - C0ED343523F3AC43005FA859 /* Introspect macOS Tests.xctest */, - C0796E1F23F3CCD2002BF033 /* Introspect.framework */, - C0796E2F23F3CDA4002BF033 /* Introspect tvOS Tests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - C0687014238DE85D00DAFD3D /* Introspect */ = { - isa = PBXGroup; - children = ( - C0ED341A23F3A258005FA859 /* AppKitIntrospectionView.swift */, - C068702C238DE8FD00DAFD3D /* Introspect.swift */, - C0ED341623F3A149005FA859 /* UIKitIntrospectionViewController.swift */, - C0ED341423F3A13C005FA859 /* UIKitIntrospectionView.swift */, - C0ED341C23F3A58B005FA859 /* ViewExtensions.swift */, - C0ED346523F4880B005FA859 /* Supporting Files */, - ); - path = Introspect; - sourceTree = ""; - }; - C068701F238DE85D00DAFD3D /* IntrospectTests */ = { - isa = PBXGroup; - children = ( - C0ED342223F3AC14005FA859 /* AppKitTests.swift */, - C0687030238DF3C900DAFD3D /* UIKitTests.swift */, - C0687022238DE85D00DAFD3D /* Info.plist */, - ); - path = IntrospectTests; - sourceTree = ""; - }; - C0C6D68C238E006B00DA6285 /* IntrospectExamples */ = { - isa = PBXGroup; - children = ( - C0C6D68D238E006B00DA6285 /* AppDelegate.swift */, - C0C6D68F238E006B00DA6285 /* SceneDelegate.swift */, - C0C6D691238E006B00DA6285 /* ContentView.swift */, - C0C6D69B238E007100DA6285 /* Info.plist */, - ); - path = IntrospectExamples; - sourceTree = ""; - }; - C0C6D69F238E00D300DA6285 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 5785749C354BCF848BC4EAD9 /* Pods_IntrospectExamples.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - C0ED346523F4880B005FA859 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - C0687016238DE85D00DAFD3D /* Info.plist */, - C0687015238DE85D00DAFD3D /* Introspect.h */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - C068700D238DE85D00DAFD3D /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - C0687023238DE85D00DAFD3D /* Introspect.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E1A23F3CCD2002BF033 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED346423F48776005FA859 /* Introspect.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED340423F39E93005FA859 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED346323F48776005FA859 /* Introspect.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - C0687011238DE85D00DAFD3D /* Introspect iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0687026238DE85D00DAFD3D /* Build configuration list for PBXNativeTarget "Introspect iOS" */; - buildPhases = ( - C068700D238DE85D00DAFD3D /* Headers */, - C068700E238DE85D00DAFD3D /* Sources */, - C068700F238DE85D00DAFD3D /* Frameworks */, - C0687010238DE85D00DAFD3D /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Introspect iOS"; - productName = Introspect; - productReference = C0687012238DE85D00DAFD3D /* Introspect.framework */; - productType = "com.apple.product-type.framework"; - }; - C068701A238DE85D00DAFD3D /* Introspect iOS Tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0687029238DE85D00DAFD3D /* Build configuration list for PBXNativeTarget "Introspect iOS Tests" */; - buildPhases = ( - C0687017238DE85D00DAFD3D /* Sources */, - C0687018238DE85D00DAFD3D /* Frameworks */, - C0687019238DE85D00DAFD3D /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C068701E238DE85D00DAFD3D /* PBXTargetDependency */, - ); - name = "Introspect iOS Tests"; - productName = IntrospectTests; - productReference = C068701B238DE85D00DAFD3D /* Introspect iOS Tests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - C0796E1E23F3CCD2002BF033 /* Introspect tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0796E2423F3CCD2002BF033 /* Build configuration list for PBXNativeTarget "Introspect tvOS" */; - buildPhases = ( - C0796E1A23F3CCD2002BF033 /* Headers */, - C0796E1B23F3CCD2002BF033 /* Sources */, - C0796E1C23F3CCD2002BF033 /* Frameworks */, - C0796E1D23F3CCD2002BF033 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Introspect tvOS"; - productName = "Introspect tvOS"; - productReference = C0796E1F23F3CCD2002BF033 /* Introspect.framework */; - productType = "com.apple.product-type.framework"; - }; - C0796E2E23F3CDA4002BF033 /* Introspect tvOS Tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0796E3723F3CDA4002BF033 /* Build configuration list for PBXNativeTarget "Introspect tvOS Tests" */; - buildPhases = ( - C0796E2B23F3CDA4002BF033 /* Sources */, - C0796E2C23F3CDA4002BF033 /* Frameworks */, - C0796E2D23F3CDA4002BF033 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C0796E3623F3CDA4002BF033 /* PBXTargetDependency */, - ); - name = "Introspect tvOS Tests"; - productName = "Introspect tvOS Tests"; - productReference = C0796E2F23F3CDA4002BF033 /* Introspect tvOS Tests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - C0C6D68A238E006B00DA6285 /* IntrospectExamples */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0C6D69E238E007100DA6285 /* Build configuration list for PBXNativeTarget "IntrospectExamples" */; - buildPhases = ( - 9C6427CDD5EF4F1EAC75C7F9 /* [CP] Check Pods Manifest.lock */, - C0C6D687238E006B00DA6285 /* Sources */, - C0C6D688238E006B00DA6285 /* Frameworks */, - C0C6D689238E006B00DA6285 /* Resources */, - EC4E9FC6E0E62CFD8A53623A /* [CP] Embed Pods Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = IntrospectExamples; - productName = IntrospectExamples; - productReference = C0C6D68B238E006B00DA6285 /* IntrospectExamples.app */; - productType = "com.apple.product-type.application"; - }; - C0ED340823F39E93005FA859 /* Introspect macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0ED340E23F39E93005FA859 /* Build configuration list for PBXNativeTarget "Introspect macOS" */; - buildPhases = ( - C0ED340423F39E93005FA859 /* Headers */, - C0ED340523F39E93005FA859 /* Sources */, - C0ED340623F39E93005FA859 /* Frameworks */, - C0ED340723F39E93005FA859 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Introspect macOS"; - productName = "Introspect macOS"; - productReference = C0ED340923F39E93005FA859 /* Introspect.framework */; - productType = "com.apple.product-type.framework"; - }; - C0ED343423F3AC43005FA859 /* Introspect macOS Tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C0ED343D23F3AC43005FA859 /* Build configuration list for PBXNativeTarget "Introspect macOS Tests" */; - buildPhases = ( - C0ED343123F3AC43005FA859 /* Sources */, - C0ED343223F3AC43005FA859 /* Frameworks */, - C0ED343323F3AC43005FA859 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C0ED343C23F3AC43005FA859 /* PBXTargetDependency */, - ); - name = "Introspect macOS Tests"; - productName = "Introspect macOS Tests"; - productReference = C0ED343523F3AC43005FA859 /* Introspect macOS Tests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - C0687009238DE85D00DAFD3D /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1120; - ORGANIZATIONNAME = "Lois Di Qual"; - TargetAttributes = { - C0687011238DE85D00DAFD3D = { - CreatedOnToolsVersion = 11.2.1; - LastSwiftMigration = 1120; - }; - C068701A238DE85D00DAFD3D = { - CreatedOnToolsVersion = 11.2.1; - }; - C0796E1E23F3CCD2002BF033 = { - CreatedOnToolsVersion = 11.3.1; - }; - C0796E2E23F3CDA4002BF033 = { - CreatedOnToolsVersion = 11.3.1; - }; - C0C6D68A238E006B00DA6285 = { - CreatedOnToolsVersion = 11.2.1; - }; - C0ED340823F39E93005FA859 = { - CreatedOnToolsVersion = 11.3.1; - }; - C0ED343423F3AC43005FA859 = { - CreatedOnToolsVersion = 11.3.1; - }; - }; - }; - buildConfigurationList = C068700C238DE85D00DAFD3D /* Build configuration list for PBXProject "Introspect" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = C0687008238DE85D00DAFD3D; - productRefGroup = C0687013238DE85D00DAFD3D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - C0687011238DE85D00DAFD3D /* Introspect iOS */, - C068701A238DE85D00DAFD3D /* Introspect iOS Tests */, - C0ED340823F39E93005FA859 /* Introspect macOS */, - C0ED343423F3AC43005FA859 /* Introspect macOS Tests */, - C0796E1E23F3CCD2002BF033 /* Introspect tvOS */, - C0796E2E23F3CDA4002BF033 /* Introspect tvOS Tests */, - C0C6D68A238E006B00DA6285 /* IntrospectExamples */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - C0687010238DE85D00DAFD3D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0687019238DE85D00DAFD3D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E1D23F3CCD2002BF033 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E2D23F3CDA4002BF033 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0C6D689238E006B00DA6285 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED340723F39E93005FA859 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED343323F3AC43005FA859 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 9C6427CDD5EF4F1EAC75C7F9 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-IntrospectExamples-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - EC4E9FC6E0E62CFD8A53623A /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-IntrospectExamples/Pods-IntrospectExamples-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-IntrospectExamples/Pods-IntrospectExamples-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-IntrospectExamples/Pods-IntrospectExamples-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - C068700E238DE85D00DAFD3D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED341723F3A149005FA859 /* UIKitIntrospectionViewController.swift in Sources */, - C0ED345F23F48671005FA859 /* AppKitIntrospectionView.swift in Sources */, - C0ED341523F3A13C005FA859 /* UIKitIntrospectionView.swift in Sources */, - C0ED345E23F48535005FA859 /* ViewExtensions.swift in Sources */, - C068702D238DE8FD00DAFD3D /* Introspect.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0687017238DE85D00DAFD3D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED346823F489D5005FA859 /* UIKitTests.swift in Sources */, - C0ED346723F489D5005FA859 /* AppKitTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E1B23F3CCD2002BF033 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0796E2823F3CD1D002BF033 /* UIKitIntrospectionView.swift in Sources */, - C0ED346023F48672005FA859 /* AppKitIntrospectionView.swift in Sources */, - C0796E2923F3CD1D002BF033 /* UIKitIntrospectionViewController.swift in Sources */, - C0ED345D23F48534005FA859 /* ViewExtensions.swift in Sources */, - C0796E2723F3CD18002BF033 /* Introspect.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0796E2B23F3CDA4002BF033 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED346A23F489D6005FA859 /* UIKitTests.swift in Sources */, - C0ED346923F489D6005FA859 /* AppKitTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0C6D687238E006B00DA6285 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0C6D68E238E006B00DA6285 /* AppDelegate.swift in Sources */, - C0C6D690238E006B00DA6285 /* SceneDelegate.swift in Sources */, - C0C6D692238E006B00DA6285 /* ContentView.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED340523F39E93005FA859 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED341B23F3A258005FA859 /* AppKitIntrospectionView.swift in Sources */, - C0ED341D23F3A58B005FA859 /* ViewExtensions.swift in Sources */, - C0ED346123F486D0005FA859 /* UIKitIntrospectionView.swift in Sources */, - C0ED341123F39EA2005FA859 /* Introspect.swift in Sources */, - C0ED346223F48770005FA859 /* UIKitIntrospectionViewController.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C0ED343123F3AC43005FA859 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C0ED346623F48992005FA859 /* UIKitTests.swift in Sources */, - C0ED344023F3AC7F005FA859 /* AppKitTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - C068701E238DE85D00DAFD3D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C0687011238DE85D00DAFD3D /* Introspect iOS */; - targetProxy = C068701D238DE85D00DAFD3D /* PBXContainerItemProxy */; - }; - C0796E3623F3CDA4002BF033 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C0796E1E23F3CCD2002BF033 /* Introspect tvOS */; - targetProxy = C0796E3523F3CDA4002BF033 /* PBXContainerItemProxy */; - }; - C0ED343C23F3AC43005FA859 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C0ED340823F39E93005FA859 /* Introspect macOS */; - targetProxy = C0ED343B23F3AC43005FA859 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - C0687024238DE85D00DAFD3D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TVOS_DEPLOYMENT_TARGET = 13.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - C0687025238DE85D00DAFD3D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - TVOS_DEPLOYMENT_TARGET = 13.0; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - C0687027238DE85D00DAFD3D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Introspect/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 0.1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Introspect; - PRODUCT_NAME = Introspect; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = YES; - SUPPORTS_MACCATALYST = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - C0687028238DE85D00DAFD3D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Introspect/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 0.1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Introspect; - PRODUCT_NAME = Introspect; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = YES; - SUPPORTS_MACCATALYST = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - C068702A238DE85D00DAFD3D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = IntrospectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.loisdiqual.IntrospectTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - C068702B238DE85D00DAFD3D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = IntrospectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.loisdiqual.IntrospectTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - C0796E2523F3CCD2002BF033 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Introspect/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 0.1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Introspect; - PRODUCT_NAME = Introspect; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 13.2; - }; - name = Debug; - }; - C0796E2623F3CCD2002BF033 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Introspect/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 0.1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Introspect; - PRODUCT_NAME = Introspect; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 13.2; - }; - name = Release; - }; - C0796E3823F3CDA4002BF033 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = IntrospectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.siteline.Introspect-tvOS-Tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 13.2; - }; - name = Debug; - }; - C0796E3923F3CDA4002BF033 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = IntrospectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.siteline.Introspect-tvOS-Tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 13.2; - }; - name = Release; - }; - C0C6D69C238E007100DA6285 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9BBE78DB32CCDC560004DB54 /* Pods-IntrospectExamples.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - ENABLE_PREVIEWS = YES; - INFOPLIST_FILE = IntrospectExamples/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 0.0.6; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.IntrospectExamples; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - C0C6D69D238E007100DA6285 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = B826284199E111BBEA21E76B /* Pods-IntrospectExamples.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - ENABLE_PREVIEWS = YES; - INFOPLIST_FILE = IntrospectExamples/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 0.0.6; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.IntrospectExamples; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - C0ED340F23F39E93005FA859 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Introspect/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Introspect; - PRODUCT_NAME = Introspect; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - C0ED341023F39E93005FA859 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Introspect/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Introspect; - PRODUCT_NAME = Introspect; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - C0ED343E23F3AC43005FA859 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = IntrospectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.15; - PRODUCT_BUNDLE_IDENTIFIER = "com.siteline.Introspect-macOS-Tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = macosx; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - C0ED343F23F3AC43005FA859 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = IntrospectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 10.15; - PRODUCT_BUNDLE_IDENTIFIER = "com.siteline.Introspect-macOS-Tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = macosx; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C068700C238DE85D00DAFD3D /* Build configuration list for PBXProject "Introspect" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0687024238DE85D00DAFD3D /* Debug */, - C0687025238DE85D00DAFD3D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0687026238DE85D00DAFD3D /* Build configuration list for PBXNativeTarget "Introspect iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0687027238DE85D00DAFD3D /* Debug */, - C0687028238DE85D00DAFD3D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0687029238DE85D00DAFD3D /* Build configuration list for PBXNativeTarget "Introspect iOS Tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C068702A238DE85D00DAFD3D /* Debug */, - C068702B238DE85D00DAFD3D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0796E2423F3CCD2002BF033 /* Build configuration list for PBXNativeTarget "Introspect tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0796E2523F3CCD2002BF033 /* Debug */, - C0796E2623F3CCD2002BF033 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0796E3723F3CDA4002BF033 /* Build configuration list for PBXNativeTarget "Introspect tvOS Tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0796E3823F3CDA4002BF033 /* Debug */, - C0796E3923F3CDA4002BF033 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0C6D69E238E007100DA6285 /* Build configuration list for PBXNativeTarget "IntrospectExamples" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0C6D69C238E007100DA6285 /* Debug */, - C0C6D69D238E007100DA6285 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0ED340E23F39E93005FA859 /* Build configuration list for PBXNativeTarget "Introspect macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0ED340F23F39E93005FA859 /* Debug */, - C0ED341023F39E93005FA859 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C0ED343D23F3AC43005FA859 /* Build configuration list for PBXNativeTarget "Introspect macOS Tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C0ED343E23F3AC43005FA859 /* Debug */, - C0ED343F23F3AC43005FA859 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = C0687009238DE85D00DAFD3D /* Project object */; -} diff --git a/Introspect.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Introspect.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 3bd6eed3..00000000 --- a/Introspect.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Introspect.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Introspect.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/Introspect.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Introspect.xcodeproj/xcuserdata/ldiqual.xcuserdatad/xcschemes/xcschememanagement.plist b/Introspect.xcodeproj/xcuserdata/ldiqual.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 1651105e..00000000 --- a/Introspect.xcodeproj/xcuserdata/ldiqual.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,62 +0,0 @@ - - - - - SchemeUserState - - Introspect iOS.xcscheme_^#shared#^_ - - orderHint - 0 - - Introspect macOS.xcscheme_^#shared#^_ - - orderHint - 1 - - Introspect tvOS.xcscheme_^#shared#^_ - - orderHint - 2 - - IntrospectExamples.xcscheme_^#shared#^_ - - orderHint - 3 - - - SuppressBuildableAutocreation - - C0687011238DE85D00DAFD3D - - primary - - - C068701A238DE85D00DAFD3D - - primary - - - C0796E1E23F3CCD2002BF033 - - primary - - - C0796E2E23F3CDA4002BF033 - - primary - - - C0ED340823F39E93005FA859 - - primary - - - C0ED343423F3AC43005FA859 - - primary - - - - - diff --git a/Introspect.xcworkspace/contents.xcworkspacedata b/Introspect.xcworkspace/contents.xcworkspacedata index 14ab3211..ca3329e1 100644 --- a/Introspect.xcworkspace/contents.xcworkspacedata +++ b/Introspect.xcworkspace/contents.xcworkspacedata @@ -2,9 +2,6 @@ - - + location = "group:"> diff --git a/Introspect.xcodeproj/xcshareddata/xcschemes/Introspect tvOS.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme similarity index 66% rename from Introspect.xcodeproj/xcshareddata/xcschemes/Introspect tvOS.xcscheme rename to Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme index baa2bfc4..80c68beb 100644 --- a/Introspect.xcodeproj/xcshareddata/xcschemes/Introspect tvOS.xcscheme +++ b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "Introspect-Dynamic" + BuildableName = "Introspect-Dynamic" + BlueprintName = "Introspect-Dynamic" + ReferencedContainer = "container:"> @@ -28,16 +28,6 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - + BlueprintIdentifier = "Introspect-Dynamic" + BuildableName = "Introspect-Dynamic" + BlueprintName = "Introspect-Dynamic" + ReferencedContainer = "container:"> diff --git a/Introspect.xcodeproj/xcshareddata/xcschemes/Introspect macOS.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme similarity index 66% rename from Introspect.xcodeproj/xcshareddata/xcschemes/Introspect macOS.xcscheme rename to Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme index 8a729eff..aebc9608 100644 --- a/Introspect.xcodeproj/xcshareddata/xcschemes/Introspect macOS.xcscheme +++ b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "Introspect-Static" + BuildableName = "Introspect-Static" + BlueprintName = "Introspect-Static" + ReferencedContainer = "container:"> @@ -28,16 +28,6 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - + BlueprintIdentifier = "Introspect-Static" + BuildableName = "Introspect-Static" + BlueprintName = "Introspect-Static" + ReferencedContainer = "container:"> diff --git a/Introspect.xcodeproj/xcshareddata/xcschemes/Introspect iOS.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect.xcscheme similarity index 73% rename from Introspect.xcodeproj/xcshareddata/xcschemes/Introspect iOS.xcscheme rename to Introspect.xcworkspace/xcshareddata/xcschemes/Introspect.xcscheme index 15086f80..11e22f5d 100644 --- a/Introspect.xcodeproj/xcshareddata/xcschemes/Introspect iOS.xcscheme +++ b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "Introspect" + BuildableName = "Introspect" + BlueprintName = "Introspect" + ReferencedContainer = "container:"> @@ -32,10 +32,10 @@ skipped = "NO"> + BlueprintIdentifier = "IntrospectTests" + BuildableName = "IntrospectTests" + BlueprintName = "IntrospectTests" + ReferencedContainer = "container:"> @@ -60,10 +60,10 @@ + BlueprintIdentifier = "Introspect" + BuildableName = "Introspect" + BlueprintName = "Introspect" + ReferencedContainer = "container:"> diff --git a/Introspect/Info.plist b/Introspect/Info.plist deleted file mode 100644 index c0701c6d..00000000 --- a/Introspect/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - - diff --git a/Introspect/Introspect.h b/Introspect/Introspect.h deleted file mode 100644 index 7c52b636..00000000 --- a/Introspect/Introspect.h +++ /dev/null @@ -1,7 +0,0 @@ -#import - -//! Project version number for Introspect. -FOUNDATION_EXPORT double IntrospectVersionNumber; - -//! Project version string for Introspect. -FOUNDATION_EXPORT const unsigned char IntrospectVersionString[]; diff --git a/IntrospectTests/Info.plist b/IntrospectTests/Info.plist deleted file mode 100644 index 5e0761db..00000000 --- a/IntrospectTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 0.1.3 - CFBundleVersion - 1 - - diff --git a/Package.swift b/Package.swift index 3a55c61a..9937925a 100644 --- a/Package.swift +++ b/Package.swift @@ -17,13 +17,12 @@ let package = Package( targets: [ .target( name: "Introspect", - dependencies: [], - path: "Introspect" + path: "Sources" ), .testTarget( name: "IntrospectTests", dependencies: ["Introspect"], - path: "IntrospectTests" - ) + path: "Tests" + ), ] ) diff --git a/Podfile b/Podfile deleted file mode 100644 index 08bdf02c..00000000 --- a/Podfile +++ /dev/null @@ -1,9 +0,0 @@ -platform :ios, "13.0" -inhibit_all_warnings! -use_frameworks! - -# Disable sending stats (takes too much time) -ENV["COCOAPODS_DISABLE_STATS"] = "true" - -target "IntrospectExamples" -pod "Reveal-SDK", "24", :configurations => ['Debug'] diff --git a/Podfile.lock b/Podfile.lock deleted file mode 100644 index 394cf30a..00000000 --- a/Podfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -PODS: - - Reveal-SDK (24) - -DEPENDENCIES: - - Reveal-SDK (= 24) - -SPEC REPOS: - trunk: - - Reveal-SDK - -SPEC CHECKSUMS: - Reveal-SDK: 5d7e56b8f018c0a88b3a2c10bf68d598bbd3b071 - -PODFILE CHECKSUM: 3558c3b60c01e8cff4f7b0ac1bd6ef19441afc81 - -COCOAPODS: 1.11.3 diff --git a/Introspect/AppKitIntrospectionView.swift b/Sources/AppKitIntrospectionView.swift similarity index 100% rename from Introspect/AppKitIntrospectionView.swift rename to Sources/AppKitIntrospectionView.swift diff --git a/Introspect/Introspect.swift b/Sources/Introspect.swift similarity index 100% rename from Introspect/Introspect.swift rename to Sources/Introspect.swift diff --git a/Introspect/UIKitIntrospectionView.swift b/Sources/UIKitIntrospectionView.swift similarity index 100% rename from Introspect/UIKitIntrospectionView.swift rename to Sources/UIKitIntrospectionView.swift diff --git a/Introspect/UIKitIntrospectionViewController.swift b/Sources/UIKitIntrospectionViewController.swift similarity index 100% rename from Introspect/UIKitIntrospectionViewController.swift rename to Sources/UIKitIntrospectionViewController.swift diff --git a/Introspect/ViewExtensions.swift b/Sources/ViewExtensions.swift similarity index 100% rename from Introspect/ViewExtensions.swift rename to Sources/ViewExtensions.swift diff --git a/IntrospectTests/AppKitTests.swift b/Tests/AppKitTests.swift similarity index 100% rename from IntrospectTests/AppKitTests.swift rename to Tests/AppKitTests.swift diff --git a/IntrospectTests/UIKitTests.swift b/Tests/UIKitTests.swift similarity index 100% rename from IntrospectTests/UIKitTests.swift rename to Tests/UIKitTests.swift diff --git a/fastlane/report.xml b/fastlane/report.xml new file mode 100644 index 00000000..d4633dc4 --- /dev/null +++ b/fastlane/report.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/fastlane/test_output/report.html b/fastlane/test_output/report.html new file mode 100644 index 00000000..4bb3d788 --- /dev/null +++ b/fastlane/test_output/report.html @@ -0,0 +1,126 @@ + + + + + Test Results | xcpretty + + + + +
+
+

Test Results

+
+
+
+

0 tests

+ +
+
+ AllFailingPassing +
+
+
+
+ +
+ + + diff --git a/fastlane/test_output/report.junit b/fastlane/test_output/report.junit new file mode 100644 index 00000000..a988f65c --- /dev/null +++ b/fastlane/test_output/report.junit @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From d91352df92caa4398691dd215b72b7ed679bf75c Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:38:48 +0000 Subject: [PATCH 15/57] wip --- .../xcschemes/Introspect-Dynamic.xcscheme | 67 ------------------- .../xcschemes/Introspect-Static.xcscheme | 67 ------------------- 2 files changed, 134 deletions(-) delete mode 100644 Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme delete mode 100644 Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme diff --git a/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme deleted file mode 100644 index 80c68beb..00000000 --- a/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme deleted file mode 100644 index aebc9608..00000000 --- a/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - From cbe35fb1946f9f5457ed8d0ca0756b2884a19420 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:41:21 +0000 Subject: [PATCH 16/57] wip --- fastlane/Fastfile | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8addb790..067cd4ae 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -10,41 +10,38 @@ platform :ios do when 13 [ "iPhone 11 Pro (13.7)", - "iPad Pro (11-inch) (2nd generation) (13.7)" + "iPad Pro (11-inch) (2nd generation) (13.7)", + "Apple TV (13.7)", ] when 14 [ "iPhone 11 Pro (14.5)", - "iPad Pro (11-inch) (3rd generation) (14.5)" + "iPad Pro (11-inch) (3rd generation) (14.5)", + "Apple TV (14.5)", ] when 15 [ "iPhone 11 Pro (15.5)", - "iPad Pro (11-inch) (3rd generation) (15.5)" + "iPad Pro (11-inch) (3rd generation) (15.5)", + "Apple TV (15.5)", ] when 16 [ "iPhone 14 Pro (16.2)", "iPad Pro (11-inch) (4th generation) (16.2)" + "Apple TV (16.2)", ] else puts "Unsupported iOS version: #{ios}" exit 1 end + run_tests( devices: devices, ensure_devices_found: true, - scheme: "Introspect iOS", + scheme: "Introspect", # skip_build: ci, ) - - # run_tests( - # devices: ["Apple TV"], - # scheme: "Introspect tvOS", - # skip_build: options[:ci] == 'github', - # try_count: 3, - # quit_simulators: false - # ) end end From dc9f08354e117618d45f05b684aec90aabbaadc9 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:41:56 +0000 Subject: [PATCH 17/57] wip --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 067cd4ae..3c4dda63 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -28,7 +28,7 @@ platform :ios do when 16 [ "iPhone 14 Pro (16.2)", - "iPad Pro (11-inch) (4th generation) (16.2)" + "iPad Pro (11-inch) (4th generation) (16.2)", "Apple TV (16.2)", ] else From 5f1a0bd4af272e5e63fcab1843052e19bc0ced67 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:44:33 +0000 Subject: [PATCH 18/57] wip --- .gitignore | 5 +++++ fastlane/Fastfile | 6 +++--- fastlane/report.xml | 20 -------------------- 3 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 fastlane/report.xml diff --git a/.gitignore b/.gitignore index fb2382a7..4f0a9059 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,8 @@ xcuserdata/ DerivedData/ .netrc + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3c4dda63..6a3c34f3 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -11,7 +11,7 @@ platform :ios do [ "iPhone 11 Pro (13.7)", "iPad Pro (11-inch) (2nd generation) (13.7)", - "Apple TV (13.7)", + "Apple TV (13.4)", ] when 14 [ @@ -23,13 +23,13 @@ platform :ios do [ "iPhone 11 Pro (15.5)", "iPad Pro (11-inch) (3rd generation) (15.5)", - "Apple TV (15.5)", + "Apple TV (15.4)", ] when 16 [ "iPhone 14 Pro (16.2)", "iPad Pro (11-inch) (4th generation) (16.2)", - "Apple TV (16.2)", + "Apple TV (16.1)", ] else puts "Unsupported iOS version: #{ios}" diff --git a/fastlane/report.xml b/fastlane/report.xml deleted file mode 100644 index d4633dc4..00000000 --- a/fastlane/report.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - From 11e7b7dd1bed6a567aa258328eee26e4a004dfa9 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:48:54 +0000 Subject: [PATCH 19/57] wip --- fastlane/test_output/report.html | 126 ------------------------------ fastlane/test_output/report.junit | 17 ---- 2 files changed, 143 deletions(-) delete mode 100644 fastlane/test_output/report.html delete mode 100644 fastlane/test_output/report.junit diff --git a/fastlane/test_output/report.html b/fastlane/test_output/report.html deleted file mode 100644 index 4bb3d788..00000000 --- a/fastlane/test_output/report.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - Test Results | xcpretty - - - - -
-
-

Test Results

-
-
-
-

0 tests

- -
-
- AllFailingPassing -
-
-
-
- -
- - - diff --git a/fastlane/test_output/report.junit b/fastlane/test_output/report.junit deleted file mode 100644 index a988f65c..00000000 --- a/fastlane/test_output/report.junit +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From de72a10364c3e23b79030569f414a809eb62cf33 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:50:01 +0000 Subject: [PATCH 20/57] wip --- .github/workflows/ci.yml | 2 +- Gemfile | 1 - Gemfile.lock | 66 ---------------------------------------- 3 files changed, 1 insertion(+), 68 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3e55f32..f9718fd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: bundler-cache: true - name: Lint Podspec - run: bundle exec pod lib lint + run: pod lib lint - name: Run Tests run: bundle exec fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} diff --git a/Gemfile b/Gemfile index ce315d7a..98a0673b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source "https://rubygems.org" -gem "cocoapods", "1.11.3" gem "fastlane", "~> 2.137" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Gemfile.lock b/Gemfile.lock index 951b265f..287086fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,17 +3,8 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (6.1.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) @@ -34,48 +25,10 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) - cocoapods (1.11.3) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.8.0) - nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) - addressable (~> 2.8) - algoliasearch (~> 1.0) - concurrent-ruby (~> 1.1) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - netrc (~> 0.11) - public_suffix (~> 4.0) - typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.1) - cocoapods-trunk (1.6.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.2.0) declarative (0.0.20) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) @@ -83,9 +36,6 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) emoji_regex (3.2.3) - escape (0.0.4) - ethon (0.16.0) - ffi (>= 1.15.0) excon (0.99.0) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -155,9 +105,6 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - ffi (1.15.5) - fourflusher (2.3.1) - fuzzy_match (2.0.4) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.33.0) google-apis-core (>= 0.9.1, < 2.a) @@ -201,22 +148,16 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.12.0) - concurrent-ruby (~> 1.0) jmespath (1.6.2) json (2.6.3) jwt (2.7.0) memoist (0.16.2) mini_magick (4.12.0) mini_mime (1.1.2) - minitest (5.17.0) - molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) - nap (1.1.0) naturally (2.2.1) - netrc (0.11.0) optparse (0.1.1) os (1.1.4) plist (3.6.0) @@ -229,7 +170,6 @@ GEM retriable (3.1.2) rexml (3.2.5) rouge (2.0.7) - ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) @@ -249,10 +189,6 @@ GEM tty-screen (0.8.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext @@ -271,13 +207,11 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.6.7) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.11.3) fastlane (~> 2.137) BUNDLED WITH From 94ad250c426bb1419f133c99d83ccdca79f0607f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:51:56 +0000 Subject: [PATCH 21/57] wip --- fastlane/Fastfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6a3c34f3..4b8639b8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -11,25 +11,25 @@ platform :ios do [ "iPhone 11 Pro (13.7)", "iPad Pro (11-inch) (2nd generation) (13.7)", - "Apple TV (13.4)", + # "Apple TV (13.4)", ] when 14 [ "iPhone 11 Pro (14.5)", "iPad Pro (11-inch) (3rd generation) (14.5)", - "Apple TV (14.5)", + # "Apple TV (14.5)", ] when 15 [ "iPhone 11 Pro (15.5)", "iPad Pro (11-inch) (3rd generation) (15.5)", - "Apple TV (15.4)", + # "Apple TV (15.4)", ] when 16 [ "iPhone 14 Pro (16.2)", "iPad Pro (11-inch) (4th generation) (16.2)", - "Apple TV (16.1)", + # "Apple TV (16.1)", ] else puts "Unsupported iOS version: #{ios}" From f4f5ec409e7397559edbe1b997aab2df6aee87ad Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:56:44 +0000 Subject: [PATCH 22/57] wip --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 4b8639b8..27d19844 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,7 +6,7 @@ platform :ios do ci = ENV['CI'] puts 'Running on CI.' if ci - devices = case (options[:version] || 13).to_i + devices = case (options[:version] || 16).to_i when 13 [ "iPhone 11 Pro (13.7)", From 8b060dbc22a9f529b2da9cabb05335caa928dc14 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 14:05:14 +0000 Subject: [PATCH 23/57] wip --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 27d19844..91c11b19 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,7 +6,8 @@ platform :ios do ci = ENV['CI'] puts 'Running on CI.' if ci - devices = case (options[:version] || 16).to_i + version = options[:version].to_i || 16 + devices = case version when 13 [ "iPhone 11 Pro (13.7)", @@ -32,8 +33,7 @@ platform :ios do # "Apple TV (16.1)", ] else - puts "Unsupported iOS version: #{ios}" - exit 1 + raise "Unsupported iOS version: #{version}" end run_tests( From 2b631bcc2cc6b44ab95ced711e1ed6f6f9a0f542 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 14:07:11 +0000 Subject: [PATCH 24/57] wip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9718fd9..95a75d34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,8 +61,8 @@ jobs: ruby-version: .ruby-version bundler-cache: true - - name: Lint Podspec - run: pod lib lint + # - name: Lint Podspec + # run: pod lib lint - name: Run Tests run: bundle exec fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} From 78ee90a06c44da06f9ac9dcc71ac2c61f3de89ff Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 14:17:57 +0000 Subject: [PATCH 25/57] wip --- Sources/ViewExtensions.swift | 2 +- Tests/UIKitTests.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/ViewExtensions.swift b/Sources/ViewExtensions.swift index b406c036..429a4cbd 100644 --- a/Sources/ViewExtensions.swift +++ b/Sources/ViewExtensions.swift @@ -170,7 +170,7 @@ extension View { } /// Finds a `UIColorWell` from a `SwiftUI.ColorPicker` - @available(iOS 14.0, *) + @available(iOS 14.0, tvOS 14.0, *) @available(tvOS, unavailable) public func introspectColorWell(customize: @escaping (UIColorWell) -> ()) -> some View { introspect(selector: TargetViewSelector.siblingContaining, customize: customize) diff --git a/Tests/UIKitTests.swift b/Tests/UIKitTests.swift index a573a26f..ae12533d 100644 --- a/Tests/UIKitTests.swift +++ b/Tests/UIKitTests.swift @@ -341,7 +341,7 @@ private struct SegmentedControlTestView: View { } } -@available(iOS 14.0, tvOS 13.0, macOS 11.0, *) +@available(iOS 14.0, tvOS 14.0, *) @available(tvOS, unavailable) private struct ColorWellTestView: View { @State private var color = Color.black From d8841c65d08a59ff83f5a6924fd5a23a0564bff7 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 14:21:25 +0000 Subject: [PATCH 26/57] wip --- {Sources => Introspect}/AppKitIntrospectionView.swift | 0 {Sources => Introspect}/Introspect.swift | 0 {Sources => Introspect}/UIKitIntrospectionView.swift | 0 .../UIKitIntrospectionViewController.swift | 0 {Sources => Introspect}/ViewExtensions.swift | 0 {Examples => IntrospectExamples}/AppDelegate.swift | 0 {Examples => IntrospectExamples}/ContentView.swift | 0 {Examples => IntrospectExamples}/Info.plist | 0 {Examples => IntrospectExamples}/SceneDelegate.swift | 0 {Tests => IntrospectTests}/AppKitTests.swift | 0 {Tests => IntrospectTests}/UIKitTests.swift | 0 Package.swift | 4 ++-- 12 files changed, 2 insertions(+), 2 deletions(-) rename {Sources => Introspect}/AppKitIntrospectionView.swift (100%) rename {Sources => Introspect}/Introspect.swift (100%) rename {Sources => Introspect}/UIKitIntrospectionView.swift (100%) rename {Sources => Introspect}/UIKitIntrospectionViewController.swift (100%) rename {Sources => Introspect}/ViewExtensions.swift (100%) rename {Examples => IntrospectExamples}/AppDelegate.swift (100%) rename {Examples => IntrospectExamples}/ContentView.swift (100%) rename {Examples => IntrospectExamples}/Info.plist (100%) rename {Examples => IntrospectExamples}/SceneDelegate.swift (100%) rename {Tests => IntrospectTests}/AppKitTests.swift (100%) rename {Tests => IntrospectTests}/UIKitTests.swift (100%) diff --git a/Sources/AppKitIntrospectionView.swift b/Introspect/AppKitIntrospectionView.swift similarity index 100% rename from Sources/AppKitIntrospectionView.swift rename to Introspect/AppKitIntrospectionView.swift diff --git a/Sources/Introspect.swift b/Introspect/Introspect.swift similarity index 100% rename from Sources/Introspect.swift rename to Introspect/Introspect.swift diff --git a/Sources/UIKitIntrospectionView.swift b/Introspect/UIKitIntrospectionView.swift similarity index 100% rename from Sources/UIKitIntrospectionView.swift rename to Introspect/UIKitIntrospectionView.swift diff --git a/Sources/UIKitIntrospectionViewController.swift b/Introspect/UIKitIntrospectionViewController.swift similarity index 100% rename from Sources/UIKitIntrospectionViewController.swift rename to Introspect/UIKitIntrospectionViewController.swift diff --git a/Sources/ViewExtensions.swift b/Introspect/ViewExtensions.swift similarity index 100% rename from Sources/ViewExtensions.swift rename to Introspect/ViewExtensions.swift diff --git a/Examples/AppDelegate.swift b/IntrospectExamples/AppDelegate.swift similarity index 100% rename from Examples/AppDelegate.swift rename to IntrospectExamples/AppDelegate.swift diff --git a/Examples/ContentView.swift b/IntrospectExamples/ContentView.swift similarity index 100% rename from Examples/ContentView.swift rename to IntrospectExamples/ContentView.swift diff --git a/Examples/Info.plist b/IntrospectExamples/Info.plist similarity index 100% rename from Examples/Info.plist rename to IntrospectExamples/Info.plist diff --git a/Examples/SceneDelegate.swift b/IntrospectExamples/SceneDelegate.swift similarity index 100% rename from Examples/SceneDelegate.swift rename to IntrospectExamples/SceneDelegate.swift diff --git a/Tests/AppKitTests.swift b/IntrospectTests/AppKitTests.swift similarity index 100% rename from Tests/AppKitTests.swift rename to IntrospectTests/AppKitTests.swift diff --git a/Tests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift similarity index 100% rename from Tests/UIKitTests.swift rename to IntrospectTests/UIKitTests.swift diff --git a/Package.swift b/Package.swift index 9937925a..00f8a319 100644 --- a/Package.swift +++ b/Package.swift @@ -17,12 +17,12 @@ let package = Package( targets: [ .target( name: "Introspect", - path: "Sources" + path: "Introspect" // TODO: rename to Sources for v1.0 ), .testTarget( name: "IntrospectTests", dependencies: ["Introspect"], - path: "Tests" + path: "IntrospectTests" // TODO: rename to Tests for v1.0 ), ] ) From 67ae1efe3b7c611bf70194fbd5620f87f73a0c74 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 14:25:50 +0000 Subject: [PATCH 27/57] wip --- Introspect/ViewExtensions.swift | 2 +- IntrospectTests/UIKitTests.swift | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Introspect/ViewExtensions.swift b/Introspect/ViewExtensions.swift index 429a4cbd..1f54ff1d 100644 --- a/Introspect/ViewExtensions.swift +++ b/Introspect/ViewExtensions.swift @@ -170,7 +170,7 @@ extension View { } /// Finds a `UIColorWell` from a `SwiftUI.ColorPicker` - @available(iOS 14.0, tvOS 14.0, *) + @available(iOS 14.0, macCatalyst 14.0, *) @available(tvOS, unavailable) public func introspectColorWell(customize: @escaping (UIColorWell) -> ()) -> some View { introspect(selector: TargetViewSelector.siblingContaining, customize: customize) diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index ae12533d..3bd75a65 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -119,7 +119,6 @@ private struct TabRootTestView: View { } @available(iOS 14.0, tvOS 14.0, watchOS 7.0, *) -@available(macOS, unavailable) private struct PageTabViewStyleTestView: View { let spy: (UICollectionView, UIScrollView) -> Void @@ -261,7 +260,7 @@ private struct TextFieldTestView: View { } } -@available(iOS 14.0, macCatalyst 14.0, macOS 11.0, tvOS 13.0, *) +@available(iOS 14.0, macCatalyst 14.0, *) @available(tvOS, unavailable, message: "TextEditor is not available in tvOS.") private struct TextEditorTestView: View { let spy: () -> Void @@ -341,7 +340,7 @@ private struct SegmentedControlTestView: View { } } -@available(iOS 14.0, tvOS 14.0, *) +@available(iOS 14.0, macCatalyst 14.0, *) @available(tvOS, unavailable) private struct ColorWellTestView: View { @State private var color = Color.black @@ -574,7 +573,7 @@ class UIKitTests: XCTestCase { wait(for: [expectation], timeout: TestUtils.Constants.timeout) } - @available(iOS 14.0, macCatalyst 14.0, macOS 11.0, *) + @available(iOS 14.0, macCatalyst 14.0, *) @available(tvOS, unavailable, message: "TextEditor is not available in tvOS.") func testTextEditor() { @@ -586,7 +585,7 @@ class UIKitTests: XCTestCase { wait(for: [expectation], timeout: TestUtils.Constants.timeout) } - @available(iOS 14.0, macCatalyst 14.0, macOS 11.0, *) + @available(iOS 14.0, macCatalyst 14.0, *) @available(tvOS, unavailable, message: "ColorPicker is not available in tvOS.") func testColorPicker() { From 336e5d202b57828cc7ebd4ff87ff6ebda3dd315f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 14:55:40 +0000 Subject: [PATCH 28/57] wip --- Introspect/ViewExtensions.swift | 10 +++---- IntrospectTests/UIKitTests.swift | 48 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Introspect/ViewExtensions.swift b/Introspect/ViewExtensions.swift index 1f54ff1d..b795167f 100644 --- a/Introspect/ViewExtensions.swift +++ b/Introspect/ViewExtensions.swift @@ -170,11 +170,11 @@ extension View { } /// Finds a `UIColorWell` from a `SwiftUI.ColorPicker` - @available(iOS 14.0, macCatalyst 14.0, *) - @available(tvOS, unavailable) - public func introspectColorWell(customize: @escaping (UIColorWell) -> ()) -> some View { - introspect(selector: TargetViewSelector.siblingContaining, customize: customize) - } +// @available(iOS 14.0, macCatalyst 14.0, *) +// @available(tvOS, unavailable) +// public func introspectColorWell(customize: @escaping (UIColorWell) -> ()) -> some View { +// introspect(selector: TargetViewSelector.siblingContaining, customize: customize) +// } } #endif diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index 3bd75a65..6c593ac7 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -340,19 +340,19 @@ private struct SegmentedControlTestView: View { } } -@available(iOS 14.0, macCatalyst 14.0, *) -@available(tvOS, unavailable) -private struct ColorWellTestView: View { - @State private var color = Color.black - let spy: () -> Void - - var body: some View { - ColorPicker("Picker", selection: $color) - .introspectColorWell { colorWell in - self.spy() - } - } -} +//@available(iOS 14.0, macCatalyst 14.0, *) +//@available(tvOS, unavailable) +//private struct ColorWellTestView: View { +// @State private var color = Color.black +// let spy: () -> Void +// +// var body: some View { +// ColorPicker("Picker", selection: $color) +// .introspectColorWell { colorWell in +// self.spy() +// } +// } +//} class UIKitTests: XCTestCase { func testNavigation() { @@ -585,17 +585,17 @@ class UIKitTests: XCTestCase { wait(for: [expectation], timeout: TestUtils.Constants.timeout) } - @available(iOS 14.0, macCatalyst 14.0, *) - @available(tvOS, unavailable, message: "ColorPicker is not available in tvOS.") - func testColorPicker() { - - let expectation = XCTestExpectation() - let view = ColorWellTestView(spy: { - expectation.fulfill() - }) - TestUtils.present(view: view) - wait(for: [expectation], timeout: TestUtils.Constants.timeout) - } +// @available(iOS 14.0, macCatalyst 14.0, *) +// @available(tvOS, unavailable, message: "ColorPicker is not available in tvOS.") +// func testColorPicker() { +// +// let expectation = XCTestExpectation() +// let view = ColorWellTestView(spy: { +// expectation.fulfill() +// }) +// TestUtils.present(view: view) +// wait(for: [expectation], timeout: TestUtils.Constants.timeout) +// } @available(iOS 14.0, tvOS 14.0, watchOS 7.0, *) func testPagedTabView() throws { From 7c627cab0bfe6c69bf2f96283157371f0cc83b4f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:33:56 +0000 Subject: [PATCH 29/57] wip --- fastlane/Fastfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 91c11b19..e99b3633 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -36,11 +36,19 @@ platform :ios do raise "Unsupported iOS version: #{version}" end + # if version == 13 + # # we only build, not test, on iOS 13 + # gym( + # devices: devices, + # scheme: "Introspect", + # skip_build: ci, + # ) + run_tests( devices: devices, ensure_devices_found: true, scheme: "Introspect", - # skip_build: ci, + build_for_testing: version == 13, # only build on iOS 13, not test ) end end From 83aaafb31a73506d6d27f29bd94d202b09c758c1 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:38:32 +0000 Subject: [PATCH 30/57] wip --- Introspect.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Introspect.podspec b/Introspect.podspec index ba876f34..53e3d889 100644 --- a/Introspect.podspec +++ b/Introspect.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |spec| tag: spec.version } - spec.source_files = 'Sources/*.swift' + spec.source_files = 'Introspect/*.swift' spec.swift_version = '5.2' spec.ios.deployment_target = '13.0' From 628722e8596e7dde1f446d97d6870d684ad084c5 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:49:52 +0000 Subject: [PATCH 31/57] wip --- fastlane/Fastfile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e99b3633..76aea149 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -7,13 +7,18 @@ platform :ios do puts 'Running on CI.' if ci version = options[:version].to_i || 16 + + if version == 13 + # we only build, not test, on iOS 13 + gym( + sdk: "iphonesimulator13.7", + workspace: "Introspect.xcworkspace", + scheme: "Introspect", + ) + return + end + devices = case version - when 13 - [ - "iPhone 11 Pro (13.7)", - "iPad Pro (11-inch) (2nd generation) (13.7)", - # "Apple TV (13.4)", - ] when 14 [ "iPhone 11 Pro (14.5)", @@ -36,14 +41,6 @@ platform :ios do raise "Unsupported iOS version: #{version}" end - # if version == 13 - # # we only build, not test, on iOS 13 - # gym( - # devices: devices, - # scheme: "Introspect", - # skip_build: ci, - # ) - run_tests( devices: devices, ensure_devices_found: true, From e02302429bce80504641f465f21b7578a5d1f5de Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:50:03 +0000 Subject: [PATCH 32/57] wip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95a75d34..f9718fd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,8 +61,8 @@ jobs: ruby-version: .ruby-version bundler-cache: true - # - name: Lint Podspec - # run: pod lib lint + - name: Lint Podspec + run: pod lib lint - name: Run Tests run: bundle exec fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} From 03233de43f63d02c139a2d5eb700576bda83b6da Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:58:05 +0000 Subject: [PATCH 33/57] wip --- fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 76aea149..29dc8bc0 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -11,9 +11,10 @@ platform :ios do if version == 13 # we only build, not test, on iOS 13 gym( - sdk: "iphonesimulator13.7", + sdk: "iphoneos13.7", workspace: "Introspect.xcworkspace", scheme: "Introspect", + skip_archive: true, ) return end From 9780990a05cd6753b92d9c259b10a59b03d6fb0f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:20:09 +0000 Subject: [PATCH 34/57] wip --- fastlane/Fastfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 29dc8bc0..175abd9d 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -11,12 +11,12 @@ platform :ios do if version == 13 # we only build, not test, on iOS 13 gym( - sdk: "iphoneos13.7", + skip_archive: true, workspace: "Introspect.xcworkspace", scheme: "Introspect", - skip_archive: true, + sdk: "iphoneos13.7", ) - return + next end devices = case version @@ -43,10 +43,10 @@ platform :ios do end run_tests( + xcworkspace: "Introspect.xcworkspace", + scheme: "Introspect", devices: devices, ensure_devices_found: true, - scheme: "Introspect", - build_for_testing: version == 13, # only build on iOS 13, not test ) end end From a8fcde982c7142aab9a3712a68f3321a2115d9d8 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:36:49 +0000 Subject: [PATCH 35/57] wip --- fastlane/Fastfile | 1 - 1 file changed, 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 175abd9d..1f1cbe42 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -43,7 +43,6 @@ platform :ios do end run_tests( - xcworkspace: "Introspect.xcworkspace", scheme: "Introspect", devices: devices, ensure_devices_found: true, From 1ef425d3172dfc4fe24cadc1c147db2e4e16aeac Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:55:18 +0000 Subject: [PATCH 36/57] wip --- Introspect/ViewExtensions.swift | 10 +++---- IntrospectTests/UIKitTests.swift | 48 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Introspect/ViewExtensions.swift b/Introspect/ViewExtensions.swift index b795167f..1f54ff1d 100644 --- a/Introspect/ViewExtensions.swift +++ b/Introspect/ViewExtensions.swift @@ -170,11 +170,11 @@ extension View { } /// Finds a `UIColorWell` from a `SwiftUI.ColorPicker` -// @available(iOS 14.0, macCatalyst 14.0, *) -// @available(tvOS, unavailable) -// public func introspectColorWell(customize: @escaping (UIColorWell) -> ()) -> some View { -// introspect(selector: TargetViewSelector.siblingContaining, customize: customize) -// } + @available(iOS 14.0, macCatalyst 14.0, *) + @available(tvOS, unavailable) + public func introspectColorWell(customize: @escaping (UIColorWell) -> ()) -> some View { + introspect(selector: TargetViewSelector.siblingContaining, customize: customize) + } } #endif diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index 6c593ac7..632c8b6d 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -340,19 +340,19 @@ private struct SegmentedControlTestView: View { } } -//@available(iOS 14.0, macCatalyst 14.0, *) -//@available(tvOS, unavailable) -//private struct ColorWellTestView: View { -// @State private var color = Color.black -// let spy: () -> Void -// -// var body: some View { -// ColorPicker("Picker", selection: $color) -// .introspectColorWell { colorWell in -// self.spy() -// } -// } -//} +@available(iOS 14.0, macCatalyst 14.0, *) +@available(tvOS, unavailable) +private struct ColorWellTestView: View { + @State private var color = Color.black + let spy: () -> Void + + var body: some View { + ColorPicker("Picker", selection: $color) + .introspectColorWell { colorWell in + self.spy() + } + } +} class UIKitTests: XCTestCase { func testNavigation() { @@ -585,17 +585,17 @@ class UIKitTests: XCTestCase { wait(for: [expectation], timeout: TestUtils.Constants.timeout) } -// @available(iOS 14.0, macCatalyst 14.0, *) -// @available(tvOS, unavailable, message: "ColorPicker is not available in tvOS.") -// func testColorPicker() { -// -// let expectation = XCTestExpectation() -// let view = ColorWellTestView(spy: { -// expectation.fulfill() -// }) -// TestUtils.present(view: view) -// wait(for: [expectation], timeout: TestUtils.Constants.timeout) -// } + @available(iOS 14.0, macCatalyst 14.0, *) + @available(tvOS, unavailable, message: "ColorPicker is not available in tvOS.") + func testColorPicker() { + + let expectation = XCTestExpectation() + let view = ColorWellTestView(spy: { + expectation.fulfill() + }) + TestUtils.present(view: view) + wait(for: [expectation], timeout: TestUtils.Constants.timeout) + } @available(iOS 14.0, tvOS 14.0, watchOS 7.0, *) func testPagedTabView() throws { From bc7b10f2d6ea70d371d0d303a55cd6af0a5c935b Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 18:59:17 +0000 Subject: [PATCH 37/57] wip --- fastlane/Fastfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1f1cbe42..30e3fe84 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -16,6 +16,13 @@ platform :ios do scheme: "Introspect", sdk: "iphoneos13.7", ) + # we only build, not test, on tvOS 13 + # gym( + # skip_archive: true, + # workspace: "Introspect.xcworkspace", + # scheme: "Introspect", + # sdk: "appletvos13.4", + # ) next end @@ -24,19 +31,19 @@ platform :ios do [ "iPhone 11 Pro (14.5)", "iPad Pro (11-inch) (3rd generation) (14.5)", - # "Apple TV (14.5)", + # "Apple TV (tvOS 14.5)", ] when 15 [ "iPhone 11 Pro (15.5)", "iPad Pro (11-inch) (3rd generation) (15.5)", - # "Apple TV (15.4)", + # "Apple TV (tvOS 15.4)", ] when 16 [ "iPhone 14 Pro (16.2)", "iPad Pro (11-inch) (4th generation) (16.2)", - # "Apple TV (16.1)", + # "Apple TV (tvOS 16.1)", ] else raise "Unsupported iOS version: #{version}" From 373935548d56b108a275712e0e37edd291d88a35 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 19:25:38 +0000 Subject: [PATCH 38/57] wip --- .github/workflows/ci.yml | 4 ---- Package.swift | 2 +- fastlane/Fastfile | 24 +++--------------------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9718fd9..07bf43d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,15 +20,11 @@ jobs: fail-fast: false matrix: platform: - - [ios, 13] - [ios, 14] - [ios, 15] - [ios, 16] # - mac include: - - platform: [ios, 13] - os: macos-11 - xcode: 11.7 - platform: [ios, 14] os: macos-11 xcode: 12.5.1 diff --git a/Package.swift b/Package.swift index 00f8a319..fedd0fc0 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.4 import PackageDescription diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 30e3fe84..3703766a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -8,42 +8,24 @@ platform :ios do version = options[:version].to_i || 16 - if version == 13 - # we only build, not test, on iOS 13 - gym( - skip_archive: true, - workspace: "Introspect.xcworkspace", - scheme: "Introspect", - sdk: "iphoneos13.7", - ) - # we only build, not test, on tvOS 13 - # gym( - # skip_archive: true, - # workspace: "Introspect.xcworkspace", - # scheme: "Introspect", - # sdk: "appletvos13.4", - # ) - next - end - devices = case version when 14 [ "iPhone 11 Pro (14.5)", "iPad Pro (11-inch) (3rd generation) (14.5)", - # "Apple TV (tvOS 14.5)", + "Apple TV (tvOS 14.5)", ] when 15 [ "iPhone 11 Pro (15.5)", "iPad Pro (11-inch) (3rd generation) (15.5)", - # "Apple TV (tvOS 15.4)", + "Apple TV (tvOS 15.4)", ] when 16 [ "iPhone 14 Pro (16.2)", "iPad Pro (11-inch) (4th generation) (16.2)", - # "Apple TV (tvOS 16.1)", + "Apple TV (tvOS 16.1)", ] else raise "Unsupported iOS version: #{version}" From ea62c65cb63e5c937a3345d8ca07f11b810669fc Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 19:38:36 +0000 Subject: [PATCH 39/57] wip --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3703766a..5c5fbeef 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -13,19 +13,19 @@ platform :ios do [ "iPhone 11 Pro (14.5)", "iPad Pro (11-inch) (3rd generation) (14.5)", - "Apple TV (tvOS 14.5)", + "Apple TV (14.5)", ] when 15 [ "iPhone 11 Pro (15.5)", "iPad Pro (11-inch) (3rd generation) (15.5)", - "Apple TV (tvOS 15.4)", + "Apple TV (15.4)", ] when 16 [ "iPhone 14 Pro (16.2)", "iPad Pro (11-inch) (4th generation) (16.2)", - "Apple TV (tvOS 16.1)", + "Apple TV (16.1)", ] else raise "Unsupported iOS version: #{version}" From df0d428b979175c82a836ec657febb7c8445bafc Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 20:06:45 +0000 Subject: [PATCH 40/57] wip --- fastlane/Fastfile | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 5c5fbeef..2dd39342 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -35,6 +35,7 @@ platform :ios do scheme: "Introspect", devices: devices, ensure_devices_found: true, + disable_concurrent_testing: true, ) end end From 6d3d130351cc603fd2c9242dd5a75db075d8e587 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 20:42:14 +0000 Subject: [PATCH 41/57] wip wip --- Package.swift | 2 +- fastlane/Fastfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index fedd0fc0..5d715970 100644 --- a/Package.swift +++ b/Package.swift @@ -5,8 +5,8 @@ import PackageDescription let package = Package( name: "Introspect", platforms: [ - .macOS(.v10_15), .iOS(.v13), + .macOS(.v10_15), .tvOS(.v13), ], products: [ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 2dd39342..55d2857e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -35,6 +35,7 @@ platform :ios do scheme: "Introspect", devices: devices, ensure_devices_found: true, + force_quit_simulator: true, disable_concurrent_testing: true, ) end From 30d0f952da523147c4bb311c5260aae210969a9d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 20:49:35 +0000 Subject: [PATCH 42/57] wip --- .../xcschemes/Introspect-Dynamic.xcscheme | 67 +++++++++++++++++++ .../xcschemes/Introspect-Static.xcscheme | 67 +++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme create mode 100644 Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme diff --git a/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme new file mode 100644 index 00000000..80c68beb --- /dev/null +++ b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Dynamic.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme new file mode 100644 index 00000000..aebc9608 --- /dev/null +++ b/Introspect.xcworkspace/xcshareddata/xcschemes/Introspect-Static.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 61979a5a2aec1112cc1153e0ec47ebc15954f380 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 21:25:09 +0000 Subject: [PATCH 43/57] wip --- .../contents.xcworkspacedata | 7 + Examples/Package.swift | 9 + .../Showcase.xcodeproj/project.pbxproj | 374 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + Examples/Showcase/Showcase/App.swift | 10 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 13 + .../Showcase/Assets.xcassets/Contents.json | 6 + .../Showcase/Showcase}/ContentView.swift | 32 +- .../Preview Assets.xcassets/Contents.json | 6 + .../Showcase/Showcase/Showcase.entitlements | 10 + .../contents.xcworkspacedata | 3 + Introspect/ViewExtensions.swift | 2 +- IntrospectExamples/AppDelegate.swift | 9 - IntrospectExamples/Info.plist | 60 --- IntrospectExamples/SceneDelegate.swift | 26 -- IntrospectTests/UIKitTests.swift | 13 +- 18 files changed, 489 insertions(+), 117 deletions(-) create mode 100644 Examples/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Examples/Package.swift create mode 100644 Examples/Showcase/Showcase.xcodeproj/project.pbxproj create mode 100644 Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Examples/Showcase/Showcase/App.swift create mode 100644 Examples/Showcase/Showcase/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 Examples/Showcase/Showcase/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Examples/Showcase/Showcase/Assets.xcassets/Contents.json rename {IntrospectExamples => Examples/Showcase/Showcase}/ContentView.swift (96%) create mode 100644 Examples/Showcase/Showcase/Preview Content/Preview Assets.xcassets/Contents.json create mode 100644 Examples/Showcase/Showcase/Showcase.entitlements delete mode 100644 IntrospectExamples/AppDelegate.swift delete mode 100644 IntrospectExamples/Info.plist delete mode 100644 IntrospectExamples/SceneDelegate.swift diff --git a/Examples/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/Examples/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/Examples/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Examples/Package.swift b/Examples/Package.swift new file mode 100644 index 00000000..dbea1ee8 --- /dev/null +++ b/Examples/Package.swift @@ -0,0 +1,9 @@ +// swift-tools-version:5.4 + +import PackageDescription + +let package = Package( + name: "Examples", + products: [], + targets: [] +) diff --git a/Examples/Showcase/Showcase.xcodeproj/project.pbxproj b/Examples/Showcase/Showcase.xcodeproj/project.pbxproj new file mode 100644 index 00000000..4b11f878 --- /dev/null +++ b/Examples/Showcase/Showcase.xcodeproj/project.pbxproj @@ -0,0 +1,374 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXBuildFile section */ + D53071F729983CEF00F1936C /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53071F629983CEF00F1936C /* App.swift */; }; + D53071F929983CEF00F1936C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53071F829983CEF00F1936C /* ContentView.swift */; }; + D53071FB29983CF000F1936C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D53071FA29983CF000F1936C /* Assets.xcassets */; }; + D53071FE29983CF000F1936C /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D53071FD29983CF000F1936C /* Preview Assets.xcassets */; }; + D530720729983DCA00F1936C /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = D530720629983DCA00F1936C /* Introspect */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + D53071F329983CEF00F1936C /* Showcase.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Showcase.app; sourceTree = BUILT_PRODUCTS_DIR; }; + D53071F629983CEF00F1936C /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = ""; }; + D53071F829983CEF00F1936C /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + D53071FA29983CF000F1936C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + D53071FD29983CF000F1936C /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + D530720429983D9300F1936C /* Showcase.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Showcase.entitlements; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + D53071F029983CEF00F1936C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D530720729983DCA00F1936C /* Introspect in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + D53071EA29983CEF00F1936C = { + isa = PBXGroup; + children = ( + D53071F529983CEF00F1936C /* Showcase */, + D53071F429983CEF00F1936C /* Products */, + D530720529983DCA00F1936C /* Frameworks */, + ); + sourceTree = ""; + }; + D53071F429983CEF00F1936C /* Products */ = { + isa = PBXGroup; + children = ( + D53071F329983CEF00F1936C /* Showcase.app */, + ); + name = Products; + sourceTree = ""; + }; + D53071F529983CEF00F1936C /* Showcase */ = { + isa = PBXGroup; + children = ( + D530720429983D9300F1936C /* Showcase.entitlements */, + D53071F629983CEF00F1936C /* App.swift */, + D53071F829983CEF00F1936C /* ContentView.swift */, + D53071FA29983CF000F1936C /* Assets.xcassets */, + D53071FC29983CF000F1936C /* Preview Content */, + ); + path = Showcase; + sourceTree = ""; + }; + D53071FC29983CF000F1936C /* Preview Content */ = { + isa = PBXGroup; + children = ( + D53071FD29983CF000F1936C /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; + D530720529983DCA00F1936C /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + D53071F229983CEF00F1936C /* Showcase */ = { + isa = PBXNativeTarget; + buildConfigurationList = D530720129983CF000F1936C /* Build configuration list for PBXNativeTarget "Showcase" */; + buildPhases = ( + D53071EF29983CEF00F1936C /* Sources */, + D53071F029983CEF00F1936C /* Frameworks */, + D53071F129983CEF00F1936C /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Showcase; + packageProductDependencies = ( + D530720629983DCA00F1936C /* Introspect */, + ); + productName = Showcase; + productReference = D53071F329983CEF00F1936C /* Showcase.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + D53071EB29983CEF00F1936C /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1420; + LastUpgradeCheck = 1420; + TargetAttributes = { + D53071F229983CEF00F1936C = { + CreatedOnToolsVersion = 14.2; + }; + }; + }; + buildConfigurationList = D53071EE29983CEF00F1936C /* Build configuration list for PBXProject "Showcase" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = D53071EA29983CEF00F1936C; + productRefGroup = D53071F429983CEF00F1936C /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + D53071F229983CEF00F1936C /* Showcase */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + D53071F129983CEF00F1936C /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D53071FE29983CF000F1936C /* Preview Assets.xcassets in Resources */, + D53071FB29983CF000F1936C /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + D53071EF29983CEF00F1936C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D53071F929983CEF00F1936C /* ContentView.swift in Sources */, + D53071F729983CEF00F1936C /* App.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + D53071FF29983CF000F1936C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TVOS_DEPLOYMENT_TARGET = 14.0; + }; + name = Debug; + }; + D530720029983CF000F1936C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TVOS_DEPLOYMENT_TARGET = 14.0; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + D530720229983CF000F1936C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = Showcase/Showcase.entitlements; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"Showcase/Preview Content\""; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Showcase; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + }; + name = Debug; + }; + D530720329983CF000F1936C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = Showcase/Showcase.entitlements; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"Showcase/Preview Content\""; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.siteline.Showcase; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + D53071EE29983CEF00F1936C /* Build configuration list for PBXProject "Showcase" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D53071FF29983CF000F1936C /* Debug */, + D530720029983CF000F1936C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D530720129983CF000F1936C /* Build configuration list for PBXNativeTarget "Showcase" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D530720229983CF000F1936C /* Debug */, + D530720329983CF000F1936C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + D530720629983DCA00F1936C /* Introspect */ = { + isa = XCSwiftPackageProductDependency; + productName = Introspect; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = D53071EB29983CEF00F1936C /* Project object */; +} diff --git a/Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Examples/Showcase/Showcase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Examples/Showcase/Showcase/App.swift b/Examples/Showcase/Showcase/App.swift new file mode 100644 index 00000000..88579ae0 --- /dev/null +++ b/Examples/Showcase/Showcase/App.swift @@ -0,0 +1,10 @@ +import SwiftUI + +@main +struct App: SwiftUI.App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/Examples/Showcase/Showcase/Assets.xcassets/AccentColor.colorset/Contents.json b/Examples/Showcase/Showcase/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000..eb878970 --- /dev/null +++ b/Examples/Showcase/Showcase/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Examples/Showcase/Showcase/Assets.xcassets/AppIcon.appiconset/Contents.json b/Examples/Showcase/Showcase/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..13613e3e --- /dev/null +++ b/Examples/Showcase/Showcase/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,13 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Examples/Showcase/Showcase/Assets.xcassets/Contents.json b/Examples/Showcase/Showcase/Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/Examples/Showcase/Showcase/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/IntrospectExamples/ContentView.swift b/Examples/Showcase/Showcase/ContentView.swift similarity index 96% rename from IntrospectExamples/ContentView.swift rename to Examples/Showcase/Showcase/ContentView.swift index bf5f7fba..9b2b2158 100644 --- a/IntrospectExamples/ContentView.swift +++ b/Examples/Showcase/Showcase/ContentView.swift @@ -29,7 +29,7 @@ struct ContentView: View { struct ListExample: View { var body: some View { - + HStack { VStack { Text("Default") @@ -38,7 +38,7 @@ struct ListExample: View { Text("Item 2") } } - + VStack { Text("List.introspectTableView()") List { @@ -49,7 +49,7 @@ struct ListExample: View { tableView.separatorStyle = .none } } - + VStack { Text("child.introspectTableView()") List { @@ -61,7 +61,7 @@ struct ListExample: View { } } } - + } } @@ -115,13 +115,13 @@ struct ScrollViewExample: View { } struct SimpleElementsExample: View { - + @State private var textFieldValue = "" @State private var toggleValue = false @State private var sliderValue = 0.0 @State private var datePickerValue = Date() @State private var segmentedControlValue = 0 - + var body: some View { VStack { HStack { @@ -129,37 +129,37 @@ struct SimpleElementsExample: View { .introspectTextField { textField in textField.layer.backgroundColor = UIColor.red.cgColor } - + TextField("Text Field Green", text: $textFieldValue) .introspectTextField { textField in textField.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { Toggle("Toggle Red", isOn: $toggleValue) .introspectSwitch { uiSwitch in uiSwitch.layer.backgroundColor = UIColor.red.cgColor } - + Toggle("Toggle Green", isOn: $toggleValue) .introspectSwitch { uiSwitch in uiSwitch.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { Slider(value: $sliderValue, in: 0...100) .introspectSlider { slider in slider.layer.backgroundColor = UIColor.red.cgColor } - + Slider(value: $sliderValue, in: 0...100) .introspectSlider { slider in slider.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { Stepper(onIncrement: {}, onDecrement: {}) { Text("Stepper Red") @@ -167,7 +167,7 @@ struct SimpleElementsExample: View { .introspectStepper { stepper in stepper.layer.backgroundColor = UIColor.red.cgColor } - + Stepper(onIncrement: {}, onDecrement: {}) { Text("Stepper Green") } @@ -175,7 +175,7 @@ struct SimpleElementsExample: View { stepper.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { DatePicker(selection: $datePickerValue) { Text("DatePicker Red") @@ -184,7 +184,7 @@ struct SimpleElementsExample: View { datePicker.layer.backgroundColor = UIColor.red.cgColor } } - + HStack { Picker(selection: $segmentedControlValue, label: Text("Segmented control")) { Text("Option 1").tag(0) @@ -197,7 +197,7 @@ struct SimpleElementsExample: View { } } } - + } } diff --git a/Examples/Showcase/Showcase/Preview Content/Preview Assets.xcassets/Contents.json b/Examples/Showcase/Showcase/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/Examples/Showcase/Showcase/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Examples/Showcase/Showcase/Showcase.entitlements b/Examples/Showcase/Showcase/Showcase.entitlements new file mode 100644 index 00000000..ee95ab7e --- /dev/null +++ b/Examples/Showcase/Showcase/Showcase.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + + diff --git a/Introspect.xcworkspace/contents.xcworkspacedata b/Introspect.xcworkspace/contents.xcworkspacedata index ca3329e1..9c257254 100644 --- a/Introspect.xcworkspace/contents.xcworkspacedata +++ b/Introspect.xcworkspace/contents.xcworkspacedata @@ -1,6 +1,9 @@ + + diff --git a/Introspect/ViewExtensions.swift b/Introspect/ViewExtensions.swift index 1f54ff1d..3dc81470 100644 --- a/Introspect/ViewExtensions.swift +++ b/Introspect/ViewExtensions.swift @@ -117,7 +117,7 @@ extension View { /// Finds the horizontal `UIScrollView` from a `SwiftUI.TabBarView` with tab style `SwiftUI.PageTabViewStyle`. /// /// Customize is called with a `UICollectionView` wrapper, and the horizontal `UIScrollView`. - @available(iOS 14.0, tvOS 14.0, watchOS 7.0, *) + @available(iOS 14.0, tvOS 14.0, *) @available(macOS, unavailable) public func introspectPagedTabView(customize: @escaping (UICollectionView, UIScrollView) -> ()) -> some View { return introspect(selector: TargetViewSelector.ancestorOrSiblingContaining, customize: { (collectionView: UICollectionView) in diff --git a/IntrospectExamples/AppDelegate.swift b/IntrospectExamples/AppDelegate.swift deleted file mode 100644 index 9bafec63..00000000 --- a/IntrospectExamples/AppDelegate.swift +++ /dev/null @@ -1,9 +0,0 @@ -import UIKit - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - return true - } -} - diff --git a/IntrospectExamples/Info.plist b/IntrospectExamples/Info.plist deleted file mode 100644 index 49e2bd08..00000000 --- a/IntrospectExamples/Info.plist +++ /dev/null @@ -1,60 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 0.1.3 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneConfigurationName - Default Configuration - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate - - - - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/IntrospectExamples/SceneDelegate.swift b/IntrospectExamples/SceneDelegate.swift deleted file mode 100644 index dad927ff..00000000 --- a/IntrospectExamples/SceneDelegate.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// SceneDelegate.swift -// IntrospectExamples -// -// Created by Lois Di Qual on 11/26/19. -// Copyright © 2019 Lois Di Qual. All rights reserved. -// - -import UIKit -import SwiftUI - -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - - var window: UIWindow? - - func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - let contentView = ContentView() - if let windowScene = scene as? UIWindowScene { - let window = UIWindow(windowScene: windowScene) - window.rootViewController = UIHostingController(rootView: contentView) - self.window = window - window.makeKeyAndVisible() - } - } -} - diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index 632c8b6d..be8d0ce6 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -118,7 +118,7 @@ private struct TabRootTestView: View { } } -@available(iOS 14.0, tvOS 14.0, watchOS 7.0, *) +@available(iOS 14.0, tvOS 14.0, *) private struct PageTabViewStyleTestView: View { let spy: (UICollectionView, UIScrollView) -> Void @@ -129,9 +129,12 @@ private struct PageTabViewStyleTestView: View { .tag(0) } .tabViewStyle(PageTabViewStyle()) - .introspectPagedTabView { collectionView, scrollView in - spy(collectionView, scrollView) - } + .introspectViewController(customize: { viewController in + print(viewController) + }) +// .introspectPagedTabView { collectionView, scrollView in +// spy(collectionView, scrollView) +// } } } @@ -597,7 +600,7 @@ class UIKitTests: XCTestCase { wait(for: [expectation], timeout: TestUtils.Constants.timeout) } - @available(iOS 14.0, tvOS 14.0, watchOS 7.0, *) + @available(iOS 14.0, tvOS 14.0, *) func testPagedTabView() throws { var collectionView1: UICollectionView? From febd1523ad1088f5857f4f7e64d29aafb1c146c0 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 21:27:38 +0000 Subject: [PATCH 44/57] wip --- Examples/Showcase/Showcase/ContentView.swift | 74 ++++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/Examples/Showcase/Showcase/ContentView.swift b/Examples/Showcase/Showcase/ContentView.swift index 9b2b2158..87004b1d 100644 --- a/Examples/Showcase/Showcase/ContentView.swift +++ b/Examples/Showcase/Showcase/ContentView.swift @@ -29,7 +29,7 @@ struct ContentView: View { struct ListExample: View { var body: some View { - + HStack { VStack { Text("Default") @@ -38,7 +38,7 @@ struct ListExample: View { Text("Item 2") } } - + VStack { Text("List.introspectTableView()") List { @@ -49,7 +49,7 @@ struct ListExample: View { tableView.separatorStyle = .none } } - + VStack { Text("child.introspectTableView()") List { @@ -61,7 +61,7 @@ struct ListExample: View { } } } - + } } @@ -106,60 +106,60 @@ struct ScrollViewExample: View { } ScrollView { Text("child.introspectScrollView()") - .introspectScrollView { scrollView in - scrollView.layer.backgroundColor = UIColor.green.cgColor - } + .introspectScrollView { scrollView in + scrollView.layer.backgroundColor = UIColor.green.cgColor + } } } } } struct SimpleElementsExample: View { - + @State private var textFieldValue = "" @State private var toggleValue = false @State private var sliderValue = 0.0 @State private var datePickerValue = Date() @State private var segmentedControlValue = 0 - + var body: some View { VStack { HStack { TextField("Text Field Red", text: $textFieldValue) - .introspectTextField { textField in - textField.layer.backgroundColor = UIColor.red.cgColor - } - + .introspectTextField { textField in + textField.layer.backgroundColor = UIColor.red.cgColor + } + TextField("Text Field Green", text: $textFieldValue) - .introspectTextField { textField in - textField.layer.backgroundColor = UIColor.green.cgColor - } + .introspectTextField { textField in + textField.layer.backgroundColor = UIColor.green.cgColor + } } - + HStack { Toggle("Toggle Red", isOn: $toggleValue) - .introspectSwitch { uiSwitch in - uiSwitch.layer.backgroundColor = UIColor.red.cgColor - } - + .introspectSwitch { uiSwitch in + uiSwitch.layer.backgroundColor = UIColor.red.cgColor + } + Toggle("Toggle Green", isOn: $toggleValue) - .introspectSwitch { uiSwitch in - uiSwitch.layer.backgroundColor = UIColor.green.cgColor - } + .introspectSwitch { uiSwitch in + uiSwitch.layer.backgroundColor = UIColor.green.cgColor + } } - + HStack { Slider(value: $sliderValue, in: 0...100) - .introspectSlider { slider in - slider.layer.backgroundColor = UIColor.red.cgColor - } - + .introspectSlider { slider in + slider.layer.backgroundColor = UIColor.red.cgColor + } + Slider(value: $sliderValue, in: 0...100) - .introspectSlider { slider in - slider.layer.backgroundColor = UIColor.green.cgColor - } + .introspectSlider { slider in + slider.layer.backgroundColor = UIColor.green.cgColor + } } - + HStack { Stepper(onIncrement: {}, onDecrement: {}) { Text("Stepper Red") @@ -167,7 +167,7 @@ struct SimpleElementsExample: View { .introspectStepper { stepper in stepper.layer.backgroundColor = UIColor.red.cgColor } - + Stepper(onIncrement: {}, onDecrement: {}) { Text("Stepper Green") } @@ -175,7 +175,7 @@ struct SimpleElementsExample: View { stepper.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { DatePicker(selection: $datePickerValue) { Text("DatePicker Red") @@ -184,7 +184,7 @@ struct SimpleElementsExample: View { datePicker.layer.backgroundColor = UIColor.red.cgColor } } - + HStack { Picker(selection: $segmentedControlValue, label: Text("Segmented control")) { Text("Option 1").tag(0) @@ -197,7 +197,7 @@ struct SimpleElementsExample: View { } } } - + } } From d78f74b2ff602c58423792bc22128a14d9bcf77d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 21:48:40 +0000 Subject: [PATCH 45/57] wip --- Examples/Showcase/Showcase/ContentView.swift | 56 ++++++++++---------- IntrospectTests/UIKitTests.swift | 34 ++++++++---- 2 files changed, 51 insertions(+), 39 deletions(-) diff --git a/Examples/Showcase/Showcase/ContentView.swift b/Examples/Showcase/Showcase/ContentView.swift index 87004b1d..9e34fc07 100644 --- a/Examples/Showcase/Showcase/ContentView.swift +++ b/Examples/Showcase/Showcase/ContentView.swift @@ -5,31 +5,31 @@ struct ContentView: View { @State private var selection = 0 var body: some View { TabView(selection: $selection) { - ListExample() + ListShowcase() .tabItem { Text("List") } .tag(0) .introspectTabBarController { tabBarController in tabBarController.tabBar.layer.backgroundColor = UIColor.green.cgColor } - ScrollViewExample() + ScrollViewShowcase() .tabItem { Text("ScrollView") } .tag(1) - NavigationExample() + NavigationShowcase() .tabItem { Text("Navigation") } .tag(2) - ViewControllerExample() + ViewControllerShowcase() .tabItem { Text("ViewController") } .tag(3) - SimpleElementsExample() + SimpleElementsShowcase() .tabItem { Text("Simple elements") } .tag(4) } } } -struct ListExample: View { +struct ListShowcase: View { var body: some View { - + HStack { VStack { Text("Default") @@ -38,7 +38,7 @@ struct ListExample: View { Text("Item 2") } } - + VStack { Text("List.introspectTableView()") List { @@ -49,7 +49,7 @@ struct ListExample: View { tableView.separatorStyle = .none } } - + VStack { Text("child.introspectTableView()") List { @@ -61,11 +61,11 @@ struct ListExample: View { } } } - + } } -struct NavigationExample: View { +struct NavigationShowcase: View { var body: some View { NavigationView { VStack { @@ -79,7 +79,7 @@ struct NavigationExample: View { } } -struct ViewControllerExample: View { +struct ViewControllerShowcase: View { var body: some View { NavigationView { VStack { @@ -92,7 +92,7 @@ struct ViewControllerExample: View { } } -struct ScrollViewExample: View { +struct ScrollViewShowcase: View { var body: some View { HStack { ScrollView { @@ -114,14 +114,14 @@ struct ScrollViewExample: View { } } -struct SimpleElementsExample: View { - +struct SimpleElementsShowcase: View { + @State private var textFieldValue = "" @State private var toggleValue = false @State private var sliderValue = 0.0 @State private var datePickerValue = Date() @State private var segmentedControlValue = 0 - + var body: some View { VStack { HStack { @@ -129,37 +129,37 @@ struct SimpleElementsExample: View { .introspectTextField { textField in textField.layer.backgroundColor = UIColor.red.cgColor } - + TextField("Text Field Green", text: $textFieldValue) .introspectTextField { textField in textField.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { Toggle("Toggle Red", isOn: $toggleValue) .introspectSwitch { uiSwitch in uiSwitch.layer.backgroundColor = UIColor.red.cgColor } - + Toggle("Toggle Green", isOn: $toggleValue) .introspectSwitch { uiSwitch in uiSwitch.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { Slider(value: $sliderValue, in: 0...100) .introspectSlider { slider in slider.layer.backgroundColor = UIColor.red.cgColor } - + Slider(value: $sliderValue, in: 0...100) .introspectSlider { slider in slider.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { Stepper(onIncrement: {}, onDecrement: {}) { Text("Stepper Red") @@ -167,7 +167,7 @@ struct SimpleElementsExample: View { .introspectStepper { stepper in stepper.layer.backgroundColor = UIColor.red.cgColor } - + Stepper(onIncrement: {}, onDecrement: {}) { Text("Stepper Green") } @@ -175,7 +175,7 @@ struct SimpleElementsExample: View { stepper.layer.backgroundColor = UIColor.green.cgColor } } - + HStack { DatePicker(selection: $datePickerValue) { Text("DatePicker Red") @@ -184,7 +184,7 @@ struct SimpleElementsExample: View { datePicker.layer.backgroundColor = UIColor.red.cgColor } } - + HStack { Picker(selection: $segmentedControlValue, label: Text("Segmented control")) { Text("Option 1").tag(0) @@ -197,15 +197,15 @@ struct SimpleElementsExample: View { } } } - + } } struct ContentView_Previews: PreviewProvider { static var previews: some View { Group { - ListExample() - NavigationExample() + ListShowcase() + NavigationShowcase() } } } diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index be8d0ce6..1d477a4d 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -124,17 +124,25 @@ private struct PageTabViewStyleTestView: View { let spy: (UICollectionView, UIScrollView) -> Void var body: some View { - TabView { - Text("Item 1") - .tag(0) + if #available(iOS 16, tvOS 16, *) { + TabView { + Text("Item 1") + .tag(0) + } + .tabViewStyle(PageTabViewStyle()) + .introspectCollectionView { collectionView in + spy(collectionView, collectionView) + } + } else { + TabView { + Text("Item 1") + .tag(0) + } + .tabViewStyle(PageTabViewStyle()) + .introspectPagedTabView { collectionView, scrollView in + spy(collectionView, scrollView) + } } - .tabViewStyle(PageTabViewStyle()) - .introspectViewController(customize: { viewController in - print(viewController) - }) -// .introspectPagedTabView { collectionView, scrollView in -// spy(collectionView, scrollView) -// } } } @@ -618,7 +626,11 @@ class UIKitTests: XCTestCase { let unwrappedCollectionView = try XCTUnwrap(collectionView1) let unwrappedScrollView = try XCTUnwrap(scrollView1) - XCTAssertTrue(unwrappedCollectionView.subviews.contains(where: { $0 === unwrappedScrollView })) + if #available(iOS 16, tvOS 16, *) { + XCTAssertTrue(unwrappedCollectionView == unwrappedScrollView) + } else { + XCTAssertTrue(unwrappedCollectionView.subviews.contains(where: { $0 === unwrappedScrollView })) + } } #endif } From 542af2bbbe4031020649c56699ae89730ce3eee8 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 21:54:26 +0000 Subject: [PATCH 46/57] wip --- Introspect/AppKitIntrospectionView.swift | 2 -- Introspect/ViewExtensions.swift | 1 - IntrospectTests/AppKitTests.swift | 16 ++-------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Introspect/AppKitIntrospectionView.swift b/Introspect/AppKitIntrospectionView.swift index d2ace3d2..ae375ff0 100644 --- a/Introspect/AppKitIntrospectionView.swift +++ b/Introspect/AppKitIntrospectionView.swift @@ -3,7 +3,6 @@ import SwiftUI import AppKit /// Introspection NSView that is inserted alongside the target view. -@available(macOS 10.15.0, *) public class IntrospectionNSView: NSView { required init() { @@ -23,7 +22,6 @@ public class IntrospectionNSView: NSView { /// Introspection View that is injected into the UIKit hierarchy alongside the target view. /// After `updateNSView` is called, it calls `selector` to find the target view, then `customize` when the target view is found. -@available(macOS 10.15.0, *) public struct AppKitIntrospectionView: NSViewRepresentable { /// Method that introspects the view hierarchy to find the target view. diff --git a/Introspect/ViewExtensions.swift b/Introspect/ViewExtensions.swift index 3dc81470..18d27f0e 100644 --- a/Introspect/ViewExtensions.swift +++ b/Introspect/ViewExtensions.swift @@ -179,7 +179,6 @@ extension View { #endif #if canImport(AppKit) && !targetEnvironment(macCatalyst) -@available(macOS 10.15.0, *) extension View { /// Finds a `TargetView` from a `SwiftUI.View` diff --git a/IntrospectTests/AppKitTests.swift b/IntrospectTests/AppKitTests.swift index 687b697c..b5f1c313 100644 --- a/IntrospectTests/AppKitTests.swift +++ b/IntrospectTests/AppKitTests.swift @@ -4,7 +4,6 @@ import XCTest import SwiftUI @testable import Introspect -@available(macOS 10.15.0, *) enum TestUtils { enum Constants { static let timeout: TimeInterval = 5 @@ -24,7 +23,6 @@ enum TestUtils { } } -@available(macOS 10.15.0, *) private struct ListTestView: View { let spy1: () -> Void @@ -53,7 +51,6 @@ private struct ListTestView: View { } } -@available(macOS 10.15.0, *) private struct ScrollTestView: View { let spy1: (NSScrollView) -> Void @@ -78,7 +75,6 @@ private struct ScrollTestView: View { } } -@available(macOS 10.15.0, *) private struct NestedScrollTestView: View { let spy1: (NSScrollView) -> Void @@ -103,7 +99,6 @@ private struct NestedScrollTestView: View { } } -@available(macOS 10.15.0, *) private struct TextFieldTestView: View { let spy: () -> Void @State private var textFieldValue = "" @@ -127,7 +122,6 @@ private struct TextEditorTestView: View { } } -@available(macOS 10.15.0, *) private struct SliderTestView: View { let spy: () -> Void @State private var sliderValue = 0.0 @@ -139,7 +133,6 @@ private struct SliderTestView: View { } } -@available(macOS 10.15.0, *) private struct StepperTestView: View { let spy: () -> Void var body: some View { @@ -152,7 +145,6 @@ private struct StepperTestView: View { } } -@available(macOS 10.15.0, *) private struct DatePickerTestView: View { let spy: () -> Void @State private var datePickerValue = Date() @@ -166,7 +158,6 @@ private struct DatePickerTestView: View { } } -@available(macOS 10.15.0, *) private struct SegmentedControlTestView: View { @State private var pickerValue = 0 let spy: () -> Void @@ -183,7 +174,6 @@ private struct SegmentedControlTestView: View { } } -@available(macOS 10.15.0, *) private struct TabViewTestView: View { let spy: () -> Void var body: some View { @@ -203,7 +193,7 @@ private struct TabViewTestView: View { } } -@available(macOS 10.15.0, *) +@available(macOS, introduced: 10.15, obsoleted: 13) private struct ButtonTestView: View { let spy: () -> Void var body: some View { @@ -214,7 +204,6 @@ private struct ButtonTestView: View { } } -@available(macOS 10.15.0, *) private struct ToggleTestView: View { let spy: () -> Void @State private var toggleValue = false @@ -226,7 +215,7 @@ private struct ToggleTestView: View { } } -@available(macOS 11.0, *) +@available(macOS 11, *) private struct ColorWellTestView: View { @State private var color = Color.black let spy: () -> Void @@ -239,7 +228,6 @@ private struct ColorWellTestView: View { } } -@available(macOS 10.15.0, *) class AppKitTests: XCTestCase { func testList() { From d320b489bcc13b90bafb87a7b4d1afb2264699b8 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 22:04:13 +0000 Subject: [PATCH 47/57] wip --- IntrospectTests/AppKitTests.swift | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/IntrospectTests/AppKitTests.swift b/IntrospectTests/AppKitTests.swift index b5f1c313..c91b0628 100644 --- a/IntrospectTests/AppKitTests.swift +++ b/IntrospectTests/AppKitTests.swift @@ -193,7 +193,6 @@ private struct TabViewTestView: View { } } -@available(macOS, introduced: 10.15, obsoleted: 13) private struct ButtonTestView: View { let spy: () -> Void var body: some View { @@ -231,6 +230,10 @@ private struct ColorWellTestView: View { class AppKitTests: XCTestCase { func testList() { + if #available(macOS 13, *) { + return // TODO: verify whether List still uses NSTableView under the hood in macOS 13 + } + let expectation1 = XCTestExpectation() let expectation2 = XCTestExpectation() let cellExpectation1 = XCTestExpectation() @@ -308,17 +311,14 @@ class AppKitTests: XCTestCase { TestUtils.present(view: view) wait(for: [expectation], timeout: TestUtils.Constants.timeout) } - - func testTextEditor() { - if #available(macOS 11.0, *) { - let expectation = XCTestExpectation() - let view = TextEditorTestView(spy: { - expectation.fulfill() - }) - TestUtils.present(view: view) - wait(for: [expectation], timeout: TestUtils.Constants.timeout) - } + func testTextEditor() { + let expectation = XCTestExpectation() + let view = TextEditorTestView(spy: { + expectation.fulfill() + }) + TestUtils.present(view: view) + wait(for: [expectation], timeout: TestUtils.Constants.timeout) } func testSlider() { @@ -370,9 +370,12 @@ class AppKitTests: XCTestCase { TestUtils.present(view: view) wait(for: [expectation], timeout: TestUtils.Constants.timeout) } - + func testButton() { - + + if #available(macOS 13, *) { + return // TODO: verify whether Button still uses NSButton under the hood in macOS 13 + } let expectation = XCTestExpectation() let view = ButtonTestView(spy: { expectation.fulfill() @@ -393,14 +396,12 @@ class AppKitTests: XCTestCase { func testColorPicker() { - if #available(macOS 11.0, *) { - let expectation = XCTestExpectation() - let view = ColorWellTestView(spy: { - expectation.fulfill() - }) - TestUtils.present(view: view) - wait(for: [expectation], timeout: TestUtils.Constants.timeout) - } + let expectation = XCTestExpectation() + let view = ColorWellTestView(spy: { + expectation.fulfill() + }) + TestUtils.present(view: view) + wait(for: [expectation], timeout: TestUtils.Constants.timeout) } } #endif From 2dcb068cc833871dd7fb5b5d543fad76e6f01363 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 22:17:51 +0000 Subject: [PATCH 48/57] wip --- Examples/Showcase/Showcase/ContentView.swift | 12 ++++++++++++ IntrospectTests/UIKitTests.swift | 5 ++++- fastlane/Fastfile | 9 ++------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Examples/Showcase/Showcase/ContentView.swift b/Examples/Showcase/Showcase/ContentView.swift index 9e34fc07..3cfe549d 100644 --- a/Examples/Showcase/Showcase/ContentView.swift +++ b/Examples/Showcase/Showcase/ContentView.swift @@ -46,7 +46,9 @@ struct ListShowcase: View { Text("Item 2") } .introspectTableView { tableView in + #if !os(tvOS) tableView.separatorStyle = .none + #endif } } @@ -56,7 +58,9 @@ struct ListShowcase: View { Text("Item 1") Text("Item 2") .introspectTableView { tableView in + #if !os(tvOS) tableView.separatorStyle = .none + #endif } } } @@ -71,7 +75,9 @@ struct NavigationShowcase: View { VStack { Text("Customized") } + #if !os(tvOS) .navigationBarTitle(Text("Customized"), displayMode: .inline) + #endif .introspectNavigationController { nvc in nvc.navigationBar.backgroundColor = .red } @@ -138,16 +144,21 @@ struct SimpleElementsShowcase: View { HStack { Toggle("Toggle Red", isOn: $toggleValue) + #if !os(tvOS) .introspectSwitch { uiSwitch in uiSwitch.layer.backgroundColor = UIColor.red.cgColor } + #endif Toggle("Toggle Green", isOn: $toggleValue) + #if !os(tvOS) .introspectSwitch { uiSwitch in uiSwitch.layer.backgroundColor = UIColor.green.cgColor } + #endif } + #if !os(tvOS) HStack { Slider(value: $sliderValue, in: 0...100) .introspectSlider { slider in @@ -184,6 +195,7 @@ struct SimpleElementsShowcase: View { datePicker.layer.backgroundColor = UIColor.red.cgColor } } + #endif HStack { Picker(selection: $segmentedControlValue, label: Text("Segmented control")) { diff --git a/IntrospectTests/UIKitTests.swift b/IntrospectTests/UIKitTests.swift index 1d477a4d..22fa2afa 100644 --- a/IntrospectTests/UIKitTests.swift +++ b/IntrospectTests/UIKitTests.swift @@ -407,7 +407,10 @@ class UIKitTests: XCTestCase { } func testList() { - + if #available(tvOS 16, *) { + return // TODO: verify whether List still uses NSTableView under the hood in tvOS 16 + } + let expectation1 = XCTestExpectation() let expectation2 = XCTestExpectation() let cellExpectation1 = XCTestExpectation() diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 55d2857e..d0f419d7 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,9 +3,6 @@ skip_docs platform :ios do lane :test do |options| - ci = ENV['CI'] - puts 'Running on CI.' if ci - version = options[:version].to_i || 16 devices = case version @@ -43,10 +40,8 @@ end platform :mac do lane :test do |options| - puts 'Running on GitHub CI.' if options[:ci] == 'github' - scan( - scheme: "Introspect macOS", - skip_build: options[:ci] == 'github' + run_tests( + scheme: "Introspect", ) end end From 7aad7007fc052fed63d26d919f897b00911fc546 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 22:22:55 +0000 Subject: [PATCH 49/57] wip --- .github/workflows/ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07bf43d4..75bb82e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,8 @@ jobs: - [ios, 14] - [ios, 15] - [ios, 16] - # - mac + - [mac, 11] + - [mac, 12] include: - platform: [ios, 14] os: macos-11 @@ -34,6 +35,13 @@ jobs: - platform: [ios, 16] os: macos-12 xcode: 14.2 + - platform: [mac, 11] + os: macos-11 + xcode: 12.5.1 + - platform: [mac, 12] + os: macos-12 + xcode: 13.3.1 + steps: From fc85618c62e5fc72d2661f37177720f3d36f59b4 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 22:37:30 +0000 Subject: [PATCH 50/57] wip --- .github/workflows/ci.yml | 13 ++++++------- fastlane/Fastfile | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75bb82e0..a5899e56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ jobs: - [ios, 14] - [ios, 15] - [ios, 16] - - [mac, 11] - - [mac, 12] + - [macos, 11] + - [macos, 12] include: - platform: [ios, 14] os: macos-11 @@ -35,13 +35,12 @@ jobs: - platform: [ios, 16] os: macos-12 xcode: 14.2 - - platform: [mac, 11] + - platform: [macos, 11] os: macos-11 - xcode: 12.5.1 - - platform: [mac, 12] + xcode: 13.0 + - platform: [macos, 12] os: macos-12 - xcode: 13.3.1 - + xcode: 14.0.1 steps: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d0f419d7..86dab927 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,7 +3,7 @@ skip_docs platform :ios do lane :test do |options| - version = options[:version].to_i || 16 + version = options[:version].to_i devices = case version when 14 @@ -38,10 +38,22 @@ platform :ios do end end -platform :mac do +platform :macos do lane :test do |options| + version = options[:version].to_i + + destination = case version + when 11 + "platform=macOS,arch=x86_64" + when 12 + "platform=macOS,arch=x86_64" + else + raise "Unsupported macOS version: #{version}" + end + run_tests( scheme: "Introspect", + destination: destination, ) end end From 1bd3a5a1fbe0cf9e26f966542fb3895f2ac6881d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 22:42:09 +0000 Subject: [PATCH 51/57] wip --- fastlane/Fastfile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 86dab927..e292af6d 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -40,20 +40,8 @@ end platform :macos do lane :test do |options| - version = options[:version].to_i - - destination = case version - when 11 - "platform=macOS,arch=x86_64" - when 12 - "platform=macOS,arch=x86_64" - else - raise "Unsupported macOS version: #{version}" - end - - run_tests( - scheme: "Introspect", - destination: destination, + spm( + command: "test", ) end end From 966d7ded5f180b8697859dc05a3df2b2560a9478 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 22:58:25 +0000 Subject: [PATCH 52/57] wip --- Examples/Showcase/Showcase.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Examples/Showcase/Showcase.xcodeproj/project.pbxproj b/Examples/Showcase/Showcase.xcodeproj/project.pbxproj index 4b11f878..f57b87d6 100644 --- a/Examples/Showcase/Showcase.xcodeproj/project.pbxproj +++ b/Examples/Showcase/Showcase.xcodeproj/project.pbxproj @@ -282,6 +282,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Showcase/Showcase.entitlements; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Showcase/Preview Content\""; @@ -314,6 +315,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Showcase/Showcase.entitlements; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Showcase/Preview Content\""; From 0727516ddcf77d7c93c73caceeeb2ca37964a87e Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 23:01:21 +0000 Subject: [PATCH 53/57] wip --- IntrospectTests/AppKitTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IntrospectTests/AppKitTests.swift b/IntrospectTests/AppKitTests.swift index c91b0628..cab0aabe 100644 --- a/IntrospectTests/AppKitTests.swift +++ b/IntrospectTests/AppKitTests.swift @@ -230,8 +230,8 @@ private struct ColorWellTestView: View { class AppKitTests: XCTestCase { func testList() { - if #available(macOS 13, *) { - return // TODO: verify whether List still uses NSTableView under the hood in macOS 13 + if #available(macOS 11, *) { + return // TODO: verify whether List still uses NSTableView under the hood in macOS >=11 } let expectation1 = XCTestExpectation() From 0659fa6072d8fad013823af063d8a7465e6b29d7 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 23:05:35 +0000 Subject: [PATCH 54/57] experiment --- .github/workflows/ci.yml | 12 +-- .ruby-version | 1 - Gemfile | 6 -- Gemfile.lock | 218 --------------------------------------- 4 files changed, 6 insertions(+), 231 deletions(-) delete mode 100644 .ruby-version delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5899e56..e29c181b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,14 +58,14 @@ jobs: - name: Install Homebrew dependencies run: brew install xcbeautify - - name: Bundler - uses: ruby/setup-ruby@v1 - with: - ruby-version: .ruby-version - bundler-cache: true + # - name: Bundler + # uses: ruby/setup-ruby@v1 + # with: + # ruby-version: .ruby-version + # bundler-cache: true - name: Lint Podspec run: pod lib lint - name: Run Tests - run: bundle exec fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} + run: fastlane ${{ matrix.platform[0] }} test version:${{ matrix.platform[1] }} diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 49cdd668..00000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.7.6 diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 98a0673b..00000000 --- a/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -gem "fastlane", "~> 2.137" - -plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') -eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 287086fa..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,218 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.6) - rexml - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) - atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.710.0) - aws-sdk-core (3.170.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.62.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.119.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - claide (1.1.0) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - declarative (0.0.20) - digest-crc (0.6.4) - rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.8.1) - emoji_regex (3.2.3) - excon (0.99.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.211.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) - naturally (~> 2.2) - optparse (~> 0.1.1) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.33.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-core (0.11.0) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-iamcredentials_v1 (0.16.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-playcustomapp_v1 (0.12.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.0) - google-cloud-storage (1.44.0) - addressable (~> 2.8) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - googleauth (1.3.0) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - highline (2.0.3) - http-cookie (1.0.5) - domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.6.2) - json (2.6.3) - jwt (2.7.0) - memoist (0.16.2) - mini_magick (4.12.0) - mini_mime (1.1.2) - multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) - naturally (2.2.1) - optparse (0.1.1) - os (1.1.4) - plist (3.6.0) - public_suffix (4.0.7) - rake (13.0.6) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.2.5) - rouge (2.0.7) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - security (0.1.3) - signet (0.17.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.10) - CFPropertyList - naturally - terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.2) - tty-cursor (0.7.1) - tty-screen (0.8.1) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (1.8.0) - webrick (1.8.1) - word_wrap (1.0.0) - xcodeproj (1.22.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - fastlane (~> 2.137) - -BUNDLED WITH - 1.17.3 From fb5d69898daf8e1cacedccc9486388f09017312e Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 23:16:40 +0000 Subject: [PATCH 55/57] wip --- .github/workflows/ci.yml | 11 ++--------- IntrospectTests/AppKitTests.swift | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e29c181b..1837e6e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: ci on: push: branches: - - master + - master pull_request: branches: - - "**" + - "**" concurrency: group: ci-${{ github.ref }} @@ -43,7 +43,6 @@ jobs: xcode: 14.0.1 steps: - - name: Git Checkout uses: actions/checkout@v3 @@ -58,12 +57,6 @@ jobs: - name: Install Homebrew dependencies run: brew install xcbeautify - # - name: Bundler - # uses: ruby/setup-ruby@v1 - # with: - # ruby-version: .ruby-version - # bundler-cache: true - - name: Lint Podspec run: pod lib lint diff --git a/IntrospectTests/AppKitTests.swift b/IntrospectTests/AppKitTests.swift index cab0aabe..f7996b87 100644 --- a/IntrospectTests/AppKitTests.swift +++ b/IntrospectTests/AppKitTests.swift @@ -373,8 +373,8 @@ class AppKitTests: XCTestCase { func testButton() { - if #available(macOS 13, *) { - return // TODO: verify whether Button still uses NSButton under the hood in macOS 13 + if #available(macOS 12, *) { + return // TODO: verify whether Button still uses NSButton under the hood in macOS >=12 } let expectation = XCTestExpectation() let view = ButtonTestView(spy: { From 112432f2f2fac9cf1f10c3b3c301906ff12a8fce Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 23:17:45 +0000 Subject: [PATCH 56/57] wip --- renovate.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index f45d8f11..00000000 --- a/renovate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": [ - "config:base" - ] -} From e4d48c02d60d091f8476f4a5280976f10b78fe0c Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 11 Feb 2023 23:29:28 +0000 Subject: [PATCH 57/57] wip [skip ci] --- .../xcode/package.xcworkspace/contents.xcworkspacedata | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a6..00000000 --- a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - -