From 1eceb3d09ecbaabf618da4a2877b58c31c66f51c Mon Sep 17 00:00:00 2001
From: Maik Hummel <6891349+beevelop@users.noreply.github.com>
Date: Sat, 30 Dec 2023 17:20:46 +0100
Subject: [PATCH] feat: upgrade for Dec 23 (#41)

* feat: update command line tools to v10406996

* chore: update README

* chore(CI): update Ubuntu version for runner

* feat: add dependabot configuration for auto-updates
---
 .github/dependabot.yml       | 12 ++++++++++++
 .github/workflows/docker.yml | 13 +------------
 Dockerfile                   |  2 +-
 README.md                    |  1 +
 4 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..2cd69f2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  open-pull-requests-limit: 1
+- package-ecosystem: "docker"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  open-pull-requests-limit: 1
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6be7687..bd5dca4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     steps:
       - name: Check out the repo
@@ -54,14 +54,3 @@ jobs:
           labels: ${{ steps.docker_meta.outputs.labels }}
           # cache-from: type=local,src=${{ github.workspace }}/cache
           # cache-to: type=local,dest=${{ github.workspace }}/cache
-      # - name: Run Trivy vulnerability scanner
-      #   uses: aquasecurity/trivy-action@0.0.14
-      #   with:
-      #     image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
-      #     format: "template"
-      #     template: "@/contrib/sarif.tpl"
-      #     output: "trivy-results.sarif"
-      # - name: Upload Trivy scan results to GitHub Security tab
-      #   uses: github/codeql-action/upload-sarif@v1
-      #   with:
-      #     sarif_file: "trivy-results.sarif"
diff --git a/Dockerfile b/Dockerfile
index a6366c0..efd28d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM beevelop/java
 
 # https://developer.android.com/studio/#downloads
-ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip" \
+ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" \
     ANDROID_BUILD_TOOLS_VERSION=34.0.0 \
     ANT_HOME="/usr/share/ant" \
     MAVEN_HOME="/usr/share/maven" \
diff --git a/README.md b/README.md
index c1553a4..03845a7 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ The usage of the Android SDK requires you to accept the licenses
 
 - [Command Line Tools Download](https://developer.android.com/studio#span-idcommand-toolsa-namecmdline-toolsacommand-line-tools-onlyspan)
 - List build-tools versions: `sdkmanager --sdk_root=${ANDROID_SDK_ROOT}  --list | grep build-tools`
+  - [SDK Build Tools release notes](https://developer.android.com/tools/releases/build-tools)
 - List platforms: `sdkmanager --sdk_root=${ANDROID_SDK_ROOT}  --list | grep 'platforms:'`
 
 ---