diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 09ba5b3..b89d4b0 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -12,7 +12,7 @@ jobs: - name: setup-xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 14.2 + xcode-version: 15.2 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/Pod Lib.yml b/.github/workflows/Pod Lib.yml index 754f61d..f3cf9a7 100644 --- a/.github/workflows/Pod Lib.yml +++ b/.github/workflows/Pod Lib.yml @@ -15,7 +15,7 @@ jobs: - name: setup-xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 14.2 + xcode-version: 15.2 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/SwiftPM.yml b/.github/workflows/SwiftPM.yml index 234291b..533d224 100644 --- a/.github/workflows/SwiftPM.yml +++ b/.github/workflows/SwiftPM.yml @@ -14,7 +14,7 @@ jobs: - name: setup-xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 14.2 + xcode-version: 15.2 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: diff --git a/Gemfile.lock b/Gemfile.lock index 468ae29..b26a1f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,38 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - activesupport (6.1.7.2) + activesupport (7.1.3.4) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.2.0) + bigdecimal (3.1.8) claide (1.1.0) - cocoapods (1.11.3) + cocoapods (1.15.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.15.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -32,10 +40,10 @@ GEM 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) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.15.2) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -45,7 +53,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -54,32 +62,38 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.0) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) + drb (2.2.1) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.17.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - json (2.6.3) - minitest (5.17.0) + json (2.7.2) + minitest (5.24.1) molinillo (0.8.0) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) + nkf (0.2.0) public_suffix (4.0.7) - rexml (3.2.5) + rexml (3.2.9) + strscan rouge (2.0.7) ruby-macho (2.5.1) - typhoeus (1.4.0) + strscan (3.1.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.22.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -88,7 +102,6 @@ GEM rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) - zeitwerk (2.6.6) PLATFORMS ruby diff --git a/Podfile b/Podfile index 99b2183..7d7853b 100644 --- a/Podfile +++ b/Podfile @@ -12,7 +12,31 @@ abstract_target 'Common' do pod 'ReactiveObjC' pod 'RxReactiveObjC', path: './', testspecs: ['CoreTests'], inhibit_warnings: false target 'RxReactiveObjCSample' do - platform :ios, '9.0' + platform :ios, '13.0' pod 'SwiftLint' end end + +post_install do |installer_representation| + pods_projects = installer_representation.generated_projects + + pods_projects.each do |project| + project.build_configurations.each do |config| + if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_i < 12 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + end + + project.targets.each do |target| + target.build_configurations.each do |config| + if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_i < 12 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + end + + # else Xcode 12 complains + config.build_settings.delete('ARCHS') + end + end + end + project.root_object.attributes['LastUpgradeCheck'] = '1200' + end +end