fix conflict

master
wanghualei 2021-04-19 14:54:35 +08:00
commit ac656749a0
6 changed files with 8 additions and 8 deletions

View File

@ -91,6 +91,6 @@ kapt {
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.finogeeks.lib:finapplet:2.24.0-alpha20210331v01'
implementation 'com.finogeeks.mop:plugins:2.23.1'
implementation 'com.finogeeks.lib:finapplet:2.24.3'
implementation 'com.finogeeks.mop:plugins:2.24.3'
}

View File

@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/kangxuyao/StudioProjects/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/kangxuyao/StudioProjects/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-02-05 15:09:47.735944","version":"1.26.0-18.0.pre.209"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-04-13 14:41:18.519464","version":"2.0.3"}

View File

@ -87,7 +87,7 @@ packages:
path: ".."
relative: true
source: path
version: "2.20.13"
version: "2.24.3"
path:
dependency: transitive
description:

View File

@ -96,8 +96,8 @@ static MopPlugin *_instance;
if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
NSURL *url = userActivity.webpageURL;
NSLog(@"url = %@",url.absoluteString);
return [[FATClient sharedClient] handleOpenUniversalLinkURL:url];
}
return YES;
}

View File

@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk.
s.dependency 'Flutter'
s.ios.deployment_target = '9.0'
s.dependency 'FinApplet' , '2.24.0-alpha20210406v01'
s.dependency 'FinAppletExt' , '2.24.0-alpha20210406v01'
s.dependency 'FinApplet' , '2.24.3'
s.dependency 'FinAppletExt' , '2.24.3'
end

View File

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