diff --git a/README.md b/README.md index 872af5b0..e2fc1bbc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ - [中文文档](./README_CN.md) -The solution of merging aar works with [AGP][3] `3.0` and higher. (Tested in AGP 3.0 - 4.1.0, and Gradle 4.9 - 6.8) +The solution of merging aar works with [AGP][3] `3.0` and higher. (Tested in AGP 3.0 - 4.2.0, and Gradle 4.9 - 6.8) ## Getting Started @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.github.kezong:fat-aar:1.3.5' + classpath 'com.github.kezong:fat-aar:1.3.6' } } ``` @@ -138,13 +138,17 @@ See [anatomy of an aar file here][2]. | 1.2.17 | 3.0.0 - 4.0.2 | 4.9 - 6.8 | | 1.2.18+ | 3.0.0 - 4.1.0 | 4.9 - 6.8 | | 1.3.+ | 3.0.0 - 4.1.0 | 4.9 - 6.8 | -| 1.3.4 | 3.0.0 - 4.1.0 | 4.9+ | +| 1.3.4 - 1.3.5 | 3.0.0 - 4.1.0 | 4.9+ | +| 1.3.6 | 3.0.0 - 4.2.0 | 4.9+ | The following link which version of Gradle is required for each version of the Android Gradle plugin. For the best performance, you should use the latest possible version of both Gradle and the plugin. [Plugin version and Required Gradle version](https://developer.android.google.cn/studio/releases/gradle-plugin.html) ## Version Log +- [1.3.6]() + - Support AGP 4.2.0 [#290](https://github.com/kezong/fat-aar-android/issues/290) [#304](https://github.com/kezong/fat-aar-android/issues/304) + - Copy 'navigation' along with other R.$ classes. [#296](https://github.com/kezong/fat-aar-android/issues/296) - [1.3.5]() - Fix the bug that jar cannot be merged in some case. [#255](https://github.com/kezong/fat-aar-android/issues/255) [#288](https://github.com/kezong/fat-aar-android/issues/288) - Fix build error when use gradle 6.0-6.8. [#277](https://github.com/kezong/fat-aar-android/issues/277) diff --git a/README_CN.md b/README_CN.md index b4f47ff1..ca8121c8 100644 --- a/README_CN.md +++ b/README_CN.md @@ -2,7 +2,7 @@ [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/kezong/fat-aar-android/blob/master/LICENSE) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.kezong/fat-aar/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.kezong/fat-aar) -该插件提供了将library以及它依赖的library一起打包成一个完整aar的解决方案，支持AGP 3.0及以上。（目前测试的版本范围是AGP 3.0 - 4.1.1，Gradle 4.9 - 6.8） +该插件提供了将library以及它依赖的library一起打包成一个完整aar的解决方案，支持AGP 3.0及以上。（目前测试的版本范围是AGP 3.0 - 4.2.0，Gradle 4.9 - 6.8） ## 如何使用 @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.github.kezong:fat-aar:1.3.5' + classpath 'com.github.kezong:fat-aar:1.3.6' } } ``` @@ -156,6 +156,9 @@ AAR是Android提供的一种官方文件形式； [Gradle Plugin和所需求的Gradle版本官方文档](https://developer.android.google.cn/studio/releases/gradle-plugin.html) ## 更新日志 +- [1.3.6]() + - 支持AGP 4.2.0 [#290](https://github.com/kezong/fat-aar-android/issues/290) [#304](https://github.com/kezong/fat-aar-android/issues/304) + - 处理'navigation'资源. [#296](https://github.com/kezong/fat-aar-android/issues/296) - [1.3.5]() - 修复在仅有jar工程时jar无法合并的问题. [#255](https://github.com/kezong/fat-aar-android/issues/255) [#288](https://github.com/kezong/fat-aar-android/issues/288) - 修复在使用Gradle 6.0-6.8时的编译错误. [#277](https://github.com/kezong/fat-aar-android/issues/277) diff --git a/example/build.gradle b/example/build.gradle index e6117282..6dfc1332 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.2.0' - classpath 'com.github.kezong:fat-aar:1.3.5' + classpath 'com.github.kezong:fat-aar:1.3.6' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72" } } diff --git a/source/upload.gradle b/source/upload.gradle index ba7670a8..58304cfb 100644 --- a/source/upload.gradle +++ b/source/upload.gradle @@ -47,9 +47,8 @@ publishing { url = 'https://github.com/kezong/fat-aar-android' licenses { license { - //协议类型，一般默认Apache License2.0的话不用改： - name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + name = 'The MIT License' + url = 'https://opensource.org/licenses/MIT' } } developers { @@ -61,10 +60,8 @@ publishing { } // Version control info, if you're using GitHub, follow the format as seen here scm { - //修改成你的Git地址： connection = 'scm:git:github.com/kezong/fat-aar-android.git' developerConnection = 'scm:git:ssh://github.com/kezong/fat-aar-android.git' - //分支地址： url = 'https://github.com/kezong/fat-aar-android/tree/master' } // A slightly hacky fix so that your POM will include any transitive dependencies