diff --git a/.gitignore b/.gitignore index 9fc24b90..f07b4d86 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ out/ gradle/ build/ gradlew* -gradle.properties +# gradle.properties # Local configuration file (sdk path, etc) local.properties diff --git a/README.md b/README.md index e93257e8..131d7bf1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ xUtils 包含了orm, http(s), image, view注解, 但依然很轻量级(251K), #### 使用Gradle构建时添加以下依赖即可: ```javascript -implementation 'org.xutils:xutils:3.8.5' +implementation 'org.xutils:xutils:3.8.6' ``` #### 混淆配置参考示例项目sample的配置 diff --git a/build.gradle b/build.gradle index 9508a86b..8ae5711a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.6.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..199d16ed --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true + diff --git a/sample/build.gradle b/sample/build.gradle index 286080e1..36c3e406 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -32,6 +32,6 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation project(':xutils') } diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml index 8330d6af..12bbda96 100644 --- a/sample/src/main/res/values/strings.xml +++ b/sample/src/main/res/values/strings.xml @@ -5,5 +5,5 @@ 移除 停止 开始下载 - http://dl.bintray.com/wyouflf/maven/org/xutils/xutils/3.8.5/xutils-3.8.5.aar + http://dl.bintray.com/wyouflf/maven/org/xutils/xutils/3.8.6/xutils-3.8.6.aar \ No newline at end of file diff --git a/xutils/build.gradle b/xutils/build.gradle index 09f5313f..ad76a369 100644 --- a/xutils/build.gradle +++ b/xutils/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray' def siteUrl = 'https://github.com/wyouflf/xUtils3' def gitUrl = 'https://github.com/wyouflf/xUtils3.git' group = "org.xutils" -version = "3.8.5" +version = "3.8.6" android { compileSdkVersion 28