diff --git a/.github/actions/bootstrap-project/action.yml b/.github/actions/bootstrap-project/action.yml index 0ee34ed3a..eee91bdbf 100644 --- a/.github/actions/bootstrap-project/action.yml +++ b/.github/actions/bootstrap-project/action.yml @@ -8,10 +8,6 @@ inputs: runs: using: "composite" steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.1.2' - bundler-cache: true - name: Write Constants run: | CONSTANTS=$'${{ inputs.test-project-constants }}' @@ -22,7 +18,7 @@ runs: run: sudo xcode-select -s '/Applications/Xcode_15.0.app/Contents/Developer' shell: bash - name: Bootstrap Project - run: ./Scripts/BootstrapProject.sh --skip-bundle-instal + run: ./Scripts/BootstrapProject.sh shell: bash # - name: Bootstrap Example Project # if: ${{ inputs.test-project-constants != '' }} diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 4122afb19..000000000 --- a/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source "https://rubygems.org" - -gem "cocoapods" -gem "xcpretty" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b24f66abd..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,99 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.6) - rexml - activesupport (7.0.8) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.1.0) - cocoapods (1.13.0) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.6.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 (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) - activesupport (>= 5.0, < 8) - 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) - colored2 (3.1.2) - concurrent-ruby (1.2.2) - escape (0.0.4) - ethon (0.16.0) - ffi (>= 1.15.0) - ffi (1.16.2) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.6.3) - minitest (5.20.0) - molinillo (0.8.0) - nanaimo (0.3.0) - nap (1.1.0) - netrc (0.11.0) - public_suffix (4.0.7) - rexml (3.2.6) - rouge (2.0.7) - ruby-macho (2.5.1) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - xcodeproj (1.23.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) - -PLATFORMS - ruby - -DEPENDENCIES - cocoapods - xcpretty - -BUNDLED WITH - 2.1.4 diff --git a/README.md b/README.md index 02d175f3c..f1e4d01a9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ We welcome contributions of any kind including new features, bug fixes, and gene - A recent version of macOS (tested with 13.3.1) - A recent version of Xcode (tested with 14.3.1) - [Homebrew](https://brew.sh/) package manager -- [Ruby](https://www.ruby-lang.org) (tested with 3.1.2) with [bundler](https://bundler.io) installed ### Installation diff --git a/Scripts/BootstrapProject.sh b/Scripts/BootstrapProject.sh index 5d9bcb029..0e1242fa8 100755 --- a/Scripts/BootstrapProject.sh +++ b/Scripts/BootstrapProject.sh @@ -8,10 +8,5 @@ export CURRENT_VERSION="$(cat Version.resolved)" # Installs brew dependencies brew bundle -q -# Installs bundler dependencies if needed -if ! [[ "$@" =~ '--skip-bundle-instal' ]]; then - bundle check || bundle install -fi - # Creates project xcodegen generate diff --git a/Scripts/CreateXcframework.sh b/Scripts/CreateXcframework.sh index b0fd9cc0f..c1eaac885 100755 --- a/Scripts/CreateXcframework.sh +++ b/Scripts/CreateXcframework.sh @@ -8,14 +8,12 @@ function build_framework {( xcodebuild archive \ -scheme $1 \ -destination "generic/platform=iOS" \ - -archivePath .build/framework/$1-iOS | - bundle exec xcpretty + -archivePath .build/framework/$1-iOS xcodebuild archive \ -scheme $1 \ -destination "generic/platform=iOS Simulator" \ - -archivePath .build/framework/$1-Sim | - bundle exec xcpretty + -archivePath .build/framework/$1-Sim cd .build/framework diff --git a/Scripts/PushPodspecs.sh b/Scripts/PushPodspecs.sh index 9f5dc4224..9218ece8b 100755 --- a/Scripts/PushPodspecs.sh +++ b/Scripts/PushPodspecs.sh @@ -6,5 +6,7 @@ set +e # Push Podspecs for PRODUCT in "ProcessOut" "ProcessOutCheckout3DS"; do - bundle exec pod trunk push $PRODUCT.podspec --allow-warnings --synchronous + + # This script is intended to be run on CI where cocoapods is already installed. + pod trunk push $PRODUCT.podspec --allow-warnings --synchronous done diff --git a/Scripts/Test.sh b/Scripts/Test.sh index 493994af4..021bc43cd 100755 --- a/Scripts/Test.sh +++ b/Scripts/Test.sh @@ -18,7 +18,6 @@ done xcodebuild clean build \ -project $PROJECT \ -scheme ProcessOutCheckout3DS \ - -destination "generic/platform=iOS" | - bundle exec xcpretty + -destination "generic/platform=iOS" # todo(andrii-vysotskyi): run example target tests when POM-144 is resolved