1.2.0-alpha2

wequick · May 21, 2017 · 1557a70 · 1557a70
1 parent 4b9a4ca
commit 1557a70
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 11 deletions.
diff --git a/Android/DevSample/buildSrc/CHANGELOG.md b/Android/DevSample/buildSrc/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.0-alpha2 (2017-05-21)
+
+Bugfixes:
+
+  - 修正远程引用 gradle-small 时未能兼容 Kotlin 的问题
+
 ## 1.2.0-alpha1 (2017-05-21)
 
 Features:

diff --git 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-alpha1'
+          classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha2'
       }
   }
 

diff --git 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-alpha1
+version=1.2.0-alpha2
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
@@ -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-alpha1'
+    public static final String PLUGIN_VERSION = '1.2.0-alpha2'
     public static final VersionNumber PLUGIN_REVISION = VersionNumber.parse(PLUGIN_VERSION)
 
     /** 

diff --git a/Android/DevSample/publish b/Android/DevSample/publish
@@ -0,0 +1,4 @@
+#!/bin/sh
+./gradlew smallLint -q
+./gradlew -p buildSrc bintrayUpload
+./gradlew -p small bintrayUpload
diff --git a/Android/DevSample/small/CHANGELOG.md b/Android/DevSample/small/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0-alpha2 (2017-05-21)
+
+版本同步
+
 ## 1.2.0-alpha1 (2017-05-21)
 
 Bugfixes:

diff --git a/Android/DevSample/small/gradle.properties b/Android/DevSample/small/gradle.properties
@@ -1,2 +1,2 @@
 group=net.wequick.small
-version=1.2.0-alpha1
+version=1.2.0-alpha2
diff --git 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-alpha1'
+        classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha2'
     }
 }
 
@@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small'
 
 ```groovy
 small {
-    aarVersion = '1.2.0-alpha1'
+    aarVersion = '1.2.0-alpha2'
 }
 ```
 

diff --git 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-alpha1'
+            classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha2'
         }
     }
     
     apply plugin: 'net.wequick.small'
     
     small {
-        aarVersion = '1.2.0-alpha1'
+        aarVersion = '1.2.0-alpha2'
     }
     ```
 

diff --git 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-alpha1'
+        classpath 'net.wequick.tools.build:gradle-small:1.2.0-alpha2'
         // 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
@@ -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-alpha1" />
-    <global id="smallAarVersion" value="1.2.0-alpha1" />
+    <global id="smallPluginVersion" value="1.2.0-alpha2" />
+    <global id="smallAarVersion" value="1.2.0-alpha2" />
 </globals>