From d934f8a296c87601ad1f3998438174af29181bf5 Mon Sep 17 00:00:00 2001 From: Vlad Lukhanin <43810932+ccvlad@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:01:17 +0300 Subject: [PATCH] changes to run iOS & Android samples (#368) --- chat_sample/android/app/build.gradle | 2 +- chat_sample/ios/Podfile.lock | 159 +++++++++--------- .../ios/Runner.xcodeproj/project.pbxproj | 11 +- chat_sample/pubspec.yaml | 2 +- conf_call_sample/android/app/build.gradle | 2 +- conf_call_sample/ios/Podfile | 2 +- conf_call_sample/ios/Podfile.lock | 22 +-- .../ios/Runner.xcodeproj/project.pbxproj | 27 ++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- conf_call_sample/ios/Runner/AppDelegate.swift | 2 +- .../lib/src/utils/platform_utils.dart | 2 +- conf_call_sample/pubspec.yaml | 3 +- .../flutter/generated_plugin_registrant.cc | 3 + p2p_call_sample/android/app/build.gradle | 6 +- p2p_call_sample/android/gradle.properties | 2 +- p2p_call_sample/ios/Podfile.lock | 14 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- p2p_call_sample/macos/Podfile.lock | 4 +- .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../macos/Runner/AppDelegate.swift | 2 +- 20 files changed, 149 insertions(+), 122 deletions(-) diff --git a/chat_sample/android/app/build.gradle b/chat_sample/android/app/build.gradle index 48e9370..199b16a 100644 --- a/chat_sample/android/app/build.gradle +++ b/chat_sample/android/app/build.gradle @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "com.connectycube.flutter.chat_sample" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/chat_sample/ios/Podfile.lock b/chat_sample/ios/Podfile.lock index 45f73df..e1b8671 100644 --- a/chat_sample/ios/Podfile.lock +++ b/chat_sample/ios/Podfile.lock @@ -47,65 +47,65 @@ PODS: - SwiftyGif - emoji_picker_flutter (0.0.1): - Flutter - - FBAEMKit (16.3.1): - - FBSDKCoreKit_Basics (= 16.3.1) - - FBSDKCoreKit (16.3.1): - - FBAEMKit (= 16.3.1) - - FBSDKCoreKit_Basics (= 16.3.1) - - FBSDKCoreKit_Basics (16.3.1) - - FBSDKLoginKit (16.3.1): - - FBSDKCoreKit (= 16.3.1) + - FBAEMKit (17.0.3): + - FBSDKCoreKit_Basics (= 17.0.3) + - FBSDKCoreKit (17.0.3): + - FBAEMKit (= 17.0.3) + - FBSDKCoreKit_Basics (= 17.0.3) + - FBSDKCoreKit_Basics (17.0.3) + - FBSDKLoginKit (17.0.3): + - FBSDKCoreKit (= 17.0.3) - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/Auth (10.22.0): + - Firebase/Auth (10.25.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.22.0) - - Firebase/CoreOnly (10.22.0): - - FirebaseCore (= 10.22.0) - - Firebase/DynamicLinks (10.22.0): + - FirebaseAuth (~> 10.25.0) + - Firebase/CoreOnly (10.25.0): + - FirebaseCore (= 10.25.0) + - Firebase/DynamicLinks (10.25.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (~> 10.22.0) - - Firebase/Messaging (10.22.0): + - FirebaseDynamicLinks (~> 10.25.0) + - Firebase/Messaging (10.25.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.22.0) - - firebase_auth (4.17.7): - - Firebase/Auth (= 10.22.0) + - FirebaseMessaging (~> 10.25.0) + - firebase_auth (4.20.0): + - Firebase/Auth (= 10.25.0) - firebase_core - Flutter - - firebase_core (2.26.0): - - Firebase/CoreOnly (= 10.22.0) + - firebase_core (2.32.0): + - Firebase/CoreOnly (= 10.25.0) - Flutter - - firebase_dynamic_links (5.4.14): - - Firebase/DynamicLinks (= 10.22.0) + - firebase_dynamic_links (5.5.7): + - Firebase/DynamicLinks (= 10.25.0) - firebase_core - Flutter - - firebase_messaging (14.7.18): - - Firebase/Messaging (= 10.22.0) + - firebase_messaging (14.9.4): + - Firebase/Messaging (= 10.25.0) - firebase_core - Flutter - - FirebaseAppCheckInterop (10.25.0) - - FirebaseAuth (10.22.0): + - FirebaseAppCheckInterop (10.29.0) + - FirebaseAuth (10.25.0): - FirebaseAppCheckInterop (~> 10.17) - FirebaseCore (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/Environment (~> 7.8) - GTMSessionFetcher/Core (< 4.0, >= 2.1) - RecaptchaInterop (~> 100.0) - - FirebaseCore (10.22.0): + - FirebaseCore (10.25.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.25.0): + - FirebaseCoreInternal (10.29.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseDynamicLinks (10.22.0): + - FirebaseDynamicLinks (10.25.0): - FirebaseCore (~> 10.0) - - FirebaseInstallations (10.25.0): + - FirebaseInstallations (10.29.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.22.0): + - FirebaseMessaging (10.25.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.3) @@ -117,8 +117,8 @@ PODS: - Flutter (1.0.0) - flutter_app_badger (1.3.0): - Flutter - - flutter_facebook_auth (6.0.4): - - FBSDKLoginKit (~> 16.3.1) + - flutter_facebook_auth (6.2.0): + - FBSDKLoginKit (~> 17.0.0) - Flutter - flutter_image_compress_common (1.0.0): - Flutter @@ -135,13 +135,12 @@ PODS: - fluttertoast (0.0.2): - Flutter - Toast - - FMDB (2.7.10): - - FMDB/standard (= 2.7.10) - - FMDB/standard (2.7.10) - google_sign_in_ios (0.0.1): + - AppAuth (>= 1.7.4) - Flutter - FlutterMacOS - - GoogleSignIn (~> 7.0) + - GoogleSignIn (~> 7.1) + - GTMSessionFetcher (>= 3.4.0) - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30911.0, >= 2.30908.0) @@ -178,7 +177,11 @@ PODS: - GTMAppAuth (4.1.1): - AppAuth/Core (~> 1.7) - GTMSessionFetcher/Core (< 4.0, >= 3.3) - - GTMSessionFetcher/Core (3.4.1) + - GTMSessionFetcher (3.5.0): + - GTMSessionFetcher/Full (= 3.5.0) + - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Full (3.5.0): + - GTMSessionFetcher/Core - just_audio (0.0.1): - Flutter - libwebp (1.3.2): @@ -207,23 +210,23 @@ PODS: - Flutter - FlutterMacOS - PromisesObjC (2.4.0) - - ReachabilitySwift (5.2.2) + - ReachabilitySwift (5.2.4) - RecaptchaInterop (100.0.0) - record_darwin (1.0.0): - Flutter - FlutterMacOS - - SDWebImage (5.19.2): - - SDWebImage/Core (= 5.19.2) - - SDWebImage/Core (5.19.2) + - SDWebImage (5.19.7): + - SDWebImage/Core (= 5.19.7) + - SDWebImage/Core (5.19.7) - SDWebImageWebPCoder (0.14.6): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqflite (0.0.3): + - sqflite_darwin (0.0.4): - Flutter - - FMDB (>= 2.7.5) + - FlutterMacOS - SwiftyGif (5.4.5) - Toast (4.1.1) - url_launcher_ios (0.0.1): @@ -258,7 +261,7 @@ DEPENDENCIES: - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - record_darwin (from `.symlinks/plugins/record_darwin/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - sqflite (from `.symlinks/plugins/sqflite/ios`) + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) @@ -279,7 +282,6 @@ SPEC REPOS: - FirebaseDynamicLinks - FirebaseInstallations - FirebaseMessaging - - FMDB - GoogleDataTransport - GoogleSignIn - GoogleUtilities @@ -346,8 +348,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/record_darwin/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - sqflite: - :path: ".symlinks/plugins/sqflite/ios" + sqflite_darwin: + :path: ".symlinks/plugins/sqflite_darwin/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" video_player_avfoundation: @@ -355,63 +357,62 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa - audio_session: 4f3e461722055d21515cf3261b64c973c062f345 + audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207 connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d desktop_webview_auth: d645139460ef203d50bd0cdb33356785dd939cce device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 emoji_picker_flutter: fe2e6151c5b548e975d546e6eeb567daf0962a58 - FBAEMKit: 6c7b5eb77c96861bb59e040842c6e55bf39512ce - FBSDKCoreKit: 5e4dd478947ab1bcc887e8cfadeae0727af1a942 - FBSDKCoreKit_Basics: cd7b5f5d1e8868c26706917919d058999ca672c3 - FBSDKLoginKit: 572cca0bc6c90067ef197187697cb3b584310c52 + FBAEMKit: 9900b2edd99a2d21629a6277e6166f14c6215799 + FBSDKCoreKit: 0791f8f68a8630931a4c12aa23a56cc021551596 + FBSDKCoreKit_Basics: 46d6b472c0dd0a5a7e972c025033d1c567f54eb4 + FBSDKLoginKit: b4a4eba1d62eb452544411824f41689adabd5bd2 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71 - firebase_auth: cd5d79ba9a9a81151066d75f7cc8f6e698e33ed9 - firebase_core: 8e100adc478919c6f3224f854ce8fa0bd98e36fd - firebase_dynamic_links: 1452b366a97f0cebdde5fe7a8745a418f83a4078 - firebase_messaging: e41899318940eb03dd3d97f1c04de128019f92d6 - FirebaseAppCheckInterop: 5da5ce93e8797a215e3f677fb0654b74e736c8b8 - FirebaseAuth: bbe4c68f958504ba9e54aee181adbdf5b664fbc6 - FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7 - FirebaseCoreInternal: 910a81992c33715fec9263ca7381d59ab3a750b7 - FirebaseDynamicLinks: 25ed0e87b0afb4769cc0ec8e942a532219abac28 - FirebaseInstallations: 91950fe859846fff0fbd296180909dd273103b09 - FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e + Firebase: 0312a2352584f782ea56f66d91606891d4607f06 + firebase_auth: 5719ddc9f654b813405899480e84971bd8e61235 + firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197 + firebase_dynamic_links: 525e9c1b702d2ed2d9b0dbd342eee1e15a75e62d + firebase_messaging: 06391e8f35dc65a00c56580266285263d2861f10 + FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07 + FirebaseAuth: c0f93dcc570c9da2bffb576969d793e95c344fbb + FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483 + FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 + FirebaseDynamicLinks: 12c9f5b643943e0565ed28080373f89cbcb914a3 + FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd + FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f - flutter_facebook_auth: c8700ab1770f3d8e5e7456220e4f3bbcdb831454 + flutter_facebook_auth: 66188df7905bfcaf3d6d2bd6527302c56448f04d flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 - flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be + flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 flutter_webrtc: 55df3aaa802114dad390191a46c2c8d535751268 - fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265 - FMDB: eae540775bf7d0c87a5af926ae37af69effe5a19 - google_sign_in_ios: 989eea5abe94af62050782714daf920be883d4a2 + fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c + google_sign_in_ios: 07375bfbf2620bc93a602c0e27160d6afc6ead38 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de - GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d nanopb: 438bc412db1928dac798aa6fd75726007be04262 package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - ReachabilitySwift: 2128f3a8c9107e1ad33574c6e58e8285d460b149 + ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517 - SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a + record_darwin: df0a677188e5fed18472550298e675f19ddaffbe + SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3 SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c - sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 - video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1 + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 WebRTC-SDK: c24d2a6c9f571f2ed42297cb8ffba9557093142b PODFILE CHECKSUM: 9c28636aa709ae55d3db5f155702165fe9df39b6 diff --git a/chat_sample/ios/Runner.xcodeproj/project.pbxproj b/chat_sample/ios/Runner.xcodeproj/project.pbxproj index 8b730f8..3ecb01c 100644 --- a/chat_sample/ios/Runner.xcodeproj/project.pbxproj +++ b/chat_sample/ios/Runner.xcodeproj/project.pbxproj @@ -272,10 +272,12 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/firebase_messaging/firebase_messaging_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/google_sign_in_ios/google_sign_in_ios_privacy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/firebase_messaging_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_sign_in_ios_privacy.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -293,7 +295,6 @@ "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework", "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework", "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework", - "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", "${BUILT_PRODUCTS_DIR}/FirebaseAppCheckInterop/FirebaseAppCheckInterop.framework", "${BUILT_PRODUCTS_DIR}/FirebaseAuth/FirebaseAuth.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", @@ -333,7 +334,7 @@ "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", "${BUILT_PRODUCTS_DIR}/record_darwin/record_darwin.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework", - "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", + "${BUILT_PRODUCTS_DIR}/sqflite_darwin/sqflite_darwin.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework", "${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit/FBAEMKit.framework/FBAEMKit", @@ -347,7 +348,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAppCheckInterop.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuth.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", @@ -387,7 +387,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/record_darwin.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite_darwin.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBAEMKit.framework", @@ -490,6 +490,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/ChatSample.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -631,6 +632,7 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/ChatSample.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -667,6 +669,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/ChatSample.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; diff --git a/chat_sample/pubspec.yaml b/chat_sample/pubspec.yaml index 443cd99..66fbd27 100644 --- a/chat_sample/pubspec.yaml +++ b/chat_sample/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: emoji_picker_flutter: ^2.1.0 firebase_core: ^2.25.4 firebase_messaging: ^14.7.16 - flutter_local_notifications: ^16.3.2 + flutter_local_notifications: ^17.2.3 connectivity_plus: ^5.0.2 logging: ^1.0.2 universal_io: ^2.2.0 diff --git a/conf_call_sample/android/app/build.gradle b/conf_call_sample/android/app/build.gradle index 960c19e..06c70f6 100644 --- a/conf_call_sample/android/app/build.gradle +++ b/conf_call_sample/android/app/build.gradle @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "com.connectycube.flutter.conference_call_sample" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/conf_call_sample/ios/Podfile b/conf_call_sample/ios/Podfile index 2c068c4..0c985a2 100644 --- a/conf_call_sample/ios/Podfile +++ b/conf_call_sample/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '13.4' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/conf_call_sample/ios/Podfile.lock b/conf_call_sample/ios/Podfile.lock index e9ab0f3..3aa1b79 100644 --- a/conf_call_sample/ios/Podfile.lock +++ b/conf_call_sample/ios/Podfile.lock @@ -8,20 +8,20 @@ PODS: - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) - - flutter_webrtc (0.9.36): + - flutter_webrtc (0.11.3): - Flutter - - WebRTC-SDK (= 114.5735.10) + - WebRTC-SDK (= 125.6422.04) - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - WebRTC-SDK (114.5735.10) + - WebRTC-SDK (125.6422.04) DEPENDENCIES: - assets_audio_player (from `.symlinks/plugins/assets_audio_player/ios`) @@ -67,13 +67,13 @@ SPEC CHECKSUMS: connectycube_flutter_call_kit: 4a95d2e8b248ed78fe9d805c8550b2120b19b2b7 device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_webrtc: b33475c3a57d59ff05bf87b4f5d3feceac63f291 - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - WebRTC-SDK: 8c0edd05b880a39648118192c252667ea06dea51 + flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3 -PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 +PODFILE CHECKSUM: eb179eda02c4d9ce45db6b1912a419962f739320 COCOAPODS: 1.15.2 diff --git a/conf_call_sample/ios/Runner.xcodeproj/project.pbxproj b/conf_call_sample/ios/Runner.xcodeproj/project.pbxproj index 3196569..2fa9ebc 100644 --- a/conf_call_sample/ios/Runner.xcodeproj/project.pbxproj +++ b/conf_call_sample/ios/Runner.xcodeproj/project.pbxproj @@ -215,6 +215,7 @@ 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + CFF108843C2BBD87A369711F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -250,7 +251,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1340; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -393,6 +394,24 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + CFF108843C2BBD87A369711F /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/permission_handler_apple/permission_handler_apple_privacy.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/permission_handler_apple_privacy.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -515,7 +534,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -657,7 +676,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -694,7 +713,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/conf_call_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/conf_call_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 57081d2..284fa85 100644 --- a/conf_call_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/conf_call_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ initForegroundService() async { const androidConfig = FlutterBackgroundAndroidConfig( notificationTitle: 'Conference Calls sample', notificationText: 'Screen sharing is in progress', - notificationImportance: AndroidNotificationImportance.Default, + notificationImportance: AndroidNotificationImportance.normal, notificationIcon: AndroidResource(name: 'ic_launcher_foreground', defType: 'drawable'), ); diff --git a/conf_call_sample/pubspec.yaml b/conf_call_sample/pubspec.yaml index 3efd8fb..734a255 100644 --- a/conf_call_sample/pubspec.yaml +++ b/conf_call_sample/pubspec.yaml @@ -20,12 +20,13 @@ dependencies: device_info_plus: ^10.1.0 flutter_background: ^1.2.0 flutter_speed_dial: ^7.0.0 - package_info_plus: ^5.0.0 + package_info_plus: ^8.0.3 permission_handler: ^11.0.1 shared_preferences: ^2.2.1 universal_io: ^2.2.2 uuid: ^3.0.7 web_browser_detect: ^2.0.3 + firebase_core: ^3.6.0 dependency_overrides: uuid: ^4.3.3 diff --git a/conf_call_sample/windows/flutter/generated_plugin_registrant.cc b/conf_call_sample/windows/flutter/generated_plugin_registrant.cc index d5acadb..fcff77c 100644 --- a/conf_call_sample/windows/flutter/generated_plugin_registrant.cc +++ b/conf_call_sample/windows/flutter/generated_plugin_registrant.cc @@ -6,10 +6,13 @@ #include "generated_plugin_registrant.h" +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + FirebaseCorePluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); FlutterWebRTCPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterWebRTCPlugin")); PermissionHandlerWindowsPluginRegisterWithRegistrar( diff --git a/p2p_call_sample/android/app/build.gradle b/p2p_call_sample/android/app/build.gradle index 91325fd..849888f 100644 --- a/p2p_call_sample/android/app/build.gradle +++ b/p2p_call_sample/android/app/build.gradle @@ -24,7 +24,7 @@ if (flutterVersionName == null) { } android { - compileSdkVersion 33 + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,8 +36,8 @@ android { defaultConfig { applicationId "com.connectycube.flutter.p2p_call_sample" - minSdkVersion 21 - targetSdkVersion 33 + minSdkVersion 23 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/p2p_call_sample/android/gradle.properties b/p2p_call_sample/android/gradle.properties index 95c4094..1e80114 100644 --- a/p2p_call_sample/android/gradle.properties +++ b/p2p_call_sample/android/gradle.properties @@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx4608m android.enableR8=true android.useAndroidX=true android.enableJetifier=true -kotlinVersion=1.6.10 +kotlinVersion=1.9.20 agpVersion=7.3.1 diff --git a/p2p_call_sample/ios/Podfile.lock b/p2p_call_sample/ios/Podfile.lock index 7d5423b..06d2d6b 100644 --- a/p2p_call_sample/ios/Podfile.lock +++ b/p2p_call_sample/ios/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - connectycube_flutter_call_kit (2.3.0): + - connectycube_flutter_call_kit (2.7.0): - Flutter - device_info_plus (0.0.1): - Flutter @@ -12,7 +12,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.0.4): + - permission_handler_apple (9.1.1): - Flutter - shared_preferences_foundation (0.0.1): - Flutter @@ -52,14 +52,14 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" SPEC CHECKSUMS: - connectycube_flutter_call_kit: e1e6bcf89ce9b3f1e7a0fdd70e9471260fc222ef + connectycube_flutter_call_kit: 4a95d2e8b248ed78fe9d805c8550b2120b19b2b7 device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_webrtc: 55df3aaa802114dad390191a46c2c8d535751268 - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 WebRTC-SDK: c24d2a6c9f571f2ed42297cb8ffba9557093142b PODFILE CHECKSUM: 224db57c994899197e5621d18ed5dddd6708b975 diff --git a/p2p_call_sample/macos/Flutter/GeneratedPluginRegistrant.swift b/p2p_call_sample/macos/Flutter/GeneratedPluginRegistrant.swift index 22ece1a..5984b3f 100644 --- a/p2p_call_sample/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/p2p_call_sample/macos/Flutter/GeneratedPluginRegistrant.swift @@ -14,7 +14,7 @@ import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FlutterWebRTCPlugin.register(with: registry.registrar(forPlugin: "FlutterWebRTCPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/p2p_call_sample/macos/Podfile.lock b/p2p_call_sample/macos/Podfile.lock index 129d8a4..0ae8369 100644 --- a/p2p_call_sample/macos/Podfile.lock +++ b/p2p_call_sample/macos/Podfile.lock @@ -46,8 +46,8 @@ SPEC CHECKSUMS: flutter_webrtc: cf7dc44d26cbb5c5f1ae5f583dab545871f287f9 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 WebRTC-SDK: c24d2a6c9f571f2ed42297cb8ffba9557093142b PODFILE CHECKSUM: 0095aabf5a2ba4b7b30669b8afaa68ef378ace64 diff --git a/p2p_call_sample/macos/Runner.xcodeproj/project.pbxproj b/p2p_call_sample/macos/Runner.xcodeproj/project.pbxproj index a919474..c3a321a 100644 --- a/p2p_call_sample/macos/Runner.xcodeproj/project.pbxproj +++ b/p2p_call_sample/macos/Runner.xcodeproj/project.pbxproj @@ -202,7 +202,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { diff --git a/p2p_call_sample/macos/Runner/AppDelegate.swift b/p2p_call_sample/macos/Runner/AppDelegate.swift index d53ef64..8e02df2 100644 --- a/p2p_call_sample/macos/Runner/AppDelegate.swift +++ b/p2p_call_sample/macos/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true