From 9fcb46a892bab07f863efd4c7e5d6e0a674becc0 Mon Sep 17 00:00:00 2001
From: Marco Saia <marco.saia@datadoghq.com>
Date: Tue, 8 Oct 2024 17:15:29 +0200
Subject: [PATCH] Removed Java 17 compileOptions

---
 packages/core/android/build.gradle            | 17 +++++++++-----
 .../android/build.gradle                      | 18 +++++++++------
 .../android/build.gradle                      | 22 +++++++++----------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
index c04fab4ec..3883de8f5 100644
--- a/packages/core/android/build.gradle
+++ b/packages/core/android/build.gradle
@@ -98,22 +98,27 @@ def getExtOrIntegerDefault(name) {
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
+
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
     namespace = "com.datadog.reactnative"
   }
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 8) {
     buildFeatures {
       buildConfig = true
     }
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_17.majorVersion
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   defaultConfig {
diff --git a/packages/internal-testing-tools/android/build.gradle b/packages/internal-testing-tools/android/build.gradle
index 6fb6b17e3..22b4be9c2 100644
--- a/packages/internal-testing-tools/android/build.gradle
+++ b/packages/internal-testing-tools/android/build.gradle
@@ -93,23 +93,27 @@ def getExtOrIntegerDefault(name) {
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
+
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
     namespace = "com.datadog.reactnative.internaltesting"
   }
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 8) {
     buildFeatures {
       buildConfig = true
     }
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
-
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_17.majorVersion
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   defaultConfig {
diff --git a/packages/react-native-session-replay/android/build.gradle b/packages/react-native-session-replay/android/build.gradle
index ba51711c8..8d833e098 100644
--- a/packages/react-native-session-replay/android/build.gradle
+++ b/packages/react-native-session-replay/android/build.gradle
@@ -96,23 +96,27 @@ def getExtOrIntegerDefault(name) {
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
+
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
     namespace = "com.datadog.reactnative.sessionreplay"
   }
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 8) {
     buildFeatures {
       buildConfig = true
     }
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
-
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_17.majorVersion
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   defaultConfig {
@@ -150,10 +154,6 @@ android {
   lintOptions {
     disable 'GradleCompatible'
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
 }
 
 repositories {