Merge branch 'master' into major_dev

# Conflicts:
#	android/build.gradle

example/ios/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
-  - FinApplet (2.40.12-dev20230614v02)
-  - FinAppletExt (2.40.12-dev20230614v02):
-    - FinApplet (= 2.40.12-dev20230614v02)
+  - FinApplet (2.40.12-dev20230615v03)
+  - FinAppletExt (2.40.12-dev20230615v03):
+    - FinApplet (= 2.40.12-dev20230615v03)
   - Flutter (1.0.0)
   - mop (0.1.1):
-    - FinApplet (= 2.40.12-dev20230614v02)
-    - FinAppletExt (= 2.40.12-dev20230614v02)
+    - FinApplet (= 2.40.12-dev20230615v03)
+    - FinAppletExt (= 2.40.12-dev20230615v03)
     - Flutter
 
 DEPENDENCIES:
@@ -24,10 +24,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/mop/ios"
 
 SPEC CHECKSUMS:
-  FinApplet: de28575dab4c28c200c02844f4909b04d376def2
-  FinAppletExt: eea5d939667836c744b5eb4afcc81285e248c9f3
+  FinApplet: 8c14ee57dcefca25074fc4ae5ff047d0636d9116
+  FinAppletExt: b6356d98e0897017611a402aaf97f24686652d93
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  mop: d8bad2214a82a3440c154e496d0d49c1144490a4
+  mop: 2610a14e951144088f87aea5881db9c5d58a5995
 
 PODFILE CHECKSUM: 2da0220ee5ba22a2dfcec42dfe5b17d05f3c3da9
 

example/ios/Runner.xcodeproj/project.pbxproj

@@ -272,7 +272,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

example/lib/main.dart

@@ -170,7 +170,9 @@ class _MyAppState extends State<MyApp> {
           children: <Widget>[
             _buildAppletWidget("5facb3a52dcbff00017469bd", "画图小程序"),
             _buildAppletWidget("5f72e3559a6a7900019b5baa", "官方小程序"),
-            _buildAppletWidget("5f17f457297b540001e06ebb", "测试小程序"),
+            _buildAppletWidget("5f17f457297b540001e06ebb", "api测试小程序"),
+            _buildAppletWidget("61386f6484dd160001d3e1ab", "测试小程序"),
+            
           ],
         ),
       ),

ios/mop.podspec

@@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk.
   s.dependency 'Flutter'
   s.ios.deployment_target = '9.0'
 
-  s.dependency 'FinApplet' , '2.40.12-dev20230614v02'
-  s.dependency 'FinAppletExt' , '2.40.12-dev20230614v02'
+  s.dependency 'FinApplet' , '2.40.13'
+  s.dependency 'FinAppletExt' , '2.40.13'
 end
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: mop
 description: A Finogeeks MiniProgram Flutter SDK.
-version: '2.40.11'
+version: '2.40.13'
 homepage: https://github.com/finogeeks/mop-flutter-sdk
 
 environment: