From 64b80677142320c98f58dbc06c4543e7bb913eb1 Mon Sep 17 00:00:00 2001
From: galenlin <oolgloo.2012@gmail.com>
Date: Mon, 27 Mar 2017 23:48:27 +0800
Subject: [PATCH] 1.2.0-beta3

---
 Android/DevSample/buildSrc/CHANGELOG.md               | 11 +++++++++++
 Android/DevSample/buildSrc/README.md                  |  2 +-
 Android/DevSample/buildSrc/gradle.properties          |  2 +-
 Android/DevSample/small/CHANGELOG.md                  |  4 ++++
 Android/DevSample/small/gradle.properties             |  2 +-
 Android/GETTING-STARTED.md                            |  4 ++--
 Android/README.md                                     |  4 ++--
 Android/Sample/build.gradle                           |  4 ++--
 .../activities/SmallLauncher/globals.xml.ftl          |  4 ++--
 9 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Android/DevSample/buildSrc/CHANGELOG.md b/Android/DevSample/buildSrc/CHANGELOG.md
index 4a8d1352..1f399f1f 100644
--- a/Android/DevSample/buildSrc/CHANGELOG.md
+++ b/Android/DevSample/buildSrc/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.2.0-beta3 (2017-03-27)
+
+Bugfixes:
+
+  - 修正 Android Plugin 2.3.0 下未能正确保留插件模块 JNI 的问题 (@xufan)
+  - 修正span类型字符串(`<b>Hello</b>`)无法被正确编译的问题 (#335, @jasonrongdevelop)
+
+Other:
+
+  - 使用8个空格替代`\t`来打印编译log，以保证整齐
+
 ## 1.2.0-beta2 (2017-03-21)
 
 Bugfixes:
diff --git a/Android/DevSample/buildSrc/README.md b/Android/DevSample/buildSrc/README.md
index 4ca9ae38..d94001e4 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-beta2'
+          classpath 'net.wequick.tools.build:gradle-small:1.2.0-beta3'
       }
   }
 
diff --git a/Android/DevSample/buildSrc/gradle.properties b/Android/DevSample/buildSrc/gradle.properties
index 6625bab6..529bab28 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-beta2
+version=1.2.0-beta3
diff --git a/Android/DevSample/small/CHANGELOG.md b/Android/DevSample/small/CHANGELOG.md
index 6d9adf34..68d82bcc 100644
--- a/Android/DevSample/small/CHANGELOG.md
+++ b/Android/DevSample/small/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0-beta3 (2017-03-27)
+
+版本同步
+
 ## 1.2.0-beta2 (2017-03-21)
 
 版本同步
diff --git a/Android/DevSample/small/gradle.properties b/Android/DevSample/small/gradle.properties
index 05fb431b..1d3b543e 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-beta2
+version=1.2.0-beta3
diff --git a/Android/GETTING-STARTED.md b/Android/GETTING-STARTED.md
index 7fd8704e..2cf821b5 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-beta2'
+        classpath 'net.wequick.tools.build:gradle-small:1.2.0-beta3'
     }
 }
 
@@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small'
 
 ```groovy
 small {
-    aarVersion = '1.2.0-beta2'
+    aarVersion = '1.2.0-beta3'
 }
 ```
 
diff --git a/Android/README.md b/Android/README.md
index ee8ba12b..782e9ef2 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-beta2'
+            classpath 'net.wequick.tools.build:gradle-small:1.2.0-beta3'
         }
     }
     
     apply plugin: 'net.wequick.small'
     
     small {
-        aarVersion = '1.2.0-beta2'
+        aarVersion = '1.2.0-beta3'
     }
     ```
     
diff --git a/Android/Sample/build.gradle b/Android/Sample/build.gradle
index eb34cbe5..ceec4b25 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-beta2'
+        classpath 'net.wequick.tools.build:gradle-small:1.2.0-beta3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -27,7 +27,7 @@ apply plugin: 'net.wequick.small'
 
 small {
     buildToAssets = false
-    aarVersion = '1.2.0-beta2'
+    aarVersion = '1.2.0-beta3'
     android {
         compileSdkVersion = 25
         buildToolsVersion = "25.0.2"
diff --git a/Android/templates/activities/SmallLauncher/globals.xml.ftl b/Android/templates/activities/SmallLauncher/globals.xml.ftl
index 9908c093..d3602a09 100644
--- a/Android/templates/activities/SmallLauncher/globals.xml.ftl
+++ b/Android/templates/activities/SmallLauncher/globals.xml.ftl
@@ -5,6 +5,6 @@
     <global id="assetsOut" value="./app/src/main/assets" />
     <global id="mavenUrl" value="mavenCentral" />
     <global id="copyGradleSupported" type="boolean" value="${(compareVersions(gradlePluginVersion, '2.0') < 0)?string}" />
-    <global id="smallPluginVersion" value="1.2.0-beta2" />
-    <global id="smallAarVersion" value="1.2.0-beta2" />
+    <global id="smallPluginVersion" value="1.2.0-beta3" />
+    <global id="smallAarVersion" value="1.2.0-beta3" />
 </globals>