From 19d9ac1e3dbf0653f40d4339fe6e7708b957f767 Mon Sep 17 00:00:00 2001 From: Ali Faiz Date: Mon, 6 May 2024 16:11:45 -0700 Subject: [PATCH 1/5] Upgrade logback dependencies to 1.5.1 This will address security vulnerabilities present in previous versions --- rollbar-logback/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rollbar-logback/build.gradle b/rollbar-logback/build.gradle index e0ba92d2..3a5fc926 100644 --- a/rollbar-logback/build.gradle +++ b/rollbar-logback/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rollbar-java') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - api group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3' -} \ No newline at end of file + api group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.1' + api group: 'ch.qos.logback', name: 'logback-core', version: '1.5.1' +} From 7810a131a3200b918d2db5a0f2885fd569257c38 Mon Sep 17 00:00:00 2001 From: Ali Faiz Date: Mon, 6 May 2024 16:42:14 -0700 Subject: [PATCH 2/5] Try to examine the android sdk folder --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fd5b607..3cfecf35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,9 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} + ls -a ${ANDROID_SDK_ROOT} + ls -a ${ANDROID_SDK_ROOT}/tools + ls -la ${ANDROID_SDK_ROOT}/tools/bin ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version From 8f5ece3a223387c3a6d4a9ddca702e2056a910eb Mon Sep 17 00:00:00 2001 From: Ali Faiz Date: Mon, 6 May 2024 16:54:21 -0700 Subject: [PATCH 3/5] list cmdline-tools files --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cfecf35..61ac9c69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,8 +58,8 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ls -a ${ANDROID_SDK_ROOT} - ls -a ${ANDROID_SDK_ROOT}/tools - ls -la ${ANDROID_SDK_ROOT}/tools/bin + ls -a ${ANDROID_SDK_ROOT}/cmdline-tools + ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/bin ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version From c0036f110fac65836a19ee958099e588afcf862c Mon Sep 17 00:00:00 2001 From: Ali Faiz Date: Mon, 6 May 2024 16:57:50 -0700 Subject: [PATCH 4/5] More logging --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61ac9c69..674e5332 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,8 +58,8 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ls -a ${ANDROID_SDK_ROOT} - ls -a ${ANDROID_SDK_ROOT}/cmdline-tools - ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/bin + ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest + ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version From b8f93822a0531134b665fb31e900b6d90ad60e81 Mon Sep 17 00:00:00 2001 From: Ali Faiz Date: Mon, 6 May 2024 17:03:17 -0700 Subject: [PATCH 5/5] Use update sdkmanager location --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 674e5332..c04ee671 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,10 +57,7 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ls -a ${ANDROID_SDK_ROOT} - ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest - ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version javac -version