refactor(rn): rename 'ios-rn' directory to just 'ios'

p-mazhnik · Jul 16, 2023 · c9f9306 · c9f9306
1 parent 325e3a7
commit c9f9306
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/ReactNativeApp/ios/Podfile b/ReactNativeApp/ios/Podfile
@@ -1,5 +1,5 @@
 # import `use_flutter_module_rn` function
-require_relative '../node_modules/flutter-module-rn/ios-rn/pods'
+require_relative '../node_modules/flutter-module-rn/ios/pods'
 
 # Resolve react_native_pods.rb with node to allow for hoisting
 require Pod::Executable.execute_command('node', ['-p',

diff --git a/ReactNativeApp/ios/Podfile.lock b/ReactNativeApp/ios/Podfile.lock
@@ -69,11 +69,11 @@ PODS:
     - FlipperKit/Core
     - FlipperKit/FlipperKitNetworkPlugin
   - Flutter (3.10.500)
-  - FlutterModuleFrameworks-Debug (1.1.1):
+  - FlutterModuleFrameworks-Debug (1.1.2):
     - Flutter
-  - FlutterModuleFrameworks-Release (1.1.1):
+  - FlutterModuleFrameworks-Release (1.1.2):
     - Flutter
-  - FlutterModuleRn (1.1.1):
+  - FlutterModuleRn (1.1.2):
     - Flutter
     - FlutterModuleFrameworks-Debug
     - FlutterModuleFrameworks-Release
@@ -534,8 +534,8 @@ DEPENDENCIES:
   - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.182.0)
   - FlipperKit/SKIOSNetworkPlugin (= 0.182.0)
   - Flutter (from `../node_modules/flutter-module-rn/build/ios/framework/Flutter.podspec`)
-  - FlutterModuleFrameworks-Debug (from `../node_modules/flutter-module-rn/ios-rn/Podspecs/FlutterModuleRn-Debug.podspec`)
-  - FlutterModuleFrameworks-Release (from `../node_modules/flutter-module-rn/ios-rn/Podspecs/FlutterModuleRn-Release.podspec`)
+  - FlutterModuleFrameworks-Debug (from `../node_modules/flutter-module-rn/ios/Podspecs/FlutterModuleRn-Debug.podspec`)
+  - FlutterModuleFrameworks-Release (from `../node_modules/flutter-module-rn/ios/Podspecs/FlutterModuleRn-Release.podspec`)
   - FlutterModuleRn (from `../node_modules/flutter-module-rn`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
@@ -608,9 +608,9 @@ EXTERNAL SOURCES:
   Flutter:
     :podspec: "../node_modules/flutter-module-rn/build/ios/framework/Flutter.podspec"
   FlutterModuleFrameworks-Debug:
-    :podspec: "../node_modules/flutter-module-rn/ios-rn/Podspecs/FlutterModuleRn-Debug.podspec"
+    :podspec: "../node_modules/flutter-module-rn/ios/Podspecs/FlutterModuleRn-Debug.podspec"
   FlutterModuleFrameworks-Release:
-    :podspec: "../node_modules/flutter-module-rn/ios-rn/Podspecs/FlutterModuleRn-Release.podspec"
+    :podspec: "../node_modules/flutter-module-rn/ios/Podspecs/FlutterModuleRn-Release.podspec"
   FlutterModuleRn:
     :path: "../node_modules/flutter-module-rn"
   glog:
@@ -704,9 +704,9 @@ SPEC CHECKSUMS:
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6
   Flutter: cd5df16d85154222fa94e7c52585ae08c7f277ac
-  FlutterModuleFrameworks-Debug: 3a2b73fa40d6ec94735b44ca8f5cb6a4f07c325f
-  FlutterModuleFrameworks-Release: ba3f6002a0343babff4c641f2da9218b8e05f334
-  FlutterModuleRn: 1f7709d89377f1b6a6c00ff2190e33214f3dbb7e
+  FlutterModuleFrameworks-Debug: 8ae70ec2170d9a7146abdfc7a400f58f3fb6f6bf
+  FlutterModuleFrameworks-Release: 14ddf8a143ba88237fa755c256575d6c9ca607ee
+  FlutterModuleRn: db0ea867b24a3b84e25a3f4f8eaa2b2a462ed76a
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 5337263514dd6f09803962437687240c5dc39aa4
   hermes-engine: 9df83855a0fd15ef8eb61694652bae636b0c466e
@@ -750,6 +750,6 @@ SPEC CHECKSUMS:
   Yoga: 65286bb6a07edce5e4fe8c90774da977ae8fc009
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: d45374073805b4a6f0a1cc281cb985f8a0ba0d4d
+PODFILE CHECKSUM: 18505c092f445ac289a1ed116d55fa17b7bd5add
 
 COCOAPODS: 1.12.1
diff --git a/ReactNativeApp/yarn.lock b/ReactNativeApp/yarn.lock
@@ -4806,7 +4806,7 @@ flow-parser@^0.206.0:
   integrity sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w==
 
 "flutter-module-rn@file:../rn-flutter":
-  version "1.1.1"
+  version "1.1.2"
 
 follow-redirects@^1.0.0:
   version "1.14.7"

diff --git a/rn-flutter/FlutterModuleRn.podspec b/rn-flutter/FlutterModuleRn.podspec
@@ -1,14 +1,14 @@
 # FlutterModuleRn.podspec
 
-require './ios-rn/Podspecs/common'
+require './ios/Podspecs/common'
 
 Pod::Spec.new do |s|
   setCommonProps(s)
   s.name         = "FlutterModuleRn"
   s.description  = <<-DESC
                   flutter_module_rn
                    DESC
-  s.source_files = "ios-rn/**/*.{h,c,cc,cpp,m,mm,swift}"
+  s.source_files = "ios/**/*.{h,c,cc,cpp,m,mm,swift}"
 
   s.dependency "React-Core"
   s.dependency "Flutter"

diff --git a/rn-flutter/README.md b/rn-flutter/README.md
@@ -27,7 +27,7 @@ repositories {
 Add following to your `Podfile`:
 
 ```ruby
-require_relative '../node_modules/flutter-module-rn/ios-rn/pods'
+require_relative '../node_modules/flutter-module-rn/ios/pods'
 ...
 
 target 'ReactNativeApp' do

diff --git a/rn-flutter/ios-rn/FlutterModuleRn.h → rn-flutter/ios/FlutterModuleRn.h b/rn-flutter/ios-rn/FlutterModuleRn.h → rn-flutter/ios/FlutterModuleRn.h
diff --git a/rn-flutter/ios-rn/FlutterModuleRn.m → rn-flutter/ios/FlutterModuleRn.m b/rn-flutter/ios-rn/FlutterModuleRn.m → rn-flutter/ios/FlutterModuleRn.m
diff --git a/...FlutterModuleRn.xcodeproj/project.pbxproj → ...FlutterModuleRn.xcodeproj/project.pbxproj b/...FlutterModuleRn.xcodeproj/project.pbxproj → ...FlutterModuleRn.xcodeproj/project.pbxproj
diff --git a/...leRn.xcworkspace/contents.xcworkspacedata → ...leRn.xcworkspace/contents.xcworkspacedata b/...leRn.xcworkspace/contents.xcworkspacedata → ...leRn.xcworkspace/contents.xcworkspacedata
diff --git a/...rn/Podspecs/FlutterModuleRn-Debug.podspec → ...os/Podspecs/FlutterModuleRn-Debug.podspec b/...rn/Podspecs/FlutterModuleRn-Debug.podspec → ...os/Podspecs/FlutterModuleRn-Debug.podspec
diff --git a/.../Podspecs/FlutterModuleRn-Profile.podspec → .../Podspecs/FlutterModuleRn-Profile.podspec b/.../Podspecs/FlutterModuleRn-Profile.podspec → .../Podspecs/FlutterModuleRn-Profile.podspec
diff --git a/.../Podspecs/FlutterModuleRn-Release.podspec → .../Podspecs/FlutterModuleRn-Release.podspec b/.../Podspecs/FlutterModuleRn-Release.podspec → .../Podspecs/FlutterModuleRn-Release.podspec
diff --git a/rn-flutter/ios-rn/Podspecs/common.rb → rn-flutter/ios/Podspecs/common.rb b/rn-flutter/ios-rn/Podspecs/common.rb → rn-flutter/ios/Podspecs/common.rb
diff --git a/rn-flutter/ios-rn/pods.rb → rn-flutter/ios/pods.rb b/rn-flutter/ios-rn/pods.rb → rn-flutter/ios/pods.rb
@@ -8,9 +8,9 @@ def use_flutter_module_rn! (options={})
   pod 'Flutter', :podspec => "#{prefix}/build/ios/framework/Flutter.podspec"
   pod 'FlutterModuleFrameworks-Debug',
     :configuration => 'Debug',
-    :podspec => "#{prefix}/ios-rn/Podspecs/FlutterModuleRn-Debug.podspec"
+    :podspec => "#{prefix}/ios/Podspecs/FlutterModuleRn-Debug.podspec"
   pod 'FlutterModuleFrameworks-Release',
     :configuration => 'Release',
-    :podspec => "#{prefix}/ios-rn/Podspecs/FlutterModuleRn-Release.podspec"
+    :podspec => "#{prefix}/ios/Podspecs/FlutterModuleRn-Release.podspec"
 end
 
diff --git a/rn-flutter/package.json b/rn-flutter/package.json
@@ -1,7 +1,7 @@
 {
   "name": "flutter-module-rn",
   "title": "Flutter module RN",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "MIT",
   "description": "Flutter module as a React Native package",
   "main": "index.js",
@@ -10,7 +10,7 @@
     "README.md",
     "android",
     "index.js",
-    "ios-rn",
+    "ios",
     "FlutterModuleRn.podspec"
   ],
   "repository": {