修改fetch版本号

fetch/build.gradle

@@ -43,9 +43,9 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.13.0'
 //    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
 //    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.41"
     implementation 'com.safframework.log:saf-logginginterceptor:1.4.5'
     implementation "com.qmai.android.sdk:widgetlib:$widgetlib_version"

fetch/build/generated/source/buildConfig/debug/com/qimai/android/tool_network/BuildConfig.java

@@ -5,6 +5,11 @@ package com.qimai.android.tool_network;
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.qimai.android.tool_network";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
   public static final String APPLICATION_ID = "com.qimai.android.tool_network";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";

fetch/build/generated/source/buildConfig/release/com/qimai/android/tool_network/BuildConfig.java

@@ -5,6 +5,11 @@ package com.qimai.android.tool_network;
 
 public final class BuildConfig {
   public static final boolean DEBUG = false;
+  public static final String LIBRARY_PACKAGE_NAME = "com.qimai.android.tool_network";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
   public static final String APPLICATION_ID = "com.qimai.android.tool_network";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";

fetch/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/debug/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/mergeDebugShaders/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/debug/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/release/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/jniLibs"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/mergeReleaseShaders/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/release/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/shaders"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/packageDebugAssets/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/assets"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/debug/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/assets"/><source path="/Users/leiwang/project/widget/fetch/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/debug/assets"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

-#Tue Feb 04 21:23:46 CST 2020
+#Mon Dec 07 14:34:31 CST 2020

fetch/build/intermediates/incremental/packageDebugResources/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/res"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/rs/debug"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/res"><file path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">tool_network</string></file></source><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/rs/debug"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/debug/res"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/res"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/rs/debug"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/res"><file path="/Users/leiwang/project/widget/fetch/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">tool_network</string></file></source><source path="/Users/leiwang/project/widget/fetch/build/generated/res/rs/debug"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/debug/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/packageReleaseAssets/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/assets"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/release/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/assets"/><source path="/Users/leiwang/project/widget/fetch/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/assets"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

-#Wed Feb 05 10:04:06 CST 2020
+#Mon Dec 07 14:36:50 CST 2020

fetch/build/intermediates/incremental/packageReleaseResources/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/res"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/rs/release"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/res"><file path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">tool_network</string></file></source><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/rs/release"/><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/wangwei/Downloads/ZMProj/qm_network/fetch/src/release/res"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/res"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/rs/release"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/res"><file path="/Users/leiwang/project/widget/fetch/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">tool_network</string></file></source><source path="/Users/leiwang/project/widget/fetch/build/generated/res/rs/release"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file

fetch/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt

+R_DEF: Internal format may change without notice
+local
+string app_name

fetch/build/intermediates/local_only_symbol_list/release/parseReleaseLibraryResources/R-def.txt

+R_DEF: Internal format may change without notice
+local
+string app_name

fetch/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="com.qimai.android.tool_network"
+4    android:versionCode="1"
+5    android:versionName="1.0" >
+6
+7    <uses-sdk
+8        android:minSdkVersion="19"
+8-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml
+9        android:targetSdkVersion="28" />
+9-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml
+10
+11    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+11-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:3:5-78
+11-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:3:22-76
+12    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+12-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:4:5-81
+12-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:4:22-78
+13
+14</manifest>

fetch/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="com.qimai.android.tool_network"
+4    android:versionCode="1"
+5    android:versionName="1.0" >
+6
+7    <uses-sdk
+8        android:minSdkVersion="19"
+8-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml
+9        android:targetSdkVersion="28" />
+9-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml
+10
+11    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+11-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:3:5-78
+11-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:3:22-76
+12    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+12-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:4:5-81
+12-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:4:22-78
+13
+14</manifest>

fetch/build/intermediates/transforms/mergeJavaRes/release/__content__.json

-[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file

fetch/build/intermediates/transforms/mergeJniLibs/debug/__content__.json

-[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":false}]
\ No newline at end of file

fetch/build/intermediates/transforms/mergeJniLibs/release/__content__.json

-[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":false}]
\ No newline at end of file

fetch/build/intermediates/transforms/stripDebugSymbol/debug/__content__.json

-[]
\ No newline at end of file

fetch/build/intermediates/transforms/stripDebugSymbol/release/__content__.json

-[]
\ No newline at end of file

fetch/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s

-

\ No newline at end of file

fetch/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab

-44
-8
+36
+0
\ No newline at end of file

fetch/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.s

-

\ No newline at end of file