diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecfe8bbde..5b88e2f33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,6 +53,12 @@ jobs: with: path: .yarn/cache key: ${{ hashFiles('yarn.lock') }} + - name: Set up Ruby + uses: ruby/setup-ruby@v1.86.0 + with: + ruby-version: '3.0' + bundler: Gemfile.lock + bundler-cache: true - name: Install run: | yarn @@ -67,7 +73,6 @@ jobs: scripts/clang-format-diff.sh || true - name: CocoaPods run: | - bundle install echo "::add-matcher::.github/rubocop.json" bundle exec rubocop echo "::remove-matcher owner=rubocop::" diff --git a/.rubocop.yml b/.rubocop.yml index 201a8f1e8..92559cae7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,6 +2,7 @@ AllCops: NewCops: enable Exclude: - "**/node_modules/**/*" + - "vendor/bundle/**/*" TargetRubyVersion: 2.6 Layout/LineLength: diff --git a/Gemfile.lock b/Gemfile.lock index 5eeb7b55d..43da0c40f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.4) + CFPropertyList (3.0.5) rexml ast (2.4.2) atomos (0.1.3) @@ -12,27 +12,27 @@ GEM colored2 (3.1.2) minitest (5.14.4) nanaimo (0.3.0) - parallel (1.20.1) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) rainbow (3.0.0) regexp_parser (2.1.1) rexml (3.2.5) - rubocop (1.20.0) + rubocop (1.23.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) + rubocop-ast (1.13.0) parser (>= 3.0.1.1) - rubocop-minitest (0.15.0) + rubocop-minitest (0.16.0) rubocop (>= 0.90, < 2.0) ruby-progressbar (1.11.0) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) diff --git a/ios/test_app.rb b/ios/test_app.rb index f5516689c..0d0451613 100644 --- a/ios/test_app.rb +++ b/ios/test_app.rb @@ -231,7 +231,7 @@ def make_project!(xcodeproj, project_root, target_platform) react_native = react_native_path(project_root, target_platform) version = package_version(react_native.to_s).segments - version = version[0] * 10_000 + version[1] * 100 + version[2] + version = (version[0] * 10_000) + (version[1] * 100) + version[2] version_macro = "REACT_NATIVE_VERSION=#{version}" build_settings = {}