Skip to content

Commit

Permalink
1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
galenlin committed Oct 16, 2017
1 parent eb7b11e commit 6833af6
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 12 deletions.
4 changes: 4 additions & 0 deletions Android/DevSample/buildSrc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.2.0 (2017-10-13)

版本同步

## 1.2.0-alpha6 (2017-06-16)

Feature:
Expand Down
2 changes: 1 addition & 1 deletion Android/DevSample/buildSrc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion Android/DevSample/buildSrc/bintray.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Android/DevSample/buildSrc/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
org.gradle.daemon=true

group=net.wequick.tools.build
version=1.2.0-alpha6
version=1.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -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)

/**
Expand Down
6 changes: 6 additions & 0 deletions Android/DevSample/small/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.2.0 (2017-10-13)

Bugfixes:

- 修正进程意外死亡重启后,StubActivity坑位问题 (#520, @xufan)

## 1.2.0-alpha6 (2017-06-16)

Bugfixes:
Expand Down
2 changes: 1 addition & 1 deletion Android/DevSample/small/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=net.wequick.small
version=1.2.0-alpha6
version=1.2.0
4 changes: 2 additions & 2 deletions Android/GETTING-STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand All @@ -47,7 +47,7 @@ apply plugin: 'net.wequick.small'

```groovy
small {
aarVersion = '1.2.0-alpha6'
aarVersion = '1.2.0'
}
```

Expand Down
4 changes: 2 additions & 2 deletions Android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
```

Expand Down
2 changes: 1 addition & 1 deletion Android/Sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions Android/templates/activities/SmallLauncher/globals.xml.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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-alpha6" />
<global id="smallAarVersion" value="1.2.0-alpha6" />
<global id="smallPluginVersion" value="1.2.0" />
<global id="smallAarVersion" value="1.2.0" />
</globals>

0 comments on commit 6833af6

Please sign in to comment.