From fa94743087d7bac37da0bade71332cd4c4acf5f2 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Fri, 31 Jan 2020 13:50:15 -0800 Subject: [PATCH 1/3] Removing BITCODE turnoffs --- veggieseasons/ios/Podfile | 8 -------- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 3 --- 2 files changed, 11 deletions(-) diff --git a/veggieseasons/ios/Podfile b/veggieseasons/ios/Podfile index 0ee4a537885..d0d1d3e14f6 100644 --- a/veggieseasons/ios/Podfile +++ b/veggieseasons/ios/Podfile @@ -80,11 +80,3 @@ end # Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system. install! 'cocoapods', :disable_input_output_paths => true - -post_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['ENABLE_BITCODE'] = 'NO' - end - end -end diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index fa73ab6709c..d1f0c7f29aa 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -375,7 +375,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -509,7 +508,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -536,7 +534,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", From df28550f9802120f34796e445b8724395e30ba14 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Fri, 31 Jan 2020 14:17:42 -0800 Subject: [PATCH 2/3] Updated for Bitcode, new version. --- veggieseasons/ios/Podfile.lock | 2 +- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 10 ++++++---- veggieseasons/ios/Runner/Info.plist | 4 ++-- veggieseasons/pubspec.lock | 8 ++++---- veggieseasons/pubspec.yaml | 10 +++++----- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/veggieseasons/ios/Podfile.lock b/veggieseasons/ios/Podfile.lock index c54e8f0198e..08d675f2498 100644 --- a/veggieseasons/ios/Podfile.lock +++ b/veggieseasons/ios/Podfile.lock @@ -29,6 +29,6 @@ SPEC CHECKSUMS: shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 -PODFILE CHECKSUM: 083258d7f5e80b42ea9bfee905fe93049bc04c64 +PODFILE CHECKSUM: 75bff59e97643485829cfc01124f2ea710a554fc COCOAPODS: 1.8.4 diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index d1f0c7f29aa..3099fc1338d 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -86,7 +86,6 @@ 4AD930A692F4F8E268DBD0A5 /* Pods-Runner.release.xcconfig */, FA5155759DF040A4C0CC04E0 /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -374,7 +373,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -385,6 +384,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); + MARKETING_VERSION = 1.2.0; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -507,7 +507,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -518,6 +518,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); + MARKETING_VERSION = 1.2.0; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -533,7 +534,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -544,6 +545,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); + MARKETING_VERSION = 1.2.0; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.VeggieSeasons; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/veggieseasons/ios/Runner/Info.plist b/veggieseasons/ios/Runner/Info.plist index 1deff7e5aa0..79c219c0dae 100644 --- a/veggieseasons/ios/Runner/Info.plist +++ b/veggieseasons/ios/Runner/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.1 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion - 7 + $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/veggieseasons/pubspec.lock b/veggieseasons/pubspec.lock index 83197b2fe12..b10010783b1 100644 --- a/veggieseasons/pubspec.lock +++ b/veggieseasons/pubspec.lock @@ -106,7 +106,7 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.15.8" + version: "0.16.1" matcher: dependency: transitive description: @@ -162,14 +162,14 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.6" + version: "0.5.6+1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+3" + version: "0.0.1+4" shared_preferences_platform_interface: dependency: transitive description: @@ -183,7 +183,7 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.2+2" + version: "0.1.2+3" sky_engine: dependency: transitive description: flutter diff --git a/veggieseasons/pubspec.yaml b/veggieseasons/pubspec.yaml index e40dd7426d0..bf3c34b8dcb 100644 --- a/veggieseasons/pubspec.yaml +++ b/veggieseasons/pubspec.yaml @@ -1,7 +1,7 @@ name: veggieseasons description: An iOS app that shows the fruits and veggies currently in season. -version: 1.1.0 +version: 1.2.0 environment: sdk: ">=2.5.0 <3.0.0" @@ -10,17 +10,17 @@ dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.2 + cupertino_icons: ^0.1.3 font_awesome_flutter: ^8.5.0 - intl: ^0.15.8 + intl: ^0.16.1 scoped_model: ^1.0.1 - shared_preferences: ^0.5.3+4 + shared_preferences: ^0.5.6+1 dev_dependencies: flutter_test: sdk: flutter pedantic: ^1.8.0 - flutter_launcher_icons: ^0.7.2+1 + flutter_launcher_icons: ^0.7.4 flutter: From 65a73a333654e756e93f89ef95807679d7a76bd8 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Fri, 31 Jan 2020 14:18:11 -0800 Subject: [PATCH 3/3] Adding xcshareddata --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 veggieseasons/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/veggieseasons/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/veggieseasons/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000000..18d981003d6 --- /dev/null +++ b/veggieseasons/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +