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>
[README.md] Update JDK version in step name
2025-12-24 16:08:22 +00:00 · 2023-09-25 03:55:25 +03:00 · 2023-09-25 03:53:50 +03:00 · 2023-09-25 03:53:00 +03:00 · 2023-09-25 03:48:44 +03:00 · 2023-09-25 03:37:15 +03:00
9 changed files with 5589 additions and 3375 deletions
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -17,10 +17,10 @@ jobs:
    steps:
      - uses: actions/checkout@v3

-      - name: Setup node 16
+      - name: Setup node 20
        uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: 20

      - run: npm ci

@@ -34,10 +34,10 @@ jobs:
    steps:
      - uses: actions/checkout@v3

-      - name: Setup node 16
+      - name: Setup node 20
        uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: 20

      - run: npm ci

@@ -48,10 +48,10 @@ jobs:
    steps:
      - uses: actions/checkout@v3

-      - name: Setup node 16
+      - name: Setup node 20
        uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: 20

      - run: npm ci

@@ -62,15 +62,21 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, 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 16
+      - name: Setup node 20
        uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          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
@@ -84,10 +90,10 @@ jobs:
    steps:
      - uses: actions/checkout@v3

-      - name: Setup node 16
+      - name: Setup node 20
        uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: 20

      - run: npm ci

--- a/.github/workflows/codeql-analysis.yml
+++ b/.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
--- a/.github/workflows/run.yml
+++ b/.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'
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
 ![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, if the current version (7.0) is not found in either `$ANDROID_SDK_ROOT` or `$HOME/.android/sdk`.
+ - 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/7.0/bin` (contains sdkmanager) to `$PATH`.
+ - 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.
@@ -25,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
--- a/action.yml
+++ b/action.yml
@@ -3,7 +3,7 @@ author: 'Android-Actions'
 description: 'Setup the Android SDK Tools and add them to the path'

 runs:
-  using: 'node16'
+  using: node20
  main: 'dist/index.js'

 branding:
--- a/dist/index.js
+++ b/dist/index.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -25,26 +25,26 @@
  "author": "daveol",
  "license": "ISC",
  "dependencies": {
-    "@actions/cache": "^3.0.0",
-    "@actions/core": "^1.3.0",
+    "@actions/cache": "^3.2.2",
+    "@actions/core": "^1.10.1",
    "@actions/tool-cache": "^2.0.1",
-    "fs-extra": "^10.0.0"
+    "fs-extra": "^11.1.1"
  },
  "devDependencies": {
-    "@types/fs-extra": "^9.0.11",
-    "@types/jest": "^28.1.6",
-    "@types/node": "^16.11.47",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "@vercel/ncc": "^0.34.0",
-    "eslint": "^8.13.0",
-    "eslint-plugin-github": "^4.3.6",
-    "eslint-plugin-jest": "^26.1.4",
-    "jest": "^28.1.3",
-    "jest-circus": "^28.1.3",
+    "@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": "^28.0.7",
-    "typescript": "^4.2.4"
+    "prettier": "^3.0.3",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2"
  }
 }
--- a/src/main.ts
+++ b/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 = '7.0'
-const COMMANDLINE_TOOLS_VERSION = '8512546'
+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`
Author	SHA1	Message	Date
dependabot[bot]	13f81365a4	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>	2023-09-25 03:55:25 +03:00
Vilius Sutkus '89	110787489d	[README.md] Update JDK version in step name	2023-09-25 03:53:50 +03:00
Vilius Sutkus '89	4ba30747dc	[CI] Use Temurin JDK. Adopt JDK is discontinued ( according to https://github.com/actions/setup-java#supported-distributions )	2023-09-25 03:53:00 +03:00
Omar Shehata	a3da945276	Fix README example	2023-09-25 03:48:44 +03:00
Vilius Sutkus '89	1cb03f027b	Update node dependencies & Rebuild	2023-09-25 03:37:15 +03:00
Vilius Sutkus '89	ccc0939481	Use Node-20 instead of end-of-life Node-16 Would prefer to use Node-18, because it's LTS, but I can't, because it's not available: https://github.com/actions/runner-images/discussions/7664	2023-09-25 03:20:06 +03:00
Vilius Sutkus '89	fabcc053ca	[CI] Add macos-13 to test matrix	2023-09-25 03:14:01 +03:00
Vilius Sutkus '89	bee5ac3f90	Update cmdline-tools to 11.0 (latest)	2023-09-25 03:04:50 +03:00
Vilius Sutkus '89	26c86ac3f5	Update JDK to 17 (from 1.8). Required for current cmdline-tools	2023-09-25 03:03:19 +03:00
Vilius Sutkus '89	bc52f43eb3	[CI] Remove ubuntu-18.04 from test matrix	2023-09-25 03:02:55 +03:00
Simon Marquis	899d70efad	Update commandlinetools version to 9.0 (latest) https://developer.android.com/studio#command-line-tools-only	2023-09-25 02:57:03 +03:00
Vilius Sutkus '89	7c5672355a	Rebuild	2022-10-18 22:49:38 +03:00
Vilius Sutkus '89	be14762587	Update dependencies	2022-10-18 22:48:21 +03:00
dependabot[bot]	02a4c0fae6	Bump @actions/cache from 3.0.0 to 3.0.5 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>	2022-10-18 22:35:00 +03:00
dependabot[bot]	4963c9b31a	Bump @actions/core from 1.9.0 to 1.10.0 Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) --- updated-dependencies: - dependency-name: "@actions/core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-18 22:32:16 +03:00