Merge branch 'master' into release/v2

* master:
  Prepare for release 2.3.1.
  Update Gradle to 6.1.1 for test-fixture.
  Build tools 29.0.3.
  Validate Gradle Wrapper.
This commit is contained in:
Yang Chen
2020-01-31 11:47:56 +11:00
6 changed files with 11 additions and 4 deletions
+3
View File
@@ -18,6 +18,9 @@ jobs:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: build, test and lint - name: build, test and lint
run: | run: |
npm install npm install
+4
View File
@@ -1,5 +1,9 @@
# Change Log # Change Log
## v2.3.1
* Bumped Android Build tools to 29.0.3.
## v2.3.0 ## v2.3.0
* Added support for running the action with Java 9+ by forcing SDK manager and AVD manager to use Java 8. * Added support for running the action with Java 9+ by forcing SDK manager and AVD manager to use Java 8.
+1 -1
View File
@@ -16,7 +16,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const exec = __importStar(require("@actions/exec")); const exec = __importStar(require("@actions/exec"));
const BUILD_TOOLS_VERSION = '29.0.2'; const BUILD_TOOLS_VERSION = '29.0.3';
/** /**
* Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator, * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
* and the system image for the chosen API level, CPU arch, and target. * and the system image for the chosen API level, CPU arch, and target.
+1 -1
View File
@@ -1,6 +1,6 @@
import * as exec from '@actions/exec'; import * as exec from '@actions/exec';
const BUILD_TOOLS_VERSION = '29.0.2'; const BUILD_TOOLS_VERSION = '29.0.3';
/** /**
* Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator, * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion "29.0.2" buildToolsVersion "29.0.3"
defaultConfig { defaultConfig {
applicationId "com.example.testapp" applicationId "com.example.testapp"
+1 -1
View File
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip