android update glide version

.github/workflows/publish.yml

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

doric-android/app/build.gradle

@@ -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'

doric-android/doric/build.gradle

@@ -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 '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"
 
     def nav_version = "2.3.0"

doric-web/dist/index.js

@@ -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);
                 });
             }