Removed Java 17 compileOptions

DataDog · Oct 8, 2024 · 9fcb46a · 9fcb46a
1 parent ff1b34a
commit 9fcb46a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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 {