diff --git a/Android/DevSample/buildSrc/CHANGELOG.md b/Android/DevSample/buildSrc/CHANGELOG.md index e1515838..a7882a69 100644 --- a/Android/DevSample/buildSrc/CHANGELOG.md +++ b/Android/DevSample/buildSrc/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.2.0-alpha5 (2017-06-11) + +Bugfixes: + + - 修正全局 `supportVersion` 导致的 `multidex` 依赖无法解析问题 (#456) + - 修正 `cleanLib` 没有 clean 宿主分身的问题 + ## 1.2.0-alpha4 (2017-06-06) Bugfixes: diff --git a/Android/DevSample/buildSrc/README.md b/Android/DevSample/buildSrc/README.md index 21176f63..b8b8bbee 100644 --- a/Android/DevSample/buildSrc/README.md +++ b/Android/DevSample/buildSrc/README.md @@ -12,7 +12,7 @@ gradle-small-plugin是一个gradle插件,用来打包安卓组件包。 } dependencies { classpath 'com.android.tools.build:gradle:1.5.0' - classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha4' + classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha5' } } diff --git a/Android/DevSample/buildSrc/gradle.properties b/Android/DevSample/buildSrc/gradle.properties index b9af5c2e..161702d4 100644 --- a/Android/DevSample/buildSrc/gradle.properties +++ b/Android/DevSample/buildSrc/gradle.properties @@ -20,4 +20,4 @@ org.gradle.daemon=true group=net.wequick.tools.build -version=1.2.0-alpha4 +version=1.2.0-alpha5 diff --git a/Android/DevSample/buildSrc/src/main/groovy/net/wequick/gradle/RootExtension.groovy b/Android/DevSample/buildSrc/src/main/groovy/net/wequick/gradle/RootExtension.groovy index 0a1298b0..e2932495 100644 --- a/Android/DevSample/buildSrc/src/main/groovy/net/wequick/gradle/RootExtension.groovy +++ b/Android/DevSample/buildSrc/src/main/groovy/net/wequick/gradle/RootExtension.groovy @@ -35,7 +35,7 @@ public class RootExtension extends BaseExtension { private static final VersionNumber REQUIRED_AAR_REVISION = VersionNumber.parse(REQUIRED_AAR_VERSION) /** The built version of gradle-small plugin */ - public static final String PLUGIN_VERSION = '1.2.0-alpha4' + public static final String PLUGIN_VERSION = '1.2.0-alpha5' public static final VersionNumber PLUGIN_REVISION = VersionNumber.parse(PLUGIN_VERSION) /** diff --git a/Android/DevSample/small/CHANGELOG.md b/Android/DevSample/small/CHANGELOG.md index d0d6f370..42e76924 100644 --- a/Android/DevSample/small/CHANGELOG.md +++ b/Android/DevSample/small/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.0-alpha5 (2017-06-11) + +版本同步 + ## 1.2.0-alpha4 (2017-06-06) Performance: diff --git a/Android/DevSample/small/gradle.properties b/Android/DevSample/small/gradle.properties index 17ca20d6..c20933d4 100644 --- a/Android/DevSample/small/gradle.properties +++ b/Android/DevSample/small/gradle.properties @@ -1,2 +1,2 @@ group=net.wequick.small -version=1.2.0-alpha4 +version=1.2.0-alpha5 diff --git a/Android/GETTING-STARTED.md b/Android/GETTING-STARTED.md index 42cd75df..4e0e4cb7 100644 --- a/Android/GETTING-STARTED.md +++ b/Android/GETTING-STARTED.md @@ -32,7 +32,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.3.0' - classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha4' + classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha5' } } @@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small' ```groovy small { - aarVersion = '1.2.0-alpha4' + aarVersion = '1.2.0-alpha5' } ``` diff --git a/Android/README.md b/Android/README.md index ed4e1fc7..0637bf16 100644 --- a/Android/README.md +++ b/Android/README.md @@ -26,14 +26,14 @@ ```groovy buildscript { dependencies { - classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha4' + classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha5' } } apply plugin: 'net.wequick.small' small { - aarVersion = '1.2.0-alpha4' + aarVersion = '1.2.0-alpha5' } ``` diff --git a/Android/Sample/build.gradle b/Android/Sample/build.gradle index 20bf7613..bf06416a 100644 --- a/Android/Sample/build.gradle +++ b/Android/Sample/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha4' + classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/Android/templates/activities/SmallLauncher/globals.xml.ftl b/Android/templates/activities/SmallLauncher/globals.xml.ftl index 0655e5c4..83a51a91 100644 --- a/Android/templates/activities/SmallLauncher/globals.xml.ftl +++ b/Android/templates/activities/SmallLauncher/globals.xml.ftl @@ -5,6 +5,6 @@ - - + +