Skip to content

[expo] improve support for flutter native ios dependencies #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 7, 2024
Merged

[expo] improve support for flutter native ios dependencies #17

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9acd28b
support flutter pod dependencies
p-mazhnik Sep 22, 2024
11c6893
improve support for flutter native ios dependencies
p-mazhnik Sep 22, 2024
b611286
fix path
p-mazhnik Sep 22, 2024
f8e2052
fix path
p-mazhnik Sep 22, 2024
9f28c8e
add comments
p-mazhnik Sep 22, 2024
09046f4
build expo ios app in GH actions
p-mazhnik Sep 24, 2024
e3afb18
build expo ios app in GH actions
p-mazhnik Sep 24, 2024
6da60f9
build expo ios app in GH actions
p-mazhnik Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion expo-flutter/android/app/src/debug/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
</manifest>
4 changes: 3 additions & 1 deletion expo-flutter/android/app/src/main/java/com/example/expoapp/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ public void onCreate() {
// If you opted-in for the New Architecture, we load the native entry point for this app.
DefaultNewArchitectureEntryPoint.load();
}
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
if (BuildConfig.DEBUG) {
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
}
ApplicationLifecycleDispatcher.onApplicationCreate(this);
}

Expand Down
73 changes: 71 additions & 2 deletions expo-flutter/flutter_module/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "61.0.0"
_flutterfire_internals:
dependency: transitive
description:
name: _flutterfire_internals
sha256: "5fdcea390499dd26c808a3c662df5f4208d6bbc0643072eee94f1476249e2818"
url: "https://pub.dev"
source: hosted
version: "1.3.43"
analyzer:
dependency: transitive
description:
Expand Down Expand Up @@ -97,6 +105,54 @@ packages:
url: "https://pub.dev"
source: hosted
version: "7.0.0"
firebase_analytics:
dependency: "direct main"
description:
name: firebase_analytics
sha256: "9c52c099e9cbb852c7f1d2302c7eb34a15758834eca1877f7a779e6082f9882d"
url: "https://pub.dev"
source: hosted
version: "11.3.2"
firebase_analytics_platform_interface:
dependency: transitive
description:
name: firebase_analytics_platform_interface
sha256: "4ec57aee951832fdbf10ca722bbb83fe0001d6168d6c4cfea9ccee0df6afb1e0"
url: "https://pub.dev"
source: hosted
version: "4.2.4"
firebase_analytics_web:
dependency: transitive
description:
name: firebase_analytics_web
sha256: "95c594fb1e8960992a607b135459e2f9ea3683dd8d01e6b845cace7c6665ec7e"
url: "https://pub.dev"
source: hosted
version: "0.5.10+1"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
sha256: c7de9354eb2cd8bfe8059e1112174c9a58beda7051807207306bc48283277cfb
url: "https://pub.dev"
source: hosted
version: "3.5.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
url: "https://pub.dev"
source: hosted
version: "5.3.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
url: "https://pub.dev"
source: hosted
version: "2.18.1"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -115,6 +171,11 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_web_plugins:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
glob:
dependency: transitive
description:
Expand Down Expand Up @@ -203,6 +264,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "10.1.4"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
url: "https://pub.dev"
source: hosted
version: "2.1.8"
pub_semver:
dependency: transitive
description:
Expand Down Expand Up @@ -284,10 +353,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "14.2.4"
version: "14.2.5"
watcher:
dependency: transitive
description:
Expand Down
3 changes: 3 additions & 0 deletions expo-flutter/flutter_module/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ dependencies:
flutter:
sdk: flutter
web: ^1.0.0
# add some dependencies with native code
firebase_core: 3.5.0
firebase_analytics: 11.3.2

