Rebuild

Bumps [@actions/cache](https://github.com/actions/toolkit/tree/HEAD/packages/cache) from 3.0.0 to 3.0.5.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/cache/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/cache)

---
updated-dependencies:
- dependency-name: "@actions/cache"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.eslintrc.json

@@ -44,6 +44,7 @@
       "semi": "off",
       "@typescript-eslint/semi": ["error", "never"],
       "@typescript-eslint/type-annotation-spacing": "error",
+      "i18n-text/no-en": "warn",
       "@typescript-eslint/unbound-method": "error"
     },
     "env": {

.github/workflows/build-test.yml

@@ -15,26 +15,29 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 16
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '16'
 
       - run: npm ci
 
       - run: npm run build
 
+      - name: Check if dist/index.js needs to be rebuilt
+        run: diff <(git status dist/index.js --short) <(echo -n "")
+
   format-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 16
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '16'
 
       - run: npm ci
 
@@ -43,12 +46,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 16
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '16'
 
       - run: npm ci
 
@@ -59,15 +62,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2016, windows-2019 ]
+        os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022 ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 16
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '16'
 
       - run: npm ci
       - run: npm run build
@@ -79,12 +82,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 16
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '16'
 
       - run: npm ci
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,43 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '44 12 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+      
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: 'javascript'
+        
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/run.yml

@@ -22,19 +22,24 @@ jobs:
           - ubuntu-latest
           - windows-latest
           - macos-latest
+
+    # Disabled, because daveol/SampleApplication is missing
+    if: ${{ false }}
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: daveol/SampleApplication
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: ./build/
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 1.8
+          distribution: 'adopt'
 
       - name: Setup Android SDK
         id: 'setup-android'

README.md

