diff --git a/CHANGELOG.md b/CHANGELOG.md index 53afd6a..118f52a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,14 @@ ## [Unreleased] -## 1.1.3 +## 1.2.0 -- 修复在开启instant_run的情况下编译出错的问题 - 添加FragmentTransactionUriRequest和基类,支持Activity to Fragment和Fragment to Fragment 的路由跳转 - 修改PageAnnotationProcessor,支持@RouterPage注解的Fragment的自动配置FragmentTransactionHandler +- 修复在开启instant_run的情况下编译出错的问题 +- 修复多模块下dex archive merge失败问题 +- 修复URI分发路径不匹配问题 + ## 1.1.2 diff --git a/README.md b/README.md index 11acc27..ab2f310 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![](docs/images/banner.png) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://raw.githubusercontent.com/meituan/WMRouter/master/LICENSE) -[![Release Version](https://img.shields.io/badge/release-1.1.2-red.svg)](https://github.com/meituan/WMRouter/releases) +[![Release Version](https://img.shields.io/badge/release-1.2.0-red.svg)](https://github.com/meituan/WMRouter/releases) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/meituan/WMRouter/pulls) WMRouter是一款Android路由框架,基于组件化的设计思路,有功能灵活、使用简单的特点。 diff --git a/gradle.properties b/gradle.properties index 108c9b2..710e04f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ POM_NAME=waimai_android_router POM_ARTIFACT_ID=router POM_PACKAGING=aar -VERSION_NAME=1.1.2 +VERSION_NAME=1.2.0 VERSION_CODE=1 GROUP=com.sankuai.waimai.router SUPPORT_VERSION=26.0.2