Merge branch 'master' into icsaba/drop-jdk7-and-fix-ci

rollbar · Sep 13, 2024 · 1a477ec · 1a477ec
2 parents 7839110 + 2f88e1e
commit 1a477ec
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,17 +81,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-#      - name: Set up Java 11 for the Android SDK Manager
-#        uses: actions/setup-java@v4
-#        with:
-#          java-version: 11
-#          distribution: 'zulu'
-#          cache: 'gradle'
-#
-#      - name: Install Android SDK
-#        run: |
-#          echo "Android SDK Manager version: `${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version`"
-#          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-27" "build-tools;30.0.3"
+      - name: Set up Java 11 for the Android SDK Manager
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Install Android SDK
+        run: |
+          echo "Android SDK Manager version: `${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version`"
+          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-27" "build-tools;28.0.3"
 
       - name: Set up Java 8 for the build
         uses: actions/setup-java@v4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+# 1.10.3
+
+### rollbar-logback
+- Update Logback to version 1.3.14 [#310](https://github.com/rollbar/rollbar-java/pull/310)
+
+### rollbar-java
+- Fix: Log when the error reports folder can't be created instead of throwing an Exception, to
+prevent silent crashes [#318](https://github.com/rollbar/rollbar-java/pull/318)
+
 # 1.10.0
 
 - Add support for Spring 6.x and Spring Boot 3.x. [#302](https://github.com/rollbar/rollbar-java/pull/302)

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.10.2-SNAPSHOT-2024070701
+VERSION_NAME=1.10.3
 GROUP=com.rollbar
 
 POM_DESCRIPTION=For connecting your applications built on the JVM to Rollbar for Error Reporting

diff --git a/rollbar-java/src/main/java/com/rollbar/notifier/sender/queue/DiskQueue.java b/rollbar-java/src/main/java/com/rollbar/notifier/sender/queue/DiskQueue.java
@@ -41,14 +41,18 @@ private DiskQueue(Builder builder) {
     this.maxSize = builder.maxSize;
     this.queueFolder = builder.queueFolder;
 
+    /*
+    A RuntimeException can cause a silent crash, since the error would not be saved and in the next
+    session there would be no payload to send. So we just log the error.
+    */
     if (!this.queueFolder.exists()) {
       if (!this.queueFolder.mkdirs()) {
-        throw new RuntimeException("Could not create folder: " + queueFolder);
+        LOGGER.error("Could not create folder: {}", queueFolder);
       }
     }
 
     if (!this.queueFolder.canRead() || !this.queueFolder.canWrite()) {
-      throw new RuntimeException("Not enough permissions folder: " + queueFolder);
+      LOGGER.error("Not enough permissions folder: {}", queueFolder);
     }
   }
 

diff --git 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'
-}
+    api group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.14'
+    api group: 'ch.qos.logback', name: 'logback-core', version: '1.3.14'
+}