Skip to content

Commit 107f225

Browse files
authored
Merge pull request #110 from hyhSuper/master
版0.6.23
2 parents 132d8c2 + 4e15ced commit 107f225

File tree

8 files changed

+37
-17
lines changed

8 files changed

+37
-17
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
build/
88
.idea
99
.metadata
10-
1110
pubspec.lock
11+
.last_build_id

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2+
3+
## 0.6.23
4+
+ 新增:适配认证 ios SDK 2.6.7。
15
## 0.6.22
26
+ 新增:适配认证Android2.6.7 ios 2.6.6。
37
## 0.6.20

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919

2020
```
2121
dependencies:
22-
jverify: 0.6.22
22+
jverify: 0.6.23
2323
```
2424

2525
### 配置

android/build.gradle

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,26 @@ android {
2727
defaultConfig {
2828
minSdkVersion 17
2929
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
30-
31-
// library 混淆 -> 随 library 引用,自动添加到 apk 打包混淆
32-
consumerProguardFiles 'consumer-rules.pro'
3330
}
3431

3532
lintOptions {
3633
disable 'InvalidPackage'
3734
}
35+
buildTypes {
36+
release {
37+
minifyEnabled true
38+
useProguard true
39+
// library 混淆 -> 随 library 引用,自动添加到 apk 打包混淆
40+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'consumer-rules.pro'
41+
}
42+
debug {
43+
minifyEnabled false
44+
useProguard false
45+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'consumer-rules.pro'
46+
}
47+
}
48+
49+
3850
}
3951

4052
dependencies {

example/ios/Flutter/flutter_export_environment.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/ccq/Library/Flutter/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/ccq/Documents/code/work/jverify-flutter-plugin/example"
5-
export "FLUTTER_TARGET=/Users/ccq/Documents/code/work/jverify-flutter-plugin/example/lib/main.dart"
3+
export "FLUTTER_ROOT=/Users/allan/Documents/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/Users/allan/Documents/GitHub/jverify-flutter-plugin/example"
5+
export "FLUTTER_TARGET=/Users/allan/Documents/GitHub/jverify-flutter-plugin/example/lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
88
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9-
export "FLUTTER_FRAMEWORK_DIR=/Users/ccq/Library/Flutter/flutter/bin/cache/artifacts/engine/ios"
9+
export "FLUTTER_FRAMEWORK_DIR=/Users/allan/Documents/flutter/bin/cache/artifacts/engine/ios"
1010
export "FLUTTER_BUILD_NAME=1.0.0"
1111
export "FLUTTER_BUILD_NUMBER=1"
12+
export "DART_DEFINES=flutter.inspector.structuredErrors%3Dtrue"
1213
export "DART_OBFUSCATION=false"
1314
export "TRACK_WIDGET_CREATION=true"
1415
export "TREE_SHAKE_ICONS=false"
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
34
<dependencies>
45
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
7+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
68
</dependencies>
79
<scenes>
810
<!--Flutter View Controller-->
@@ -14,13 +16,14 @@
1416
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1517
</layoutGuides>
1618
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
19+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
1820
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
21+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2022
</view>
2123
</viewController>
2224
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
2325
</objects>
26+
<point key="canvasLocation" x="131" y="-20"/>
2427
</scene>
2528
</scenes>
2629
</document>

ios/jverify.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ A new flutter plugin project.
1515
s.source_files = 'Classes/**/*'
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
18-
s.dependency 'JCore', '2.2.5'
19-
s.dependency 'JVerification', '2.6.6'
18+
s.dependency 'JCore', '2.4.0'
19+
s.dependency 'JVerification', '2.6.7'
2020
s.ios.deployment_target = '8.0'
2121
s.static_framework = true
2222
end

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: jverify
22
description: JIGUANG Official Jverifycation SDK flutter plugin project.
3-
version: 0.6.22
3+
version: 0.6.23
44
homepage: https://www.jiguang.cn
55

66
environment:

0 commit comments

Comments
 (0)