From be4e6f32eb4bec51b421b7b5fc9b39aa6b2ed882 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Mon, 20 May 2019 20:10:50 +0200 Subject: [PATCH] ios update The Podfile and lockfile have all changed since the dependnecies have changed so much (because of the AndroidX update). I've had to comment out the flutter_email_sender for now, since I just cannot seem to get it to work, in fact, even the current build is a hit and miss. --- ios/Podfile | 3 + ios/Podfile.lock | 92 +++++++++++++++------------- ios/Runner.xcodeproj/project.pbxproj | 24 ++++++-- 3 files changed, 71 insertions(+), 48 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index d077b08b..ae21c97a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -33,6 +33,8 @@ def parse_KV_file(file, separator='=') end target 'Runner' do + use_frameworks! + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock # referring to absolute paths on developers' machines. system('rm -rf .symlinks') @@ -64,6 +66,7 @@ post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| config.build_settings['ENABLE_BITCODE'] = 'NO' + config.build_settings['SWIFT_VERSION'] = '3.2' end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 766ecbdd..2f3df6ca 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,60 +1,64 @@ PODS: - - Crashlytics (3.12.0): - - Fabric (~> 1.9.0) + - Crashlytics (3.13.1): + - Fabric (~> 1.10.1) - device_info (0.0.1): - Flutter - - Fabric (1.9.0) - - Firebase/Core (5.16.0): + - Fabric (1.10.1) + - Firebase/Analytics (6.0.0): + - Firebase/Core + - Firebase/Core (6.0.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 5.5.0) - - Firebase/CoreOnly (5.16.0): - - FirebaseCore (= 5.2.0) + - FirebaseAnalytics (= 6.0.0) + - Firebase/CoreOnly (6.0.0): + - FirebaseCore (= 6.0.0) - firebase_analytics (0.0.1): + - Firebase/Analytics (~> 6.0) - Firebase/Core - Flutter - - FirebaseAnalytics (5.5.0): - - FirebaseCore (~> 5.2) - - FirebaseInstanceID (~> 3.4) - - GoogleAppMeasurement (= 5.5.0) - - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - - GoogleUtilities/MethodSwizzler (~> 5.2) - - GoogleUtilities/Network (~> 5.2) - - "GoogleUtilities/NSData+zlib (~> 5.2)" + - FirebaseAnalytics (6.0.0): + - FirebaseCore (~> 6.0) + - FirebaseInstanceID (~> 4.0) + - GoogleAppMeasurement (= 6.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/MethodSwizzler (~> 6.0) + - GoogleUtilities/Network (~> 6.0) + - "GoogleUtilities/NSData+zlib (~> 6.0)" - nanopb (~> 0.3) - - FirebaseCore (5.2.0): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseInstanceID (3.4.0): - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.3) - - GoogleUtilities/UserDefaults (~> 5.3) + - FirebaseCore (6.0.0): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseInstanceID (4.0.0): + - FirebaseCore (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/UserDefaults (~> 6.0) - Flutter (1.0.0) - flutter_crashlytics (0.0.1): - Crashlytics - Fabric - Flutter - - GoogleAppMeasurement (5.5.0): - - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - - GoogleUtilities/MethodSwizzler (~> 5.2) - - GoogleUtilities/Network (~> 5.2) - - "GoogleUtilities/NSData+zlib (~> 5.2)" + - GoogleAppMeasurement (6.0.0): + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/MethodSwizzler (~> 6.0) + - GoogleUtilities/Network (~> 6.0) + - "GoogleUtilities/NSData+zlib (~> 6.0)" - nanopb (~> 0.3) - - GoogleUtilities/AppDelegateSwizzler (5.3.7): + - GoogleUtilities/AppDelegateSwizzler (6.1.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (5.3.7) - - GoogleUtilities/Logger (5.3.7): + - GoogleUtilities/Environment (6.1.0) + - GoogleUtilities/Logger (6.1.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (5.3.7): + - GoogleUtilities/MethodSwizzler (6.1.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (5.3.7): + - GoogleUtilities/Network (6.1.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (5.3.7)" - - GoogleUtilities/Reachability (5.3.7): + - "GoogleUtilities/NSData+zlib (6.1.0)" + - GoogleUtilities/Reachability (6.1.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (5.3.7): + - GoogleUtilities/UserDefaults (6.1.0): - GoogleUtilities/Logger - launch_review (0.0.1): - Flutter @@ -116,18 +120,18 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher/ios" SPEC CHECKSUMS: - Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933 + Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0 device_info: 3ebad48f726348f69abd802f3334a8d1ed795fbd - Fabric: f988e33c97f08930a413e08123064d2e5f68d655 - Firebase: 749a8ff4962f9d8c79dda1966de20f6f77583d67 - firebase_analytics: bd50d8f5d3f42dcab6da67944a849062470b0a19 - FirebaseAnalytics: d35d47c03c50c73c14a7fd31463c5775843e78a9 - FirebaseCore: ea2d1816723ef21492b8e9113303e1350db5e08c - FirebaseInstanceID: 97ea7a5dca9afd72c79bfcdddb7a44aa1cbb42a1 + Fabric: f6f21452846788bb44595d73e9909d79d328e617 + Firebase: fa80b9d987ca014a1ba9357496ef2a0178b28b12 + firebase_analytics: e5181dde3c26c83748ab07aca073139a572ede7e + FirebaseAnalytics: 1743c5f4de3687d0745709dfdc4b1dea1484f44c + FirebaseCore: e38f025287b413255a53acc1945d048a112047f7 + FirebaseInstanceID: 0e0348a3c00a734fa376a070f5ad4533ad975cb5 Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a flutter_crashlytics: 7b5bba7233066381c8e18343435342ba05f3053c - GoogleAppMeasurement: 621f3bc6211d5ba548debe01fafad30cf5ab6859 - GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0 + GoogleAppMeasurement: 7f028ea162b72c8f326daec74afc95d94f7a47d6 + GoogleUtilities: 84df567c76ca84f67b7bb40e769fdd4acc746a10 launch_review: 75d5a956ba8eaa493e9c9d4bf4c05e505e8d5ed0 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 package_info: 78cabb3c322943c55d39676f4a5bfc748c01d055 @@ -135,6 +139,6 @@ SPEC CHECKSUMS: shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523 url_launcher: 0067ddb8f10d36786672aa0722a21717dba3a298 -PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09 +PODFILE CHECKSUM: c7ea44de13b9d22541bedd655230401732eff1bd COCOAPODS: 1.6.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 844f5417..110d98b1 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 76DA9F81F4DB4D40650AF76A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 447133BD92E4ED5413FD5D21 /* libPods-Runner.a */; }; 7AD6EE48228EC97800E098B2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7AD6EE47228EC97800E098B2 /* GoogleService-Info.plist */; }; 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -22,6 +21,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + FE285D07BE0A9C8A29B852BB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38B87A486DD982B0932A6EF /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -44,7 +44,6 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; - 447133BD92E4ED5413FD5D21 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7AD6EE47228EC97800E098B2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -60,6 +59,7 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A9225FBC9E23B3C097530BBF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D38B87A486DD982B0932A6EF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -69,7 +69,7 @@ files = ( 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, - 76DA9F81F4DB4D40650AF76A /* libPods-Runner.a in Frameworks */, + FE285D07BE0A9C8A29B852BB /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -88,7 +88,7 @@ 889961847ACA832709E9B420 /* Frameworks */ = { isa = PBXGroup; children = ( - 447133BD92E4ED5413FD5D21 /* libPods-Runner.a */, + D38B87A486DD982B0932A6EF /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -286,12 +286,28 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework", + "${BUILT_PRODUCTS_DIR}/launch_review/launch_review.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework", + "${BUILT_PRODUCTS_DIR}/share/share.framework", + "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", + "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( ); outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/launch_review.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh;