diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..733f463f --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 24f8c447..2f82ed79 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,7 +11,6 @@ - - + diff --git a/app/build.gradle b/app/build.gradle index 9bc32c1a..47b02774 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -203,8 +203,8 @@ dependencies { implementation 'com.google.android:flexbox:2.0.1' - implementation 'com.qifan.powerpermission:powerpermission:1.0.0' - implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.0.0' + implementation 'com.qifan.powerpermission:powerpermission:1.3.0' + implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.3.0' implementation 'com.github.kuba2k2.FSLogin:lib:master-SNAPSHOT' implementation 'pl.droidsonroids:jspoon:1.3.2' diff --git a/build.gradle b/build.gradle index 6224a05e..ad09a5b1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { ] versions = [ - gradleAndroid : '4.0.0-beta05', + gradleAndroid : '4.1.0-rc01', kotlin : ext.kotlin_version, ktx : "1.2.0", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4331d8b..85e720be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 06 18:23:03 CET 2019 +#Mon Aug 24 17:15:24 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java b/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java index 70b59853..847fe87e 100644 --- a/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java +++ b/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java @@ -1,7 +1,5 @@ package im.wangchao.mhttp.internal; -import im.wangchao.mhttp.BuildConfig; - /** *

Description : Version.

*

Author : wangchao.

@@ -14,7 +12,7 @@ public class Version { } public static String userAgent() { - return moduleName().concat(BuildConfig.VERSION_NAME); + return moduleName().concat("1.10.1"); } public static String moduleName() {