From c5e54f13b8c31a711801904082cbb4496b8ad7ab Mon Sep 17 00:00:00 2001
From: chris <christian.buongarzoni@gmail.com>
Date: Fri, 27 Jun 2025 02:11:10 -0300
Subject: [PATCH 1/4] build: update compile and target sdk to 33

---
 examples/rollbar-android/build.gradle | 4 ++--
 rollbar-android/build.gradle          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/rollbar-android/build.gradle b/examples/rollbar-android/build.gradle
index d947cc8b..9eb389f4 100644
--- a/examples/rollbar-android/build.gradle
+++ b/examples/rollbar-android/build.gradle
@@ -11,14 +11,14 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.rollbar.example.android"
         minSdkVersion 21
         // FIXME: Pending further discussion
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/rollbar-android/build.gradle b/rollbar-android/build.gradle
index bfb777fc..b81741da 100644
--- a/rollbar-android/build.gradle
+++ b/rollbar-android/build.gradle
@@ -18,14 +18,14 @@ apply from: "$rootDir/gradle/release.gradle"
 apply from: "$rootDir/gradle/android.quality.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion '30.0.3' // Going above here requires bumping the AGP to version 4+
 
     defaultConfig {
         minSdkVersion 21
         // FIXME: Pending further discussion
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 30
+        targetSdkVersion 33
         consumerProguardFiles 'proguard-rules.pro'
         manifestPlaceholders = [notifierVersion: VERSION_NAME]
     }

From 2a8e339a0337058a47bd83778f46773769c3f07b Mon Sep 17 00:00:00 2001
From: chris <christian.buongarzoni@gmail.com>
Date: Fri, 27 Jun 2025 02:11:20 -0300
Subject: [PATCH 2/4] build: exclude :rollbar-android and
 :examples:rollbar-android modules from java 8 build

---
 settings.gradle | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 0728dbb9..adfeeca4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,6 @@ rootProject.name="rollbar-java-sdk"
 
 include ":rollbar-api",
         ":rollbar-java",
-        ":rollbar-android",
         ":rollbar-web",
         ":rollbar-jakarta-web",
         ":rollbar-log4j2",
@@ -16,7 +15,6 @@ include ":rollbar-api",
         ":rollbar-reactive-streams-reactor",
         ":examples:rollbar-java",
         ":examples:rollbar-web",
-        ":examples:rollbar-android",
         ":examples:rollbar-scala",
         ":examples:rollbar-log4j2",
         ":examples:rollbar-logback",
@@ -25,3 +23,13 @@ include ":rollbar-api",
         ":examples:rollbar-struts2",
         ":examples:rollbar-struts2-spring",
         ":examples:rollbar-reactive-streams-reactor"
+
+def isJava8 = JavaVersion.current() == JavaVersion.VERSION_1_8
+
+if (isJava8) {
+    println "Java 8 detected: excluding :rollbar-android and :examples:rollbar-android"
+} else {
+    println "Java ${JavaVersion.current()} detected: including Android modules"
+    include ":rollbar-android",
+            ":examples:rollbar-android"
+}

From d65945648f0bbcfab6f2a12c5aae4dee4d9ee600 Mon Sep 17 00:00:00 2001
From: chris <christian.buongarzoni@gmail.com>
Date: Fri, 27 Jun 2025 02:13:30 -0300
Subject: [PATCH 3/4] temporary because of this issue
 https://github.com/nebula-plugins/nebula-gradle-interop/issues/20

---
 rollbar-java/build.gradle             | 3 +++
 rollbar-reactive-streams/build.gradle | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/rollbar-java/build.gradle b/rollbar-java/build.gradle
index 1f69c0cc..40c7cada 100644
--- a/rollbar-java/build.gradle
+++ b/rollbar-java/build.gradle
@@ -7,6 +7,9 @@ buildscript {
     dependencies {
         classpath "com.netflix.nebula:nebula-project-plugin:3.4.0"
     }
+    configurations.classpath {
+        resolutionStrategy.force 'com.netflix.nebula:nebula-gradle-interop:2.3.0'
+    }
 }
 
 apply plugin: "nebula.integtest"
diff --git a/rollbar-reactive-streams/build.gradle b/rollbar-reactive-streams/build.gradle
index 247e5762..716ab256 100644
--- a/rollbar-reactive-streams/build.gradle
+++ b/rollbar-reactive-streams/build.gradle
@@ -7,6 +7,9 @@ buildscript {
     dependencies {
         classpath "com.netflix.nebula:nebula-project-plugin:3.4.0"
     }
+    configurations.classpath {
+        resolutionStrategy.force 'com.netflix.nebula:nebula-gradle-interop:2.3.0'
+    }
 }
 
 apply plugin: "nebula.integtest"

From 0759034ef569217129e95aea3cc5aabc85ae2425 Mon Sep 17 00:00:00 2001
From: chris <christian.buongarzoni@gmail.com>
Date: Fri, 27 Jun 2025 02:33:54 -0300
Subject: [PATCH 4/4] build: set compatibility with Java 8

---
 rollbar-android/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rollbar-android/build.gradle b/rollbar-android/build.gradle
index b81741da..786d82fd 100644
--- a/rollbar-android/build.gradle
+++ b/rollbar-android/build.gradle
@@ -38,6 +38,11 @@ android {
             testCoverageEnabled true
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {