diff --git a/Android/DevSample/buildSrc/CHANGELOG.md b/Android/DevSample/buildSrc/CHANGELOG.md
index 5eaa382f..0f809996 100644
--- a/Android/DevSample/buildSrc/CHANGELOG.md
+++ b/Android/DevSample/buildSrc/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0 (2017-10-13)
+
+版本同步
+
## 1.2.0-alpha6 (2017-06-16)
Feature:
diff --git a/Android/DevSample/buildSrc/README.md b/Android/DevSample/buildSrc/README.md
index 6e4f7715..656fa393 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-alpha6'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0'
}
}
diff --git a/Android/DevSample/buildSrc/bintray.gradle b/Android/DevSample/buildSrc/bintray.gradle
index 3598edfd..824c83a6 100644
--- a/Android/DevSample/buildSrc/bintray.gradle
+++ b/Android/DevSample/buildSrc/bintray.gradle
@@ -13,7 +13,7 @@ repositories {
}
dependencies {
- compile 'org.codehaus.groovy:groovy-all:2.4.7'
+ compile 'org.codehaus.groovy:groovy-all:2.4.11'
}
apply from: 'provided.gradle'
diff --git a/Android/DevSample/buildSrc/gradle.properties b/Android/DevSample/buildSrc/gradle.properties
index 496ffbea..dcf9ba5c 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-alpha6
\ No newline at end of file
+version=1.2.0
\ 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 0faf3234..782f558f 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-alpha6'
+ public static final String PLUGIN_VERSION = '1.2.0'
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 e39e4bc4..2ee566fb 100644
--- a/Android/DevSample/small/CHANGELOG.md
+++ b/Android/DevSample/small/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.0 (2017-10-13)
+
+Bugfixes:
+
+ - 修正进程意外死亡重启后,StubActivity坑位问题 (#520, @xufan)
+
## 1.2.0-alpha6 (2017-06-16)
Bugfixes:
diff --git a/Android/DevSample/small/gradle.properties b/Android/DevSample/small/gradle.properties
index e1084d32..bff14755 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-alpha6
+version=1.2.0
diff --git a/Android/GETTING-STARTED.md b/Android/GETTING-STARTED.md
index fb8b6e46..d984f7e3 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-alpha6'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0'
}
}
@@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small'
```groovy
small {
- aarVersion = '1.2.0-alpha6'
+ aarVersion = '1.2.0'
}
```
diff --git a/Android/README.md b/Android/README.md
index dc6b2810..79999e7e 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-alpha6'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0'
}
}
apply plugin: 'net.wequick.small'
small {
- aarVersion = '1.2.0-alpha6'
+ aarVersion = '1.2.0'
}
```
diff --git a/Android/Sample/build.gradle b/Android/Sample/build.gradle
index ce0f2720..e0f077d6 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-alpha6'
+ classpath 'net.wequick.tools.build:gradle-small:1.2.0'
// 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 26f7e52b..ab92177f 100644
--- a/Android/templates/activities/SmallLauncher/globals.xml.ftl
+++ b/Android/templates/activities/SmallLauncher/globals.xml.ftl
@@ -5,6 +5,6 @@
-
-
+
+