android update glide version

This commit is contained in:
pengfei.zhou 2020-09-02 18:07:48 +08:00 committed by osborn
parent e4351e3b00
commit 1aaf23f869
5 changed files with 61 additions and 59 deletions

View File

@ -1,8 +1,8 @@
name: Release
on:
# push:
# tags:
# - 'v*.*.*'
on:
# push:
# tags:
# - 'v*.*.*'
release:
types:
- published
@ -10,53 +10,53 @@ jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
- name: setup JDK 1.8
uses: actions/setup-java@v1
with:
- uses: actions/checkout@v1
- name: setup JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- uses: actions/setup-node@v1
with:
- uses: actions/setup-node@v1
with:
node-version: 10
registry-url: 'https://registry.npmjs.org'
- name: Config Github Account
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config user.email "pengfeizhou@foxmail.com"
git config user.name "pengfei.zhou"
git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
git checkout master
- name: Setup
run: sh setup.sh
- name: Install Cocoapods
run: |
gem install cocoapods
- name: Echo current Version
run: |
echo ${GITHUB_REF:11}>version
echo "Current Version is "${GITHUB_REF:11}
- name: Publish
run: |
sh publish.sh
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BINTARY_USER: ${{ secrets.BINTARY_USER }}
BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
- name: Publish legacy
run: |
sh publish-android-legacy.sh
env:
BINTARY_USER: ${{ secrets.BINTARY_USER }}
BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: dingtalk
uses: satak/webrequest-action@master
with:
url: ${{ secrets.dingtalk_webhook }}
method: POST
payload: '{"msgtype": "text", "text": {"content": "Doric version ${{env.GITHUB_REF}} released."}}'
headers: '{"Content-Type": "application/json"}'
registry-url: "https://registry.npmjs.org"
- name: Config Github Account
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config user.email "pengfeizhou@foxmail.com"
git config user.name "pengfei.zhou"
git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
git checkout master
- name: Setup
run: sh setup.sh
- name: Install Cocoapods
run: |
gem install cocoapods
- name: Echo current Version
run: |
echo ${GITHUB_REF:11}>version
echo "Current Version is "${GITHUB_REF:11}
- name: Publish
run: |
sh publish.sh
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BINTARY_USER: ${{ secrets.BINTARY_USER }}
BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
# - name: Publish legacy
# run: |
# sh publish-android-legacy.sh
# env:
# BINTARY_USER: ${{ secrets.BINTARY_USER }}
# BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
# BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: dingtalk
uses: satak/webrequest-action@master
with:
url: ${{ secrets.dingtalk_webhook }}
method: POST
payload: '{"msgtype": "text", "text": {"content": "Doric version ${{env.GITHUB_REF}} released."}}'
headers: '{"Content-Type": "application/json"}'

View File

@ -30,7 +30,7 @@ dependencies {
implementation "com.google.android.material:material:1.1.0"
implementation "pub.doric:core:${rootProject.ext.Version}"
implementation "pub.doric:devkit:${rootProject.ext.Version}"
implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.2.0'
implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.4.2'
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.github.bumptech.glide:annotations:4.11.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'

View File

@ -41,11 +41,11 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
api 'com.github.penfeizhou:jsc4a:0.1.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
implementation('com.github.penfeizhou.android.animation:glide-plugin:2.2.0') {
implementation('com.github.penfeizhou.android.animation:glide-plugin:2.4.1') {
exclude group: 'com.github.bumptech.glide'
}
implementation 'com.github.bumptech.glide:glide:4.8.0'
implementation 'jp.wasabeef:glide-transformations:4.0.1'
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'jp.wasabeef:glide-transformations:4.1.0'
implementation "com.google.android.material:material:1.1.0"
def nav_version = "2.3.0"

View File

@ -4311,7 +4311,9 @@ return __module.exports;
var doric_web = (function (exports, axios, sandbox) {
'use strict';
axios = axios && Object.prototype.hasOwnProperty.call(axios, 'default') ? axios['default'] : axios;
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
class DoricPlugin {
constructor(context) {
@ -5731,7 +5733,7 @@ ${content}
}
connectedCallback() {
if (this.src && this.context === undefined) {
axios.get(this.src).then(result => {
axios__default['default'].get(this.src).then(result => {
this.load(result.data);
});
}

File diff suppressed because one or more lines are too long