@@ -3,9 +3,18 @@
 ![Build & Test](https://github.com/android-actions/setup-android/workflows/Build%20&%20Test/badge.svg)
 
 This action sets up the Android SDK tools by:
- - Downloading the SDK commandline tools
+ - Downloading the SDK commandline tools, if the current version (7.0) is not found in either `$ANDROID_SDK_ROOT` or `$HOME/.android/sdk`.
- - Accepting the SDK licenses
+ - Accepting the SDK licenses.
- 
+ - Installing `tools` and `platform-tools`.
+ - Adding `platform-tools` (contains adb) and `cmdline-tools/7.0/bin` (contains sdkmanager) to `$PATH`.
+ - Setting up problem [matchers](/matchers.json).
+
+On Windows 2016 runners, this action also checks if `$ANDROID_SDK_ROOT` path contains spaces.
+If it does - it moves SDK to a path without spaces. This is needed because spaces are highly problematic:
+```
+C:\windows\system32\cmd.exe /D /S /C ""C:\Program Files (x86)\Android\android-sdk\cmdline-tools\3.0\bin\sdkmanager.bat" --licenses"
+Error: Could not find or load main class Files
+```
 
 # Usage
 
@@ -14,10 +23,10 @@ See [action.yml](action.yml)
 ## Basic
 ```yaml
 steps:
-- uses: actions/checkout@v2
+- uses: actions/checkout@v3
 
 - name: Set up JDK 1.8
-  uses: actions/setup-java@v1
+  uses: actions/setup-java@v3
   with:
     java-version: 1.8
 

action.yml

@@ -3,7 +3,7 @@ author: 'Android-Actions'
 description: 'Setup the Android SDK Tools and add them to the path'
 
 runs:
-  using: 'node12'
+  using: 'node16'
   main: 'dist/index.js'
 
 branding:

package.json

@@ -5,7 +5,7 @@
   "description": "setup android action",
   "main": "lib/main.js",
   "scripts": {
-    "build": "ncc build src/main.ts --out dist/ --minify",
+    "build": "ncc build src/main.ts --out dist/",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
     "lint": "eslint src/*.ts",
@@ -25,26 +25,26 @@
   "author": "daveol",
   "license": "ISC",
   "dependencies": {
-    "@actions/cache": "^1.0.6",
+    "@actions/cache": "^3.0.5",
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.10.0",
-    "@actions/tool-cache": "^1.6.1",
+    "@actions/tool-cache": "^2.0.1",
-    "fs-extra": "^9.1.0"
+    "fs-extra": "^10.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.20",
+    "@types/fs-extra": "^9.0.13",
-    "@types/node": "^14.14.31",
+    "@types/jest": "^29.2.0",
-    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@types/node": "^16.11.66",
-    "@typescript-eslint/parser": "^4.15.1",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@types/fs-extra": "^9.0.6",
+    "@typescript-eslint/parser": "^5.40.1",
-    "@zeit/ncc": "^0.22.3",
+    "@vercel/ncc": "^0.34.0",
-    "eslint": "^7.20.0",
+    "eslint": "^8.25.0",
-    "eslint-plugin-github": "^4.1.1",
+    "eslint-plugin-github": "^4.4.0",
-    "eslint-plugin-jest": "^24.1.5",
+    "eslint-plugin-jest": "^27.1.3",
-    "jest": "^26.6.3",
+    "jest": "^29.2.1",
-    "jest-circus": "^26.6.3",
+    "jest-circus": "^29.2.1",
-    "js-yaml": "^3.14.1",
+    "js-yaml": "^4.1.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.7.1",
-    "ts-jest": "^26.5.1",
+    "ts-jest": "^29.0.3",
-    "typescript": "^4.1.5"
+    "typescript": "^4.8.4"
   }
 }

src/main.ts

@@ -6,8 +6,8 @@ import * as fs from 'fs'
 import * as fse from 'fs-extra'
 import * as os from 'os'
 
-const CMDLINE_TOOLS_VERSION = '3.0'
+const CMDLINE_TOOLS_VERSION = '7.0'
-const COMMANDLINE_TOOLS_VERSION = '6858069'
+const COMMANDLINE_TOOLS_VERSION = '8512546'
 
 const COMMANDLINE_TOOLS_WIN_URL = `https://dl.google.com/android/repository/commandlinetools-win-${COMMANDLINE_TOOLS_VERSION}_latest.zip`
 const COMMANDLINE_TOOLS_MAC_URL = `https://dl.google.com/android/repository/commandlinetools-mac-${COMMANDLINE_TOOLS_VERSION}_latest.zip`
@@ -48,6 +48,17 @@ function findPreinstalledSdkManager(): {
   result.exePath = getSdkManagerPath('latest')
   result.isFound = fs.existsSync(result.exePath)
   if (result.isFound) {
+    const propertiesFile = path.join(
+      ANDROID_SDK_ROOT,
+      'cmdline-tools',
+      'latest',
+      'source.properties'
+    )
+    if (fs.existsSync(propertiesFile)) {
+      result.isCorrectVersion = fs
+        .readFileSync(propertiesFile, 'utf8')
+        .includes(`Pkg.Revision=${CMDLINE_TOOLS_VERSION}`)
+    }
     return result
   }
   result.exePath = ''
@@ -117,13 +128,19 @@ async function installSdkManager(): Promise<string> {
       CMDLINE_TOOLS_VERSION
     )
 
+    // Create parent directory
     fs.mkdirSync(path.dirname(desiredLocation), {recursive: true})
-    // @TODO: use io.mv instead of fs-extra once following issue is resolved:
+
+    // Make sure we don't have leftover target directory (happens sometimes...)
+    if (fs.existsSync(desiredLocation)) fse.removeSync(desiredLocation)
+
+    // @TODO: use io.mv instead of fs-extra.moveSync once following issue is resolved:
     // https://github.com/actions/toolkit/issues/706
     fse.moveSync(
       path.join(cmdlineToolsExtractedLocation, 'cmdline-tools'),
       desiredLocation
     )
+    fse.removeSync(cmdlineToolsExtractedLocation)
 
     sdkManager.exePath = getSdkManagerPath(CMDLINE_TOOLS_VERSION)
     sdkManager.isCorrectVersion = true

tsconfig.json

@@ -6,7 +6,8 @@
       "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
       "strict": true,                           /* Enable all strict type-checking options. */
       "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
-      "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+      "esModuleInterop": true,                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+      "moduleResolution": "node"
     },
     "exclude": ["node_modules", "**/*.test.ts"]
 }