Bump github/codeql-action from 1 to 2

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

.github/workflows/build-test.yml

@@ -17,24 +17,27 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 20
         uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: 20
 
       - 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@v3
 
-      - name: Setup node 12
+      - name: Setup node 20
         uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: 20
 
       - run: npm ci
 
@@ -45,10 +48,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 20
         uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: 20
 
       - run: npm ci
 
@@ -59,15 +62,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11, windows-2019, windows-2022 ]
+        os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, windows-2019, windows-2022 ]
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 20
         uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: 20
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
 
       - run: npm ci
       - run: npm run build
@@ -81,10 +90,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup node 12
+      - name: Setup node 20
         uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: 20
 
       - run: npm ci
 

.github/workflows/codeql-analysis.yml

@@ -35,9 +35,9 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: 'javascript'
         
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/run.yml

@@ -35,11 +35,11 @@ jobs:
         with:
           path: ./build/
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 1.8
-          distribution: 'adopt'
+          java-version: 17
+          distribution: 'temurin'
 
       - 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
- - Accepting the SDK licenses
- 
+ - Downloading the SDK commandline tools, if the current version (11.0) is not found in either `$ANDROID_SDK_ROOT` or `$HOME/.android/sdk`.
+ - Accepting the SDK licenses.
+ - Installing `tools` and `platform-tools`.
+ - Adding `platform-tools` (contains adb) and `cmdline-tools/11.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
 
@@ -16,10 +25,11 @@ See [action.yml](action.yml)
 steps:
 - uses: actions/checkout@v3
 
-- name: Set up JDK 1.8
+- name: Set up JDK 17
   uses: actions/setup-java@v3
   with:
-    java-version: 1.8
+    java-version: '17'
+    distribution: 'temurin'
 
 - name: Setup Android SDK
   uses: android-actions/setup-android@v2

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: node20
   main: 'dist/index.js'
 
 branding:

package.json

@@ -25,26 +25,26 @@
   "author": "daveol",
   "license": "ISC",
   "dependencies": {
-    "@actions/cache": "^2.0.2",
-    "@actions/core": "^1.3.0",
-    "@actions/tool-cache": "^1.6.1",
-    "fs-extra": "^10.0.0"
+    "@actions/cache": "^3.2.2",
+    "@actions/core": "^1.10.1",
+    "@actions/tool-cache": "^2.0.1",
+    "fs-extra": "^11.1.1"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.11",
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.25",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "@vercel/ncc": "^0.33.4",
-    "eslint": "^8.13.0",
-    "eslint-plugin-github": "^4.3.6",
-    "eslint-plugin-jest": "^26.1.4",
-    "jest": "^27.5.1",
-    "jest-circus": "^27.0.6",
+    "@types/fs-extra": "^11.0.2",
+    "@types/jest": "^29.5.5",
+    "@types/node": "^20.6.5",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
+    "@vercel/ncc": "^0.38.0",
+    "eslint": "^8.50.0",
+    "eslint-plugin-github": "^4.10.0",
+    "eslint-plugin-jest": "^27.4.0",
+    "jest": "^29.7.0",
+    "jest-circus": "^29.7.0",
     "js-yaml": "^4.1.0",
-    "prettier": "^2.3.0",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.2.4"
+    "prettier": "^3.0.3",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2"
   }
 }

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 = '6.0'
-const COMMANDLINE_TOOLS_VERSION = '8092744'
+const CMDLINE_TOOLS_VERSION = '11.0'
+const COMMANDLINE_TOOLS_VERSION = '10406996'
 
 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 = ''