Skip to content

Commit 5dd12aa

Browse files
committed
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.
2 parents d27f7ec + e53c6d9 commit 5dd12aa

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

.github/workflows/workflow.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
- name: checkout
1919
uses: actions/checkout@v2
2020

21+
- name: validate gradle wrapper
22+
uses: gradle/wrapper-validation-action@v1
23+
2124
- name: build, test and lint
2225
run: |
2326
npm install

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## v2.3.1
4+
5+
* Bumped Android Build tools to 29.0.3.
6+
37
## v2.3.0
48

59
* Added support for running the action with Java 9+ by forcing SDK manager and AVD manager to use Java 8.

lib/sdk-installer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
1616
};
1717
Object.defineProperty(exports, "__esModule", { value: true });
1818
const exec = __importStar(require("@actions/exec"));
19-
const BUILD_TOOLS_VERSION = '29.0.2';
19+
const BUILD_TOOLS_VERSION = '29.0.3';
2020
/**
2121
* Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
2222
* and the system image for the chosen API level, CPU arch, and target.

src/sdk-installer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as exec from '@actions/exec';
22

3-
const BUILD_TOOLS_VERSION = '29.0.2';
3+
const BUILD_TOOLS_VERSION = '29.0.3';
44

55
/**
66
* 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
44

55
android {
66
compileSdkVersion 29
7-
buildToolsVersion "29.0.2"
7+
buildToolsVersion "29.0.3"
88

99
defaultConfig {
1010
applicationId "com.example.testapp"

test-fixture/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 commit comments

Comments
 (0)