From 788fbe9ef04438d9a576077234041b2935b33fd3 Mon Sep 17 00:00:00 2001 From: falcon Date: Sat, 26 May 2018 11:11:41 +0800 Subject: [PATCH 1/2] fixing some compile configs for ios: replace Podfile, see:https://github.com/flutter/flutter/issues/16036\#issuecomment-380712094 --- .gitignore | 1 + ios/Flutter/AppFrameworkInfo.plist | 50 ++++++++-------- ios/Podfile | 15 ++--- ios/Podfile.lock | 32 +++++----- ios/Podfile.unlock | 47 +++++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 59 +++++++++---------- .../xcshareddata/xcschemes/Runner.xcscheme | 4 +- ios/Runner/Info.plist | 4 +- 8 files changed, 130 insertions(+), 82 deletions(-) create mode 100644 ios/Podfile.unlock diff --git a/.gitignore b/.gitignore index a03e2bf..76de7d4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ build/ ios/.generated/ packages .flutter-plugins +ios/.symlinks/ diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 6c2de80..36ed68f 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -2,29 +2,31 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - UIRequiredDeviceCapabilities - - arm64 - - MinimumOSVersion - 8.0 + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + LSApplicationCategoryType + + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + UIRequiredDeviceCapabilities + + arm64 + + MinimumOSVersion + 8.0 diff --git a/ios/Podfile b/ios/Podfile index cdaa7b5..2dfb501 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -27,11 +27,12 @@ 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 Pods/.symlinks') - system('mkdir -p Pods/.symlinks/flutter') - system('mkdir -p Pods/.symlinks/plugins') + system('rm -rf .symlinks') + system('mkdir -p .symlinks/plugins') # Flutter Pods generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig') @@ -40,16 +41,16 @@ target 'Runner' do end generated_xcode_build_settings.map { |p| if p[:name] == 'FLUTTER_FRAMEWORK_DIR' - symlink = File.join('Pods', '.symlinks', 'flutter', File.basename(p[:path])) - File.symlink(p[:path], symlink) - pod 'Flutter', :path => symlink + symlink = File.join('.symlinks', 'flutter') + File.symlink(File.dirname(p[:path]), symlink) + pod 'Flutter', :path => File.join(symlink, File.basename(p[:path])) end } # Plugin Pods plugin_pods = parse_KV_file('../.flutter-plugins') plugin_pods.map { |p| - symlink = File.join('Pods', '.symlinks', 'plugins', File.basename(p[:path])) + symlink = File.join('.symlinks', 'plugins', p[:name]) File.symlink(p[:path], symlink) pod p[:name], :path => File.join(symlink, 'ios') } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9d0b737..d551fb5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -7,37 +7,41 @@ PODS: - Flutter - image_picker (0.0.1): - Flutter - - MTBBarcodeScanner (5.0.3) + - MTBBarcodeScanner (5.0.5) - shared_preferences (0.0.1): - Flutter DEPENDENCIES: - - barcode_scan (from `Pods/.symlinks/plugins/barcode_scan-0.0.4/ios`) - - Flutter (from `Pods/.symlinks/flutter/ios`) - - flutter_webview_plugin (from `Pods/.symlinks/plugins/flutter_webview_plugin-0.1.5/ios`) - - image_picker (from `Pods/.symlinks/plugins/image_picker-0.4.1/ios`) - - shared_preferences (from `Pods/.symlinks/plugins/shared_preferences-0.4.1/ios`) + - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`) + - Flutter (from `.symlinks/flutter/ios-release`) + - flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`) + - image_picker (from `.symlinks/plugins/image_picker/ios`) + - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - MTBBarcodeScanner EXTERNAL SOURCES: barcode_scan: - :path: Pods/.symlinks/plugins/barcode_scan-0.0.4/ios + :path: ".symlinks/plugins/barcode_scan/ios" Flutter: - :path: Pods/.symlinks/flutter/ios + :path: ".symlinks/flutter/ios-release" flutter_webview_plugin: - :path: Pods/.symlinks/plugins/flutter_webview_plugin-0.1.5/ios + :path: ".symlinks/plugins/flutter_webview_plugin/ios" image_picker: - :path: Pods/.symlinks/plugins/image_picker-0.4.1/ios + :path: ".symlinks/plugins/image_picker/ios" shared_preferences: - :path: Pods/.symlinks/plugins/shared_preferences-0.4.1/ios + :path: ".symlinks/plugins/shared_preferences/ios" SPEC CHECKSUMS: barcode_scan: 8288e70cb430072003bce2c794a1431e7adbcb4d Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296 flutter_webview_plugin: 116575b48572029304775b768e9f15ebfc316274 image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22 - MTBBarcodeScanner: 3ce0f1b0085ef00c726ded663c490a63b29c9aa5 + MTBBarcodeScanner: 3ac7b553d6bf740e7dc281d9a547962f7aea7abc shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53 -PODFILE CHECKSUM: 0420ab312a523ae0eecfb1fc19ea51dd82cc17c7 +PODFILE CHECKSUM: 7765ea4305eaab0b3dfd384c7de11902aa3195fd -COCOAPODS: 1.4.0 +COCOAPODS: 1.5.2 diff --git a/ios/Podfile.unlock b/ios/Podfile.unlock new file mode 100644 index 0000000..2416fc7 --- /dev/null +++ b/ios/Podfile.unlock @@ -0,0 +1,47 @@ +PODS: + - barcode_scan (0.0.1): + - Flutter + - MTBBarcodeScanner + - Flutter (1.0.0) + - flutter_webview_plugin (0.0.1): + - Flutter + - image_picker (0.0.1): + - Flutter + - MTBBarcodeScanner (5.0.3) + - shared_preferences (0.0.1): + - Flutter + +DEPENDENCIES: + - barcode_scan (from `Pods/.symlinks/plugins/barcode_scan-0.0.4/ios`) + - Flutter (from `Pods/.symlinks/flutter/ios-release`) + - flutter_webview_plugin (from `Pods/.symlinks/plugins/flutter_webview_plugin-0.1.5/ios`) + - image_picker (from `Pods/.symlinks/plugins/image_picker-0.4.1/ios`) + - shared_preferences (from `Pods/.symlinks/plugins/shared_preferences-0.4.1/ios`) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - MTBBarcodeScanner + +EXTERNAL SOURCES: + barcode_scan: + :path: Pods/.symlinks/plugins/barcode_scan-0.0.4/ios + Flutter: + :path: Pods/.symlinks/flutter/ios-release + flutter_webview_plugin: + :path: Pods/.symlinks/plugins/flutter_webview_plugin-0.1.5/ios + image_picker: + :path: Pods/.symlinks/plugins/image_picker-0.4.1/ios + shared_preferences: + :path: Pods/.symlinks/plugins/shared_preferences-0.4.1/ios + +SPEC CHECKSUMS: + barcode_scan: 8288e70cb430072003bce2c794a1431e7adbcb4d + Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296 + flutter_webview_plugin: 116575b48572029304775b768e9f15ebfc316274 + image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22 + MTBBarcodeScanner: 3ce0f1b0085ef00c726ded663c490a63b29c9aa5 + shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53 + +PODFILE CHECKSUM: 0420ab312a523ae0eecfb1fc19ea51dd82cc17c7 + +COCOAPODS: 1.5.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 52fec4d..8230c55 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -8,15 +8,13 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 14A83676C391AC36427B63A0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18A2A3B7495B1E72386D325C /* Pods_Runner.framework */; }; 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; 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, ); }; }; - 3DA7398CC72B9502A6487818 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A76C67F34294A5394A28AA2 /* libPods-Runner.a */; }; 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, ); }; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; - 9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -42,10 +40,10 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 18A2A3B7495B1E72386D325C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 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 = ""; }; - 7A76C67F34294A5394A28AA2 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -67,7 +65,7 @@ files = ( 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, - 3DA7398CC72B9502A6487818 /* libPods-Runner.a in Frameworks */, + 14A83676C391AC36427B63A0 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -77,7 +75,7 @@ 679DFEC57AAEE018A879FB45 /* Frameworks */ = { isa = PBXGroup; children = ( - 7A76C67F34294A5394A28AA2 /* libPods-Runner.a */, + 18A2A3B7495B1E72386D325C /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -160,8 +158,7 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - DE200995FE174678B272AF41 /* [CP] Embed Pods Frameworks */, - 5D3460E55EE5FFDC5B589FFF /* [CP] Copy Pods Resources */, + A41DFE809CA4E7E116405799 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -178,11 +175,12 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0910; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = VXCG3762N6; }; }; }; @@ -210,9 +208,7 @@ buildActionMask = 2147483647; files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, @@ -254,21 +250,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 5D3460E55EE5FFDC5B589FFF /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -283,18 +264,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - DE200995FE174678B272AF41 /* [CP] Embed Pods Frameworks */ = { + A41DFE809CA4E7E116405799 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework", + "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework", + "${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework", + "${BUILT_PRODUCTS_DIR}/barcode_scan/barcode_scan.framework", + "${BUILT_PRODUCTS_DIR}/flutter_webview_plugin/flutter_webview_plugin.framework", + "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework", + "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_webview_plugin.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -350,12 +341,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -404,12 +397,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -442,8 +437,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { - ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = VXCG3762N6; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -455,7 +450,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yubo.flutterOsc; + PRODUCT_BUNDLE_IDENTIFIER = "falcon-chen-qq.com"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -464,8 +459,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = VXCG3762N6; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -477,7 +472,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.yubo.flutterOsc; + PRODUCT_BUNDLE_IDENTIFIER = "falcon-chen-qq.com"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 1263ac8..e980ec9 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 039443c..cdb5d3e 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,8 +2,6 @@ - NSCameraUsageDescription - Camera permission is required for barcode scanning. CFBundleDevelopmentRegion en CFBundleExecutable @@ -29,6 +27,8 @@ NSAllowsArbitraryLoads + NSCameraUsageDescription + Camera permission is required for barcode scanning. UILaunchStoryboardName LaunchScreen UIMainStoryboardFile -- Gitee From bbe037f0e1b5e57e06ee81954655a20348684bc0 Mon Sep 17 00:00:00 2001 From: falcon Date: Mon, 28 May 2018 16:39:54 +0800 Subject: [PATCH 2/2] add key.jks for Android device release apk build --- .gitignore | 2 ++ android/app/key.jks | Bin 0 -> 2217 bytes android/key.properties | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 android/app/key.jks diff --git a/.gitignore b/.gitignore index 76de7d4..0e9e92b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ ios/.generated/ packages .flutter-plugins ios/.symlinks/ +*.bak +android/app/release/ diff --git a/android/app/key.jks b/android/app/key.jks new file mode 100644 index 0000000000000000000000000000000000000000..6450b44f4ad37b0d2243aeac86d5596de7703637 GIT binary patch literal 2217 zcmcgt`8U)J7oW{A#u|n&lYL*lqhTx|+1D&Bw#JrZCmv-BBZ`nLA#0dMF=LCeWsB)i zmMqzm3fZ$xgdWdx-sha>FL;0WoO3_-+#gN2?$Z2yzVYKY)6>haSsrr25D& zAP@rxAi@p+HaN2^91H`?Ksdo*1`v!0`|d@R%Ot^VqiXjMp<8-*TCwF$t68@;q{gbf zwo@XSPDhU2Y$E|$Ie}fKNv#C^?58$$iRyOYE+RfE^|&5%w`P(7DyGEqRtkmck+REr z(!-d3&Sa z#&mx5s@FGO_2B}sU5l}tJfT~~?Z%|lzUVuES+9Y+#+PRreD0A5`ZI8-ys_`?dsgzG;4de%dmY>~~{ZBlVUmfqoaG_58!eqbY$Y;{d$TTm7N#>11 zdkC%6LSH5C3vW9n%^-w(>9W^?3GI9ndp*_hC}i=lSl%VZK=_&3 z_0NWCjdTirWO&7_@A4L{`X|B7k+YY?<6$k1$2W2~o@rm*IP+xpo0?XZM&djDl#``` zhAi?^t{C~Dge}KCt&Bj;iC(2Kb}Lb|K?j@o?b~vKX@NUg5*&!3@5Sj%lrx)cX)$qFUoL{jM|O>ZG3qc5I?lwvs2S{2MN9dx)Z1f6)8v z-m6G{zWL}K#fAyxAk|mWoF=QI9FjirOQt3f9~1bxYS>QEiMkbmnv_pO?Q)>nIM?qWWOM-nu;wakN2R6yM@&qYrjmSCi5G3WL2L zvSYsDtV>-eTj_j(g*3p)FFnqJ_Q!ppK+!r<%%WypXnyv}Y>FYFwQ@8hIw66lEYn`! zn@=FE=A~N{PxP9krH@m&i_?g~>m0gDQ@%z8{tE3Q8#+G1JdgaK?8n`FY_hXai#x*wD}L+Sk4gAif)3 z?X)AiJHxm2Z#;=|h@8}c7M4G58_MHYYJZPfZtm77&|H#xq*g_@zo(Jsb5{k0jEZO2 zYaaTpF&<+@k9u_j%a~Iwvieou)v~p#j`*ZL)4PpxaMGIrQFWqYvqJH7&w`hfpDUk( zfuLZfNH!n0tzyi$m_cyWwe{z!u{f69ux8WW5G(wZ%^}~j{Q``+f_K2KVthP-4Ts-8?BIbUb)!Ze6|2(3wd~?L0)ZNDQZ#e6Sh75;u}t>tvtS z@~V2oL$jkz{s~D!PS$f@mOxX}H+saKPoTZYa_!XInL z8=`E&d^=4rA8(1w=rW(M>5UsLS?#FHIJa`K=uL{=KSz!zt{ci=5i^`__+D|3F%&U_X9Az ztXNe*SxFVZ<5W%q_PngP)5lclfAs&60ue0o-@=c-0+a}5KYkZrW(W}s27R}O+utFx zn0KYJWWRr`1Ie|i?Dh@t8C1SO)RfUSP_gG81l1_Ix|7AHVWr~rB?)NWq2sgYY!i3pJ8rA zORYjAuIvyr^i`bCThA@^%+J9}Q_D$1I$6l1pM6mYO;H`O)z@W-!zSgFmc|Jea)oOX zNt_`_xvPw^2+~5*;#ANTKD+eor2qnOUW4^GLjVGjK~NMqEw08`33$W@6sjR+EB^Fw zUn%lqE{t{h-HduCmtHlqU@M@NS

