fix iOS build

2019-02-26 00:13:29 +08:00
parent c182564b03
commit 9193db5f9a
6 changed files with 3038 additions and 165 deletions
--- a/ios/Flutter/App.framework/App
+++ b/ios/Flutter/App.framework/App
--- a/ios/Flutter/Flutter.framework/Flutter
+++ b/ios/Flutter/Flutter.framework/Flutter
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,6 +1,7 @@
 # Uncomment this line to define a global platform for your project
 # platform :ios, '9.0'
-pod 'ZXingObjC', '~> 3.2.2'
+pod 'ZXingObjC', '3.6.5'
+pod 'DropDown', '2.3.12'

 if ENV['FLUTTER_FRAMEWORK_DIR'] == nil
  abort('Please set FLUTTER_FRAMEWORK_DIR to the directory containing Flutter.framework')
@@ -8,7 +9,6 @@ end

 target ‘Runner’ do
  # Pods for Runner
-  pod 'DropDown'
  use_frameworks!

  # Flutter Pods
@@ -31,7 +31,6 @@ target ‘Runner’ do
 end
 target ‘Dinect’ do
  # Pods for Dinect
-  pod 'DropDown'
  use_frameworks!

  # Flutter Pods
@@ -54,7 +53,6 @@ target ‘Dinect’ do
 end
 target ‘Crypto’ do
  # Pods for Crypto
-  pod 'DropDown'
  use_frameworks!

  # Flutter Pods
@@ -75,6 +73,72 @@ target ‘Crypto’ do
    }
  end
 end
+target ‘Crypto INT’ do
+    # Pods for Crypto
+    use_frameworks!
+    
+    # Flutter Pods
+    pod 'Flutter', :path => ENV['FLUTTER_FRAMEWORK_DIR']
+    
+    if File.exists? '../.flutter-plugins'
+        flutter_root = File.expand_path('..')
+        File.foreach('../.flutter-plugins') { |line|
+            plugin = line.split(pattern='=')
+            if plugin.length == 2
+                name = plugin[0].strip()
+                path = plugin[1].strip()
+                resolved_path = File.expand_path("#{path}/ios", flutter_root)
+                pod name, :path => resolved_path
+                else
+                puts "Invalid plugin specification: #{line}"
+            end
+        }
+    end
+end
+target ‘Dinect-INT’ do
+    # Pods for Dinect-INT
+    use_frameworks!
+    
+    # Flutter Pods
+    pod 'Flutter', :path => ENV['FLUTTER_FRAMEWORK_DIR']
+    
+    if File.exists? '../.flutter-plugins'
+        flutter_root = File.expand_path('..')
+        File.foreach('../.flutter-plugins') { |line|
+            plugin = line.split(pattern='=')
+            if plugin.length == 2
+                name = plugin[0].strip()
+                path = plugin[1].strip()
+                resolved_path = File.expand_path("#{path}/ios", flutter_root)
+                pod name, :path => resolved_path
+                else
+                puts "Invalid plugin specification: #{line}"
+            end
+        }
+    end
+end
+target ‘Dinect-OTE’ do
+    # Pods for Dinect
+    use_frameworks!
+    
+    # Flutter Pods
+    pod 'Flutter', :path => ENV['FLUTTER_FRAMEWORK_DIR']
+    
+    if File.exists? '../.flutter-plugins'
+        flutter_root = File.expand_path('..')
+        File.foreach('../.flutter-plugins') { |line|
+            plugin = line.split(pattern='=')
+            if plugin.length == 2
+                name = plugin[0].strip()
+                path = plugin[1].strip()
+                resolved_path = File.expand_path("#{path}/ios", flutter_root)
+                pod name, :path => resolved_path
+                else
+                puts "Invalid plugin specification: #{line}"
+            end
+        }
+    end
+end

 post_install do |installer|
  installer.pods_project.targets.each do |target|
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - DropDown (2.3.2)
+  - DropDown (2.3.12)
  - Flutter (1.0.0)
-  - FMDB (2.7.2):
-    - FMDB/standard (= 2.7.2)
-  - FMDB/standard (2.7.2)
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
  - image_picker (0.0.1):
    - Flutter
  - path_provider (0.0.1):
@@ -11,37 +11,43 @@ PODS:
  - sqflite (0.0.1):
    - Flutter
    - FMDB (~> 2.7.2)
-  - ZXingObjC (3.2.2):
-    - ZXingObjC/All (= 3.2.2)
-  - ZXingObjC/All (3.2.2)
+  - ZXingObjC (3.6.5):
+    - ZXingObjC/All (= 3.6.5)
+  - ZXingObjC/All (3.6.5)

 DEPENDENCIES:
-  - DropDown
-  - Flutter (from `/Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios`)
-  - image_picker (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/image_picker-0.4.10/ios`)
-  - path_provider (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/path_provider-0.4.1/ios`)
-  - sqflite (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1/ios`)
-  - ZXingObjC (~> 3.2.2)
+  - DropDown (= 2.3.12)
+  - Flutter (from `/Users/nikitateplyakov/Library/flutter/bin/cache/artifacts/engine/ios-release`)
+  - image_picker (from `/Users/nikitateplyakov/Library/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.4.10/ios`)
+  - path_provider (from `/Users/nikitateplyakov/Library/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-0.4.1/ios`)
+  - "sqflite (from `/Users/nikitateplyakov/Library/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1/ios`)"
+  - ZXingObjC (= 3.6.5)
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - DropDown
+    - FMDB
+    - ZXingObjC

 EXTERNAL SOURCES:
  Flutter:
-    :path: /Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios
+    :path: "/Users/nikitateplyakov/Library/flutter/bin/cache/artifacts/engine/ios-release"
  image_picker:
-    :path: /Users/dinect/.pub-cache/hosted/pub.dartlang.org/image_picker-0.4.10/ios
+    :path: "/Users/nikitateplyakov/Library/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.4.10/ios"
  path_provider:
-    :path: /Users/dinect/.pub-cache/hosted/pub.dartlang.org/path_provider-0.4.1/ios
+    :path: "/Users/nikitateplyakov/Library/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-0.4.1/ios"
  sqflite:
-    :path: /Users/dinect/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1/ios
+    :path: "/Users/nikitateplyakov/Library/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1/ios"

 SPEC CHECKSUMS:
-  DropDown: 7f87abecc28f9b4edad810fe1211c5c018c257e5
+  DropDown: 0bcc278799ec11a3d34ce1aac9367fbbaf5423d9
  Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
-  FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
  image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22
  path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
  sqflite: 801b6b0983f722fa29baf00d1476e4556ada6de4
-  ZXingObjC: 2c95a0dc52daac69b23ec78fad8fa2fec05f8981
+  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

-PODFILE CHECKSUM: fb0878732874759a90764b55aa8df21a11e17dea
+PODFILE CHECKSUM: 1eb639368316fc9db6b59382293c5479a70ebdc1

-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>aps-environment</key>
-	<string>development</string>
-</dict>
+<dict/>
 </plist>