android update glide version
This commit is contained in:
parent
e4351e3b00
commit
1aaf23f869
24
.github/workflows/publish.yml
vendored
24
.github/workflows/publish.yml
vendored
@ -1,8 +1,8 @@
|
|||||||
name: Release
|
name: Release
|
||||||
on:
|
on:
|
||||||
# push:
|
# push:
|
||||||
# tags:
|
# tags:
|
||||||
# - 'v*.*.*'
|
# - 'v*.*.*'
|
||||||
release:
|
release:
|
||||||
types:
|
types:
|
||||||
- published
|
- published
|
||||||
@ -18,7 +18,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v1
|
- uses: actions/setup-node@v1
|
||||||
with:
|
with:
|
||||||
node-version: 10
|
node-version: 10
|
||||||
registry-url: 'https://registry.npmjs.org'
|
registry-url: "https://registry.npmjs.org"
|
||||||
- name: Config Github Account
|
- name: Config Github Account
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@ -45,14 +45,14 @@ jobs:
|
|||||||
BINTARY_USER: ${{ secrets.BINTARY_USER }}
|
BINTARY_USER: ${{ secrets.BINTARY_USER }}
|
||||||
BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
|
BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
|
||||||
BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
|
BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
|
||||||
- name: Publish legacy
|
# - name: Publish legacy
|
||||||
run: |
|
# run: |
|
||||||
sh publish-android-legacy.sh
|
# sh publish-android-legacy.sh
|
||||||
env:
|
# env:
|
||||||
BINTARY_USER: ${{ secrets.BINTARY_USER }}
|
# BINTARY_USER: ${{ secrets.BINTARY_USER }}
|
||||||
BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
|
# BINTARY_REPO: ${{ secrets.BINTARY_REPO }}
|
||||||
BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
|
# BINTARY_APIKEY: ${{ secrets.BINTARY_APIKEY }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: dingtalk
|
- name: dingtalk
|
||||||
uses: satak/webrequest-action@master
|
uses: satak/webrequest-action@master
|
||||||
with:
|
with:
|
||||||
|
@ -30,7 +30,7 @@ dependencies {
|
|||||||
implementation "com.google.android.material:material:1.1.0"
|
implementation "com.google.android.material:material:1.1.0"
|
||||||
implementation "pub.doric:core:${rootProject.ext.Version}"
|
implementation "pub.doric:core:${rootProject.ext.Version}"
|
||||||
implementation "pub.doric:devkit:${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:glide:4.11.0'
|
||||||
implementation 'com.github.bumptech.glide:annotations:4.11.0'
|
implementation 'com.github.bumptech.glide:annotations:4.11.0'
|
||||||
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
|
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
|
||||||
|
@ -41,11 +41,11 @@ dependencies {
|
|||||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||||
api 'com.github.penfeizhou:jsc4a:0.1.0'
|
api 'com.github.penfeizhou:jsc4a:0.1.0'
|
||||||
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
|
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'
|
exclude group: 'com.github.bumptech.glide'
|
||||||
}
|
}
|
||||||
implementation 'com.github.bumptech.glide:glide:4.8.0'
|
implementation 'com.github.bumptech.glide:glide:4.11.0'
|
||||||
implementation 'jp.wasabeef:glide-transformations:4.0.1'
|
implementation 'jp.wasabeef:glide-transformations:4.1.0'
|
||||||
implementation "com.google.android.material:material:1.1.0"
|
implementation "com.google.android.material:material:1.1.0"
|
||||||
|
|
||||||
def nav_version = "2.3.0"
|
def nav_version = "2.3.0"
|
||||||
|
6
doric-web/dist/index.js
vendored
6
doric-web/dist/index.js
vendored
@ -4311,7 +4311,9 @@ return __module.exports;
|
|||||||
var doric_web = (function (exports, axios, sandbox) {
|
var doric_web = (function (exports, axios, sandbox) {
|
||||||
'use strict';
|
'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 {
|
class DoricPlugin {
|
||||||
constructor(context) {
|
constructor(context) {
|
||||||
@ -5731,7 +5733,7 @@ ${content}
|
|||||||
}
|
}
|
||||||
connectedCallback() {
|
connectedCallback() {
|
||||||
if (this.src && this.context === undefined) {
|
if (this.src && this.context === undefined) {
|
||||||
axios.get(this.src).then(result => {
|
axios__default['default'].get(this.src).then(result => {
|
||||||
this.load(result.data);
|
this.load(result.data);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
2
doric-web/dist/index.js.map
vendored
2
doric-web/dist/index.js.map
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user