6n9cl^xYW3r@Y5F=zLnGqfr3Hc5@FyJfIc1| znhl16ac4+Bw)Il+@zDQ_TVu$=GjyB$GWl;4kGJQziD1ywY{qktA@)TF^socFcWC$^ zd6u-2J#{7UEubnU?u5|Ci`)(uZAjjlDZV3Bx^aQ~1H8bSn$gmcEt|x8n|P30+(4E2 zp)+ku3bFYS9TPg797G<}MHlmqN?Os&L8z0TRSvZFCr1^y2fNZ0a2p(a9P!*pItJ54yDV`B~(xog~+LCt38K`e#{J7%ts5 zCA;3ge9lcGrMNOQgCy>MnJt2NP)tLXGv3{{L|Z;I!j1H7KUX^4Y!}=TQZN^!=egoZ zHdf%73e>IkI*i-gB(arQbEeYdc0ub08x`BvFw4iWMSTS_ZvJ{P0UHWm-vfy0js<@K Dey_}3 literal 0 HcmV?d00001 diff --git a/android/key.properties b/android/key.properties index 0f4de12..2e4505f 100644 --- a/android/key.properties +++ b/android/key.properties @@ -1,4 +1,4 @@ storePassword=flutter keyPassword=flutter keyAlias=key -storeFile=/Users/yubo/key.jks \ No newline at end of file +storeFile=key.jks \ No newline at end of file -- Gitee