Merge branch 'master' into release/v2

* master:
  Prepare for release 2.3.2.
  Fix escaped environment variables in script.

.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
@@ -43,5 +46,6 @@ jobs:
         emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         script: |
+          echo $GITHUB_REPOSITORY
           ./gradlew help
           ./gradlew connectedDebugAndroidTest

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## v2.3.2
+
+* Fixed an issue where environment variables are escaped in script.
+
+## 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.

lib/main.js

@@ -84,7 +84,7 @@ function run() {
             // execute the custom script
             try {
                 for (const script of scripts) {
-                    yield exec.exec(`${script}`);
+                    yield exec.exec(`sh -c \\"${script}"`);
                 }
             }
             catch (error) {

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.

src/main.ts

@@ -79,7 +79,7 @@ async function run() {
     // execute the custom script
     try {
       for (const script of scripts) {
-        await exec.exec(`${script}`);
+        await exec.exec(`sh -c \\"${script}"`);
       }
     } catch (error) {
       core.setFailed(error.message);

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,

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"

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