diff --git a/Android/DevSample/buildSrc/CHANGELOG.md b/Android/DevSample/buildSrc/CHANGELOG.md
index a7882a69..5eaa382f 100644
--- a/Android/DevSample/buildSrc/CHANGELOG.md
+++ b/Android/DevSample/buildSrc/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.2.0-alpha6 (2017-06-16)
+
+Feature:
+
+ - `smallLint` 增加对宿主 `bundle.json` 配置校验
+
+Bugfixes:
+
+ - 修正未正确将 AAR 内部携带的 jar 打包入插件的问题
+ - 修正当模块名形如 'xx-1.0.0' 误被识别为插件模块的问题
+
## 1.2.0-alpha5 (2017-06-11)
Bugfixes:
diff --git a/Android/DevSample/buildSrc/README.md b/Android/DevSample/buildSrc/README.md
index b8b8bbee..6e4f7715 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-alpha5'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha6'
}
}
diff --git a/Android/DevSample/buildSrc/gradle.properties b/Android/DevSample/buildSrc/gradle.properties
index 161702d4..496ffbea 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-alpha5
+version=1.2.0-alpha6
\ No newline at end of file
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 e2932495..0faf3234 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-alpha5'
+ public static final String PLUGIN_VERSION = '1.2.0-alpha6'
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 42e76924..e39e4bc4 100644
--- a/Android/DevSample/small/CHANGELOG.md
+++ b/Android/DevSample/small/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.0-alpha6 (2017-06-16)
+
+Bugfixes:
+
+ - 修正当前进程 Service 从后台唤起应用时未启动 Small 环境的问题
+
## 1.2.0-alpha5 (2017-06-11)
版本同步
diff --git a/Android/DevSample/small/gradle.properties b/Android/DevSample/small/gradle.properties
index c20933d4..e1084d32 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-alpha5
+version=1.2.0-alpha6
diff --git a/Android/GETTING-STARTED.md b/Android/GETTING-STARTED.md
index 4e0e4cb7..fb8b6e46 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-alpha5'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha6'
}
}
@@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small'
```groovy
small {
- aarVersion = '1.2.0-alpha5'
+ aarVersion = '1.2.0-alpha6'
}
```
diff --git a/Android/README.md b/Android/README.md
index 0637bf16..dc6b2810 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-alpha5'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha6'
}
}
apply plugin: 'net.wequick.small'
small {
- aarVersion = '1.2.0-alpha5'
+ aarVersion = '1.2.0-alpha6'
}
```
diff --git a/Android/Sample/build.gradle b/Android/Sample/build.gradle
index bf06416a..ce0f2720 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-alpha5'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha6'
// 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 83a51a91..26f7e52b 100644
--- a/Android/templates/activities/SmallLauncher/globals.xml.ftl
+++ b/Android/templates/activities/SmallLauncher/globals.xml.ftl
@@ -5,6 +5,6 @@
-
-
+
+