diff --git a/.drone.yml b/.drone.yml
index 9333f4e..77c8674 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -91,9 +91,10 @@ steps:
volumes:
- name: pub-cache
path: /opt/flutter/.pub-cache
+ environment:
+ PUB_CACHE: /opt/flutter/.pub-cache
commands:
- - FLUTTER_HOME=/opt/flutter/.pub-cache
- - wget -P $FLUTTER_HOME https://raw.githubusercontent.com/v7lin/pub_credentials/master/credentials.json.enc
+ - wget -P $PUB_CACHE https://raw.githubusercontent.com/v7lin/pub_credentials/master/credentials.json.enc
- name: restore-cache-openssl
image: v7lin/openssl:1.1.1b
@@ -101,14 +102,14 @@ steps:
- name: pub-cache
path: /opt/flutter/.pub-cache
environment:
+ PUB_CACHE: /opt/flutter/.pub-cache
ENC_METHOD:
from_secret: ENC_METHOD
ENC_PASSWORD:
from_secret: ENC_PASSWORD
commands:
- - FLUTTER_HOME=/opt/flutter/.pub-cache
- - openssl enc -d -$ENC_METHOD -k $ENC_PASSWORD -in $FLUTTER_HOME/credentials.json.enc -out $FLUTTER_HOME/credentials.json
- - rm $FLUTTER_HOME/credentials.json.enc
+ - openssl enc -d -$ENC_METHOD -k $ENC_PASSWORD -in $PUB_CACHE/credentials.json.enc -out $PUB_CACHE/credentials.json
+ - rm $PUB_CACHE/credentials.json.enc
- name: publish
image: v7lin/flutter:1.7.8-hotfix.3-stable
@@ -124,14 +125,14 @@ steps:
- name: pub-cache
path: /opt/flutter/.pub-cache
environment:
+ PUB_CACHE: /opt/flutter/.pub-cache
ENC_METHOD:
from_secret: ENC_METHOD
ENC_PASSWORD:
from_secret: ENC_PASSWORD
commands:
- - FLUTTER_HOME=/opt/flutter/.pub-cache
- - openssl enc -e -$ENC_METHOD -k $ENC_PASSWORD -in $FLUTTER_HOME/credentials.json -out $FLUTTER_HOME/credentials.json.enc
- - rm /opt/flutter/.pub-cache/credentials.json
+ - openssl enc -e -$ENC_METHOD -k $ENC_PASSWORD -in $PUB_CACHE/credentials.json -out $PUB_CACHE/credentials.json.enc
+ - rm $PUB_CACHE/credentials.json
- name: save-cache
image: docker:git
@@ -139,6 +140,7 @@ steps:
- name: pub-cache
path: /opt/flutter/.pub-cache
environment:
+ PUB_CACHE: /opt/flutter/.pub-cache
GIT_USER_EMAIL:
from_secret: GIT_USER_EMAIL
GIT_USER_NAME:
@@ -146,14 +148,13 @@ steps:
GIT_USER_PASSWORD:
from_secret: GIT_USER_PASSWORD # 密码含'@',用'%40'替换 -> URLEncoder.encode("@","utf-8");
commands:
- - FLUTTER_HOME=/opt/flutter/.pub-cache
- git config --global user.email $GIT_USER_EMAIL
- git config --global user.name $GIT_USER_NAME
- git config --global credential.helper store
- - git clone -b master https://$GIT_USER_NAME:$GIT_USER_PASSWORD@github.com/v7lin/pub_credentials.git $FLUTTER_HOME/pub_credentials
- - rm $FLUTTER_HOME/pub_credentials/credentials.json.enc
- - mv $FLUTTER_HOME/credentials.json.enc $FLUTTER_HOME/pub_credentials/credentials.json.enc
- - cd $FLUTTER_HOME/pub_credentials
+ - git clone -b master https://$GIT_USER_NAME:$GIT_USER_PASSWORD@github.com/v7lin/pub_credentials.git $PUB_CACHE/pub_credentials
+ - rm $PUB_CACHE/pub_credentials/credentials.json.enc
+ - mv $PUB_CACHE/credentials.json.enc $PUB_CACHE/pub_credentials/credentials.json.enc
+ - cd $PUB_CACHE/pub_credentials
- git commit -am "update credentials by ci/cd tools"
- git push
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 632b73a..be81da4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.3 - 2019.8.1
+
+* 升级Android SDK
+
## 0.2.2 - 2019.7.12
* 简化
diff --git a/android/build.gradle b/android/build.gradle
index b90aa9c..684e428 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -31,15 +31,18 @@ android {
defaultConfig {
minSdkVersion 16
+
+ // library 混淆 -> 随 library 引用,自动添加到 apk 打包混淆
+ consumerProguardFiles 'consumer-proguard-rules.txt'
+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
+
lintOptions {
disable 'InvalidPackage'
}
}
dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
-
- implementation 'io.github.v7lin:weibo-android:4.3.4'
+ implementation 'com.sina.weibo.sdk:core:4.4.2:openDefaultRelease@aar'
}
diff --git a/android/consumer-proguard-rules.txt b/android/consumer-proguard-rules.txt
new file mode 100644
index 0000000..0b52d31
--- /dev/null
+++ b/android/consumer-proguard-rules.txt
@@ -0,0 +1 @@
+# 微博
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 2f2abfe..9b39cbd 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,11 @@
+ package="io.github.v7lin.fakeweibo">
+
+
+
+
+
+
+
+
diff --git a/pubspec.yaml b/pubspec.yaml
index 106dd85..8a80fae 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
name: fake_weibo
description: A powerful weibo plugin for Flutter.
-version: 0.2.2
+version: 0.2.3
author: v7lin
homepage: https://github.com/v7lin/fake_weibo
@@ -11,9 +11,9 @@ dependencies:
flutter:
sdk: flutter
- meta: '>=1.1.6 <2.0.0'
+ meta: ^1.1.6
- jaguar_serializer: '>=2.2.12 <3.0.0'
+ jaguar_serializer: ^2.2.12
dev_dependencies:
flutter_test: