diff --git a/Android/DevSample/buildSrc/CHANGELOG.md b/Android/DevSample/buildSrc/CHANGELOG.md
index 61f4e5fc..0f53beea 100644
--- a/Android/DevSample/buildSrc/CHANGELOG.md
+++ b/Android/DevSample/buildSrc/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.0-alpha1 (2017-10-16)
+
+版本同步
+
## 1.2.0 (2017-10-13)
版本同步
diff --git a/Android/DevSample/buildSrc/README.md b/Android/DevSample/buildSrc/README.md
index 656fa393..a8ec1de8 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'
+ classpath 'net.wequick.tools.build:gradle-small:1.3.0-alpha1'
}
}
diff --git a/Android/DevSample/buildSrc/bintray.gradle b/Android/DevSample/buildSrc/bintray.gradle
index 824c83a6..3db22c85 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.11'
+ compile 'org.codehaus.groovy:groovy-all:2.4.10'
}
apply from: 'provided.gradle'
diff --git a/Android/DevSample/buildSrc/gradle.properties b/Android/DevSample/buildSrc/gradle.properties
index cd625596..70b09d7c 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
+version=1.3.0-alpha1
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 f50b03d0..599651e3 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'
+ public static final String PLUGIN_VERSION = '1.3.0-alpha1'
public static final VersionNumber PLUGIN_REVISION = VersionNumber.parse(PLUGIN_VERSION)
private static final String BINDING_AAR_VERSION = '1.1.0'
diff --git a/Android/DevSample/small/CHANGELOG.md b/Android/DevSample/small/CHANGELOG.md
index 1c0e79ca..c1011b19 100644
--- a/Android/DevSample/small/CHANGELOG.md
+++ b/Android/DevSample/small/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.3.0-alpha1 (2017-10-16)
+
+Features:
+
+ - 支持 Android O (8.0) (#526, @zhengxiaopeng)
+
+Bugfixes:
+
+ - 修正合并资源时可能出现的 ConcurrentModificationException (#508, @zhengxiaopeng)
+
## 1.2.0 (2017-10-13)
Bugfixes:
diff --git a/Android/DevSample/small/gradle.properties b/Android/DevSample/small/gradle.properties
index bff14755..0f191eaa 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
+version=1.3.0-alpha1
diff --git a/Android/GETTING-STARTED.md b/Android/GETTING-STARTED.md
index d984f7e3..970588e3 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'
+ classpath 'net.wequick.tools.build:gradle-small:1.3.0-alpha1'
}
}
@@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small'
```groovy
small {
- aarVersion = '1.2.0'
+ aarVersion = '1.3.0-alpha1'
}
```
diff --git a/Android/README.md b/Android/README.md
index 79999e7e..cf93e3b6 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'
+ classpath 'net.wequick.tools.build:gradle-small:1.3.0-alpha1'
}
}
apply plugin: 'net.wequick.small'
small {
- aarVersion = '1.2.0'
+ aarVersion = '1.3.0-alpha1'
}
```
diff --git a/Android/Sample/build.gradle b/Android/Sample/build.gradle
index f5ee4746..db136912 100644
--- a/Android/Sample/build.gradle
+++ b/Android/Sample/build.gradle
@@ -2,12 +2,12 @@
buildscript {
repositories {
- mavenLocal()
+// mavenLocal()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
- classpath 'net.wequick.tools.build:gradle-small:1.2.0'
+ classpath 'net.wequick.tools.build:gradle-small:1.3.0-alpha1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -27,7 +27,7 @@ task clean(type: Delete) {
apply plugin: 'net.wequick.small'
small {
- aarVersion = "1.2.0-alpha5"
+ aarVersion = "1.3.0-alpha1"
buildToAssets = false
android {
compileSdkVersion = 26
diff --git a/Android/templates/activities/SmallLauncher/globals.xml.ftl b/Android/templates/activities/SmallLauncher/globals.xml.ftl
index ab92177f..c4fd0ced 100644
--- a/Android/templates/activities/SmallLauncher/globals.xml.ftl
+++ b/Android/templates/activities/SmallLauncher/globals.xml.ftl
@@ -5,6 +5,6 @@
-
-
+
+