dev_dependencies:
flutter_test:
Expand Down
12 changes: 11 additions & 1 deletion expo-flutter/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ podfile_properties = JSON.parse(File.read(File.join(__dir__, 'Podfile.properties
ENV['RCT_NEW_ARCH_ENABLED'] = podfile_properties['newArchEnabled'] == 'true' ? '1' : '0'
ENV['EX_DEV_CLIENT_NETWORK_INSPECTOR'] = podfile_properties['EX_DEV_CLIENT_NETWORK_INSPECTOR']

platform :ios, podfile_properties['ios.deploymentTarget'] || '13.0'
platform :ios, podfile_properties['ios.deploymentTarget'] || '15.0'
install! 'cocoapods',
:deterministic_uuids => false

Expand Down Expand Up @@ -39,6 +39,16 @@ end

target 'ExpoFlutter' do
use_expo_modules!
# @generated begin expo-flutter-view - expo prebuild (DO NOT MODIFY) sync-a6fad925eb19db4b427cb412b9bf06f47580494d
pod 'Flutter', :podspec => '../modules/expo-flutter-view/ios/Flutter/Flutter.podspec'
pod 'FlutterPluginRegistrant', path: '/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/FlutterPluginRegistrant'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

full path leaked

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I fixed it in the latest commits, squash and merge will prevent this from going to the main branch.

I also noticed that you're removing the --clean flag

I just don't think the clean flag is needed for each change. It takes a long time for me to reinstall all pod dependencies when using clean, and it is unnecessary to use it every time (although not prohibited)

xcodebuild: error: The workspace named "expoflutter" does not contain a scheme named "ExpoFlutter".

hm, I am looking at the PR changes and don't see anything related. I can quickly setup build in GH Actions to check

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working with scheme written in lower case: https://github.com/p-mazhnik/flutter-embedding/actions/runs/11011828146/job/30576763675
--scheme expoflutter

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea why this is changed by the PR, and locally I still have scheme with upper case letters

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I lost it when I ran prebuild with --clean

pod 'firebase_analytics', path: '/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/firebase_analytics/ios'
pod 'firebase_core', path: '/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/firebase_core/ios'
pod 'FlutterModule-Debug', :podspec => '../modules/expo-flutter-view/ios/Podspecs/FlutterModule-Debug.podspec', :configuration => 'Debug'
pod 'FlutterModule-Release', :podspec => '../modules/expo-flutter-view/ios/Podspecs/FlutterModule-Release.podspec', :configuration => 'Release'
pod 'GoogleUtilities', :modular_headers => true
pod 'FirebaseCore', :modular_headers => true
# @generated end expo-flutter-view
config = use_native_modules!

use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
Expand Down
165 changes: 158 additions & 7 deletions expo-flutter/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ PODS:
- ExpoModulesCore
- ExpoFlutterView (1.0.0):
- ExpoModulesCore
- Flutter
- FlutterModule-Debug
- FlutterModule-Release
- ExpoKeepAwake (12.3.0):
Expand All @@ -35,14 +36,128 @@ PODS:
- React-Core (= 0.72.3)
- React-jsi (= 0.72.3)
- ReactCommon/turbomodule/core (= 0.72.3)
- FlutterModule-Debug (1.0.0)
- FlutterModule-Release (1.0.0)
- Firebase/Analytics (11.0.0):
- Firebase/Core
- Firebase/Core (11.0.0):
- Firebase/CoreOnly
- FirebaseAnalytics (~> 11.0.0)
- Firebase/CoreOnly (11.0.0):
- FirebaseCore (= 11.0.0)
- firebase_analytics (11.3.2):
- Firebase/Analytics (= 11.0.0)
- firebase_core
- Flutter
- firebase_core (3.5.0):
- Firebase/CoreOnly (= 11.0.0)
- Flutter
- FirebaseAnalytics (11.0.0):
- FirebaseAnalytics/AdIdSupport (= 11.0.0)
- FirebaseCore (~> 11.0)
- FirebaseInstallations (~> 11.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- FirebaseAnalytics/AdIdSupport (11.0.0):
- FirebaseCore (~> 11.0)
- FirebaseInstallations (~> 11.0)
- GoogleAppMeasurement (= 11.0.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- FirebaseCore (11.0.0):
- FirebaseCoreInternal (~> 11.0)
- GoogleUtilities/Environment (~> 8.0)
- GoogleUtilities/Logger (~> 8.0)
- FirebaseCoreInternal (11.2.0):
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- FirebaseInstallations (11.2.0):
- FirebaseCore (~> 11.0)
- GoogleUtilities/Environment (~> 8.0)
- GoogleUtilities/UserDefaults (~> 8.0)
- PromisesObjC (~> 2.4)
- Flutter (3.24.300)
- FlutterModule-Debug (1.2.0)
- FlutterModule-Release (1.2.0)
- FlutterPluginRegistrant (0.0.1):
- firebase_analytics
- firebase_core
- Flutter
- fmt (6.2.1)
- glog (0.3.5)
- GoogleAppMeasurement (11.0.0):
- GoogleAppMeasurement/AdIdSupport (= 11.0.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/AdIdSupport (11.0.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.0.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/WithoutAdIdSupport (11.0.0):
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleUtilities (8.0.2):
- GoogleUtilities/AppDelegateSwizzler (= 8.0.2)
- GoogleUtilities/Environment (= 8.0.2)
- GoogleUtilities/Logger (= 8.0.2)
- GoogleUtilities/MethodSwizzler (= 8.0.2)
- GoogleUtilities/Network (= 8.0.2)
- "GoogleUtilities/NSData+zlib (= 8.0.2)"
- GoogleUtilities/Privacy (= 8.0.2)
- GoogleUtilities/Reachability (= 8.0.2)
- GoogleUtilities/SwizzlerTestHelpers (= 8.0.2)
- GoogleUtilities/UserDefaults (= 8.0.2)
- GoogleUtilities/AppDelegateSwizzler (8.0.2):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Privacy
- GoogleUtilities/Environment (8.0.2):
- GoogleUtilities/Privacy
- GoogleUtilities/Logger (8.0.2):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- GoogleUtilities/MethodSwizzler (8.0.2):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- GoogleUtilities/Network (8.0.2):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Privacy
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (8.0.2)":
- GoogleUtilities/Privacy
- GoogleUtilities/Privacy (8.0.2)
- GoogleUtilities/Reachability (8.0.2):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- GoogleUtilities/SwizzlerTestHelpers (8.0.2):
- GoogleUtilities/MethodSwizzler
- GoogleUtilities/UserDefaults (8.0.2):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- hermes-engine (0.72.3):
- hermes-engine/Pre-built (= 0.72.3)
- hermes-engine/Pre-built (0.72.3)
- libevent (2.1.12)
- nanopb (3.30910.0):
- nanopb/decode (= 3.30910.0)
- nanopb/encode (= 3.30910.0)
- nanopb/decode (3.30910.0)
- nanopb/encode (3.30910.0)
- PromisesObjC (2.4.0)
- RCT-Folly (2021.07.22.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -474,9 +589,15 @@ DEPENDENCIES:
- EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- firebase_analytics (from `/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/firebase_analytics/ios`)
- firebase_core (from `/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/firebase_core/ios`)
- FirebaseCore
- Flutter (from `../modules/expo-flutter-view/ios/Flutter/Flutter.podspec`)
- FlutterModule-Debug (from `../modules/expo-flutter-view/ios/Podspecs/FlutterModule-Debug.podspec`)
- FlutterModule-Release (from `../modules/expo-flutter-view/ios/Podspecs/FlutterModule-Release.podspec`)
- FlutterPluginRegistrant (from `/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/FlutterPluginRegistrant`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- GoogleUtilities
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- libevent (~> 2.1.12)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
Expand Down Expand Up @@ -518,8 +639,17 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- Firebase
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreInternal
- FirebaseInstallations
- fmt
- GoogleAppMeasurement
- GoogleUtilities
- libevent
- nanopb
- PromisesObjC
- SocketRocket

EXTERNAL SOURCES:
Expand Down Expand Up @@ -549,10 +679,18 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
FBReactNativeSpec:
:path: "../node_modules/react-native/React/FBReactNativeSpec"
firebase_analytics:
:path: "/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/firebase_analytics/ios"
firebase_core:
:path: "/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/firebase_core/ios"
Flutter:
:podspec: "../modules/expo-flutter-view/ios/Flutter/Flutter.podspec"
FlutterModule-Debug:
:podspec: "../modules/expo-flutter-view/ios/Podspecs/FlutterModule-Debug.podspec"
FlutterModule-Release:
:podspec: "../modules/expo-flutter-view/ios/Podspecs/FlutterModule-Release.podspec"
FlutterPluginRegistrant:
:path: "/Users/mazhnik/Codes/p-mazhnik/flutter-embedding/expo-flutter/modules/expo-flutter-view/ios/Flutter/plugins/FlutterPluginRegistrant"
glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
hermes-engine:
Expand Down Expand Up @@ -637,18 +775,31 @@ SPEC CHECKSUMS:
EXFileSystem: d7f59869885cfeab3ac771e2a8d0f5ed98cd3fdb
EXFont: 738c44c390953ebcbab075a4848bfbef025fd9ee
Expo: f2485e8fab9988e5dcee34159df5e475c9c3730c
ExpoFlutterView: 1171bca0c23557b6c001bd6944f3c92b1fdfa683
ExpoFlutterView: fd00b876d4956a0fb8593531d0bb394ab7219b37
ExpoKeepAwake: be4cbd52d9b177cde0fd66daa1913afa3161fc1d
ExpoModulesCore: 924a69d9bffa2925c1f7eafab37764565f861d5d
EXSplashScreen: 89586b0961acd173b04713b7457949b063a659da
FBLazyVector: 4cce221dd782d3ff7c4172167bba09d58af67ccb
FBReactNativeSpec: c6bd9e179757b3c0ecf815864fae8032377903ef
FlutterModule-Debug: f92e5f2f5ac68eeb946dbc1a0a3a76da4273c715
FlutterModule-Release: df83085924b37e0295cdd589d24be2eb846e85fd
Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
firebase_analytics: 4fd10182fd08bb8358f26ac8aca8dad7b6d0f592
firebase_core: 2ec6b789859c7c24766344ec71fdf78639402d56
FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
Flutter: cf0fa514050ba8ed3cfd00f828cc48dd41aeaa4a
FlutterModule-Debug: 036740b3ea259634add312057199420d03132019
FlutterModule-Release: 8aa7bc4e95ca3b93151fcc741f2f66b6f05c7d6e
FlutterPluginRegistrant: 3c51e262fe1d334408a540a99ca370dbabb43e61
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: a2faf4bad4e438ca37b2040cb8f7799baa065c18
RCTTypeSafety: cb09f3e4747b6d18331a15eb05271de7441ca0b3
Expand Down Expand Up @@ -686,6 +837,6 @@ SPEC CHECKSUMS:
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce

PODFILE CHECKSUM: 67e5024182d2f86a9b22f9a0ec4e3f311988f702
PODFILE CHECKSUM: 5ab6f89937b43bb79ab14cee7d0cc5b094ad910f

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
Loading