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.
ReactiveCircus · Jan 31, 2020 · 5dd12aa · 5dd12aa
2 parents d27f7ec + e53c6d9
commit 5dd12aa
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -18,6 +18,9 @@ jobs:
     - name: checkout
       uses: actions/checkout@v2
 
+    - name: validate gradle wrapper
+      uses: gradle/wrapper-validation-action@v1
+
     - name: build, test and lint
       run: |
         npm install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.3.1
+
+* Bumped Android Build tools to 29.0.3.
+
 ## v2.3.0
 
 * Added support for running the action with Java 9+ by forcing SDK manager and AVD manager to use Java 8.

diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
@@ -16,7 +16,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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,
  * and the system image for the chosen API level, CPU arch, and target.

diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -1,6 +1,6 @@
 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,

diff --git a/test-fixture/app/build.gradle b/test-fixture/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.example.testapp"

diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/test-fixture/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 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