From ed85042c133452b0a4d3a84576058b3efbc25990 Mon Sep 17 00:00:00 2001 From: louiszawadzki Date: Thu, 25 Jan 2024 10:47:36 +0100 Subject: [PATCH] Fix Android build error with RN 0.73 --- packages/core/android/build.gradle | 17 +++++++++-------- .../android/build.gradle | 13 +++++++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 3ed1e99aa..17d6e334a 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -105,6 +105,15 @@ android { buildConfig = true } } + if (agpVersion.tokenize('.')[0].toInteger() < 8) { + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.majorVersion + } + } defaultConfig { minSdkVersion 21 @@ -141,10 +150,6 @@ android { lintOptions { disable 'GradleCompatible' } - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } } repositories { @@ -209,10 +214,6 @@ unMock { } tasks.withType(Test) { - tasks.withType(KotlinCompile) { - kotlinOptions.jvmTarget = JavaVersion.VERSION_11 - } - useJUnitPlatform { includeEngines("spek", "junit-jupiter", "junit-vintage") } diff --git a/packages/react-native-session-replay/android/build.gradle b/packages/react-native-session-replay/android/build.gradle index e7cfa9b50..dc61d73f4 100644 --- a/packages/react-native-session-replay/android/build.gradle +++ b/packages/react-native-session-replay/android/build.gradle @@ -105,6 +105,15 @@ android { buildConfig = true } } + if (agpVersion.tokenize('.')[0].toInteger() < 8) { + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.majorVersion + } + } defaultConfig { minSdkVersion 21 @@ -197,10 +206,6 @@ dependencies { } tasks.withType(Test) { - tasks.withType(KotlinCompile) { - kotlinOptions.jvmTarget = JavaVersion.VERSION_11 - } - useJUnitPlatform { includeEngines("spek", "junit-jupiter", "junit-vintage") }