Skip to content

Commit

Permalink
update README
Browse files Browse the repository at this point in the history
  • Loading branch information
kezong committed Apr 8, 2020
1 parent 9326383 commit d907ceb
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

- [中文文档](./README_CN.md)

The solution of merging aar works with [the android gradle plugin][3], the android plugin's version of the development is `3.0.1` and higher. (Tested in gradle plugin 3.0.1 - 3.6.1, and gradle 4.6 - 6.0.1)
The solution of merging aar works with [the android gradle plugin][3], the android plugin's version of the development is `3.0.1` and higher. (Tested in gradle plugin 3.0.1 - 3.6.2, and gradle 4.6 - 6.0.1)

## Getting Started

Expand All @@ -20,7 +20,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:xxx'
classpath 'com.kezong:fat-aar:1.2.9'
classpath 'com.kezong:fat-aar:1.2.10'
}
}
```
Expand Down Expand Up @@ -100,16 +100,21 @@ See [anatomy of an aar file here][2].
- [x] R.class merge

## Gradle Version Support

| Version | Gradle Plugin | Gradle |
| :--------: | :--------:|:-------:|
| 1.0.1 | 3.1.0 - 3.2.1 | 4.4-6.0 |
| 1.1.6 | 3.1.0 - 3.4.1 | 4.4-6.0 |
| 1.1.10| 3.0.1 - 3.4.1 | 4.1-6.0 |
| 1.2.6 | 3.0.1 - 3.5.0 | 4.1-6.0 |
| 1.2.8 | 3.0.1+ | 4.1+ |
| 1.2.10| 3.6.0+ | 4.1+ |

The following table lists 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.2.10](<https://github.com/kezong/fat-aar-android/releases/tag/v1.2.10>)
- Fix build variants error in gradle plugin 3.6.+ [#126](https://github.com/kezong/fat-aar-android/issues/126)
- [1.2.9](<https://github.com/kezong/fat-aar-android/releases/tag/v1.2.9>)
- adapt gradle plugin 3.6.1 [#120](https://github.com/kezong/fat-aar-android/issues/120)
- [1.2.8](<https://github.com/kezong/fat-aar-android/releases/tag/v1.2.8>)
Expand Down
9 changes: 7 additions & 2 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
[![Download](https://api.bintray.com/packages/kezong/maven/fat-aar/images/download.svg)](https://bintray.com/kezong/maven/fat-aar/_latestVersion)

该插件提供了将library以及它依赖的module一起打包成一个完整aar的解决方案,支持gradle plugin 3.0.1及以上。(目前测试的版本范围是gradle plugin 3.0.1 - 3.6.1,gradle 4.6 - 6.0.1)
该插件提供了将library以及它依赖的module一起打包成一个完整aar的解决方案,支持gradle plugin 3.0.1及以上。(目前测试的版本范围是gradle plugin 3.0.1 - 3.6.2,gradle 4.6 - 6.0.1)

## 如何使用

Expand All @@ -17,7 +17,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:xxx'
classpath 'com.kezong:fat-aar:1.2.9'
classpath 'com.kezong:fat-aar:1.2.10'
}
}
```
Expand Down Expand Up @@ -107,8 +107,13 @@ AAR是Android提供的一种官方文件形式;
| 1.1.10| 3.0.1 - 3.4.1 | 4.1-6.0 |
| 1.2.6 | 3.0.1 - 3.5.0 | 4.1-6.0 |
| 1.2.8 | 3.0.1+ | 4.1+ |
| 1.2.10| 3.6.0+ | 5.4.1+ |

[Gradle Plugin和所需求的Gradle版本官方文档](https://developer.android.google.cn/studio/releases/gradle-plugin.html)

## 更新日志
- [1.2.10](<https://github.com/kezong/fat-aar-android/releases/tag/v1.2.10>)
- 修复在gradle plugin 3.6.0下编译variants会error的情况 [#126](https://github.com/kezong/fat-aar-android/issues/126)
- [1.2.9](<https://github.com/kezong/fat-aar-android/releases/tag/v1.2.8>)
- 适配gradle plugin 3.6.1 [#120](https://github.com/kezong/fat-aar-android/issues/120)
- [1.2.8](<https://github.com/kezong/fat-aar-android/releases/tag/v1.2.8>)
Expand Down

0 comments on commit d907ceb

Please sign in to comment.