Skip to content

Commit a9e9873

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents a76227b + d532dee commit a9e9873

5 files changed

Lines changed: 243 additions & 127 deletions

File tree

‎ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PODS:
3434
DEPENDENCIES:
3535
- connectivity (from `.symlinks/plugins/connectivity/ios`)
3636
- device_info (from `.symlinks/plugins/device_info/ios`)
37-
- Flutter (from `.symlinks/flutter/ios`)
37+
- Flutter (from `.symlinks/flutter/ios-release`)
3838
- flutter_statusbar (from `.symlinks/plugins/flutter_statusbar/ios`)
3939
- flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`)
4040
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
@@ -57,7 +57,7 @@ EXTERNAL SOURCES:
5757
device_info:
5858
:path: ".symlinks/plugins/device_info/ios"
5959
Flutter:
60-
:path: ".symlinks/flutter/ios"
60+
:path: ".symlinks/flutter/ios-release"
6161
flutter_statusbar:
6262
:path: ".symlinks/plugins/flutter_statusbar/ios"
6363
flutter_webview_plugin:

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1616
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1717
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
18-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1918
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
2019
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
2120
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -66,13 +65,6 @@
6665
remoteGlobalIDString = 05CFA344FD05BDC7846987FC69E2968D;
6766
remoteInfo = FMDB;
6867
};
69-
4B512129211F395B00E0C9B3 /* PBXContainerItemProxy */ = {
70-
isa = PBXContainerItemProxy;
71-
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
72-
proxyType = 2;
73-
remoteGlobalIDString = C2168EE11486D639FC8BD7CB7AF2AA7A;
74-
remoteInfo = get_version;
75-
};
7668
4B51212B211F395B00E0C9B3 /* PBXContainerItemProxy */ = {
7769
isa = PBXContainerItemProxy;
7870
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
@@ -122,6 +114,20 @@
122114
remoteGlobalIDString = 4B40ADA9AD61ADB08CA9739165A77AE5;
123115
remoteInfo = url_launcher;
124116
};
117+
4BDB48EC21A2AEFF00E882C1 /* PBXContainerItemProxy */ = {
118+
isa = PBXContainerItemProxy;
119+
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
120+
proxyType = 2;
121+
remoteGlobalIDString = F8B158E8230AA4D2DFAE7C847882628E;
122+
remoteInfo = path_provider;
123+
};
124+
4BDB48EE21A2AEFF00E882C1 /* PBXContainerItemProxy */ = {
125+
isa = PBXContainerItemProxy;
126+
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
127+
proxyType = 2;
128+
remoteGlobalIDString = FAE7273859BB129D96609B584B6F2535;
129+
remoteInfo = permission_handler;
130+
};
125131
/* End PBXContainerItemProxy section */
126132

127133
/* Begin PBXCopyFilesBuildPhase section */
@@ -132,7 +138,6 @@
132138
dstSubfolderSpec = 10;
133139
files = (
134140
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
135-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
136141
);
137142
name = "Embed Frameworks";
138143
runOnlyForDeploymentPostprocessing = 0;
@@ -183,8 +188,9 @@
183188
4B512124211F395B00E0C9B3 /* flutter_webview_plugin.framework */,
184189
4B512126211F395B00E0C9B3 /* fluttertoast.framework */,
185190
4B512128211F395B00E0C9B3 /* FMDB.framework */,
186-
4B51212A211F395B00E0C9B3 /* get_version.framework */,
187191
4B51212C211F395B00E0C9B3 /* package_info.framework */,
192+
4BDB48ED21A2AEFF00E882C1 /* path_provider.framework */,
193+
4BDB48EF21A2AEFF00E882C1 /* permission_handler.framework */,
188194
4B51212E211F395B00E0C9B3 /* Pods_Runner.framework */,
189195
4B512130211F395B00E0C9B3 /* Reachability.framework */,
190196
4B512132211F395B00E0C9B3 /* share.framework */,
@@ -305,6 +311,7 @@
305311
CreatedOnToolsVersion = 7.3.1;
306312
DevelopmentTeam = B29J9885S3;
307313
LastSwiftMigration = 0910;
314+
ProvisioningStyle = Automatic;
308315
};
309316
};
310317
};
@@ -375,13 +382,6 @@
375382
remoteRef = 4B512127211F395B00E0C9B3 /* PBXContainerItemProxy */;
376383
sourceTree = BUILT_PRODUCTS_DIR;
377384
};
378-
4B51212A211F395B00E0C9B3 /* get_version.framework */ = {
379-
isa = PBXReferenceProxy;
380-
fileType = wrapper.framework;
381-
path = get_version.framework;
382-
remoteRef = 4B512129211F395B00E0C9B3 /* PBXContainerItemProxy */;
383-
sourceTree = BUILT_PRODUCTS_DIR;
384-
};
385385
4B51212C211F395B00E0C9B3 /* package_info.framework */ = {
386386
isa = PBXReferenceProxy;
387387
fileType = wrapper.framework;
@@ -431,6 +431,20 @@
431431
remoteRef = 4B512137211F395B00E0C9B3 /* PBXContainerItemProxy */;
432432
sourceTree = BUILT_PRODUCTS_DIR;
433433
};
434+
4BDB48ED21A2AEFF00E882C1 /* path_provider.framework */ = {
435+
isa = PBXReferenceProxy;
436+
fileType = wrapper.framework;
437+
path = path_provider.framework;
438+
remoteRef = 4BDB48EC21A2AEFF00E882C1 /* PBXContainerItemProxy */;
439+
sourceTree = BUILT_PRODUCTS_DIR;
440+
};
441+
4BDB48EF21A2AEFF00E882C1 /* permission_handler.framework */ = {
442+
isa = PBXReferenceProxy;
443+
fileType = wrapper.framework;
444+
path = permission_handler.framework;
445+
remoteRef = 4BDB48EE21A2AEFF00E882C1 /* PBXContainerItemProxy */;
446+
sourceTree = BUILT_PRODUCTS_DIR;
447+
};
434448
/* End PBXReferenceProxy section */
435449

436450
/* Begin PBXResourcesBuildPhase section */
@@ -459,7 +473,7 @@
459473
inputPaths = (
460474
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
461475
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
462-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
476+
"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
463477
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
464478
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
465479
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
@@ -509,7 +523,7 @@
509523
);
510524
runOnlyForDeploymentPostprocessing = 0;
511525
shellPath = /bin/sh;
512-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
526+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n";
513527
};
514528
9740EEB61CF901F6004384FC /* Run Script */ = {
515529
isa = PBXShellScriptBuildPhase;
@@ -686,6 +700,8 @@
686700
buildSettings = {
687701
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
688702
CLANG_ENABLE_MODULES = YES;
703+
CODE_SIGN_IDENTITY = "iPhone Developer";
704+
CODE_SIGN_STYLE = Automatic;
689705
CURRENT_PROJECT_VERSION = 1;
690706
DEVELOPMENT_TEAM = B29J9885S3;
691707
ENABLE_BITCODE = NO;
@@ -701,6 +717,7 @@
701717
);
702718
PRODUCT_BUNDLE_IDENTIFIER = com.shuyu.GSYGithubAppFlutter;
703719
PRODUCT_NAME = "$(TARGET_NAME)";
720+
PROVISIONING_PROFILE_SPECIFIER = "";
704721
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
705722
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
706723
SWIFT_SWIFT3_OBJC_INFERENCE = On;
@@ -715,6 +732,8 @@
715732
buildSettings = {
716733
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
717734
CLANG_ENABLE_MODULES = YES;
735+
CODE_SIGN_IDENTITY = "iPhone Developer";
736+
CODE_SIGN_STYLE = Automatic;
718737
CURRENT_PROJECT_VERSION = 1;
719738
DEVELOPMENT_TEAM = B29J9885S3;
720739
ENABLE_BITCODE = NO;
@@ -730,6 +749,7 @@
730749
);
731750
PRODUCT_BUNDLE_IDENTIFIER = com.shuyu.GSYGithubAppFlutter;
732751
PRODUCT_NAME = "$(TARGET_NAME)";
752+
PROVISIONING_PROFILE_SPECIFIER = "";
733753
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
734754
SWIFT_SWIFT3_OBJC_INFERENCE = On;
735755
SWIFT_VERSION = 4.0;

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎ios/Runner/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.1.4</string>
20+
<string>1.1.5</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>14</string>
24+
<string>15</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>NSAppTransportSecurity</key>

0 commit comments

Comments
 (0)