Merge pull request #1782 from Nozbe/bump-deps

Bump deps

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Check docs build
         run: cd docs-website && yarn install && cd .. && yarn docs:build
   ios:
-    runs-on: macos-11
+    runs-on: macos-13-large
     name: iOS tests
     steps:
       - uses: actions/checkout@v3
@@ -37,7 +37,7 @@ jobs:
       - name: Set Xcode version
         uses: maxim-lobanov/[email protected]
         with:
-          xcode-version: 13.2.1
+          xcode-version: 14.3
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1
       - name: cache node_modules

CHANGELOG-Unreleased.md

@@ -2,6 +2,8 @@
 
 ### BREAKING CHANGES
 
+- [iOS] Podspec deployment target was bumped from iOS 11 to iOS 12
+
 ### Deprecations
 
 ### New features
@@ -22,3 +24,5 @@
 - [docs] Improved Android installation docs
 
 ### Internal
+
+- Update internal dependencies

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'pry'
-gem 'cocoapods', '1.11.3'
+gem 'cocoapods', '1.15.2'
 
 # NOTE: TEMPORARY, for darwin-arm64 compatibility
 gem 'ffi', '>1.14.2'

Gemfile.lock

@@ -9,41 +9,49 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (6.1.7.6)
+    activesupport (7.1.3.2)
+      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)
+    addressable (2.8.6)
       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)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     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)
       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)
+      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)
@@ -53,7 +61,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)
@@ -63,46 +71,49 @@ GEM
     cocoapods-try (1.2.0)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    drb (2.2.1)
     escape (0.0.4)
     ffi (1.15.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.2)
     method_source (1.0.0)
-    minitest (5.19.0)
+    minitest (5.22.3)
     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)
     pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.2.6)
     ruby-macho (2.5.1)
-    typhoeus (1.4.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)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.11.3)
+  cocoapods (= 1.15.2)
   ethon!
   ffi (> 1.14.2)
   pry

WatermelonDB.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage     = package["homepage"]
   s.license      = package["license"]
   s.author       = { "author" => package["author"] }
-  s.platforms    = { :ios => "11.0", :tvos => "11.0" }
+  s.platforms    = { :ios => "12.0", :tvos => "12.0" }
   s.source = { :git => "https://github.com/Nozbe/WatermelonDB.git", :tag => "v#{s.version}" }
   s.source_files = "native/ios/**/*.{h,m,mm,swift,c,cpp}", "native/shared/**/*.{h,c,cpp}"
   s.public_header_files = [

native/iosTest/Podfile

@@ -7,7 +7,6 @@ require_relative '../../node_modules/@react-native-community/cli-platform-ios/na
 platform :ios, '15.0'
 
 hermes_enabled = true
-enable_jslock_hack = false
 should_use_frameworks = false
 
 if should_use_frameworks
@@ -61,17 +60,15 @@ post_install do |installer|
   react_native_post_install(installer, '../../node_modules/react-native')
   # __apply_Xcode_12_5_M1_post_install_workaround(installer)
 
+  # wtf? https://github.com/facebook/react-native/issues/33178
+  system("sed -i -e $'s/_IPHONE_10_0/_IPHONE_16_0/' '#{installer.sandbox.root}/RCT-Folly/folly/portability/Time.h'") || raise
+
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= %w[
         $(inherited)
         CCACHE_HACK_TOOLCHAIN_DIR="$(TOOLCHAIN_DIR)"
       ]
-      if !hermes_enabled && enable_jslock_hack
-        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'].push(
-          'ENABLE_JSLOCK_PERFORMANCE_HACK=1',
-        )
-      end
       # ccache bails out of caching if clang modules are enabled, but this breaks some packages
       # you also have to be careful about PCHs
       # sometimes you might have to manually add a system framework to project Link phase
@@ -83,6 +80,11 @@ post_install do |installer|
       # else
         config.build_settings['CLANG_ENABLE_MODULES'] ||= ['NO']
       # end
+
+      # Fixes https://github.com/facebook/react-native/issues/34106
+      if target.name == 'React-Codegen'
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4'
+      end
     end
   end
 end