diff --git a/example-new-architecture/android/build.gradle b/example-new-architecture/android/build.gradle index 01e5c6305..5a6e375f7 100644 --- a/example-new-architecture/android/build.gradle +++ b/example-new-architecture/android/build.gradle @@ -7,7 +7,7 @@ buildscript { compileSdkVersion = 34 targetSdkVersion = 34 ndkVersion = "25.1.8937393" - kotlinVersion = "1.8.0" + kotlinVersion = "1.9.0" } repositories { google() diff --git a/example/android/build.gradle b/example/android/build.gradle index cb9d6232a..74fd848b6 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { compileSdkVersion = 34 targetSdkVersion = 34 ndkVersion = "25.1.8937393" - kotlinVersion = "1.8.0" + kotlinVersion = "1.9.0" } repositories { google() diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 4e11a70f8..f6cc50e2b 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:8.0.0' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" @@ -107,14 +107,13 @@ android { buildConfig = true } } - if (agpVersion.tokenize('.')[0].toInteger() < 8) { - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.majorVersion - } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.majorVersion } defaultConfig { diff --git a/packages/core/android/gradle.properties b/packages/core/android/gradle.properties index ace79aead..9dcfcb29f 100644 --- a/packages/core/android/gradle.properties +++ b/packages/core/android/gradle.properties @@ -1,4 +1,4 @@ -DdSdkReactNative_kotlinVersion=1.7.21 +DdSdkReactNative_kotlinVersion=1.9.0 DdSdkReactNative_compileSdkVersion=33 DdSdkReactNative_buildToolsVersion=33.0.0 DdSdkReactNative_targetSdkVersion=33 diff --git a/packages/core/android/gradle/wrapper/gradle-wrapper.properties b/packages/core/android/gradle/wrapper/gradle-wrapper.properties index 8cb39cca3..adb9032b8 100644 --- a/packages/core/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/core/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip diff --git a/packages/internal-testing-tools/android/build.gradle b/packages/internal-testing-tools/android/build.gradle index a86759cee..a4aa2d398 100644 --- a/packages/internal-testing-tools/android/build.gradle +++ b/packages/internal-testing-tools/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:8.0.0' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" @@ -102,14 +102,14 @@ android { buildConfig = true } } - if (agpVersion.tokenize('.')[0].toInteger() < 8) { - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.majorVersion - } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.majorVersion } defaultConfig { @@ -147,10 +147,6 @@ android { lintOptions { disable 'GradleCompatible' } - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } } repositories { diff --git a/packages/internal-testing-tools/android/gradle.properties b/packages/internal-testing-tools/android/gradle.properties index 1b1b4525a..994bc1b5f 100644 --- a/packages/internal-testing-tools/android/gradle.properties +++ b/packages/internal-testing-tools/android/gradle.properties @@ -1,4 +1,4 @@ -DatadogInternalTesting_kotlinVersion=1.7.21 +DatadogInternalTesting_kotlinVersion=1.9.0 DatadogInternalTesting_compileSdkVersion=33 DatadogInternalTesting_buildToolsVersion=33.0.0 DatadogInternalTesting_targetSdkVersion=33 diff --git a/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties b/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties index 8cb39cca3..adb9032b8 100644 --- a/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip diff --git a/packages/react-native-session-replay/android/build.gradle b/packages/react-native-session-replay/android/build.gradle index da1dc471e..effef3953 100644 --- a/packages/react-native-session-replay/android/build.gradle +++ b/packages/react-native-session-replay/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:8.0.0' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" @@ -105,14 +105,14 @@ android { buildConfig = true } } - if (agpVersion.tokenize('.')[0].toInteger() < 8) { - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.majorVersion - } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.majorVersion } defaultConfig { @@ -151,8 +151,8 @@ android { disable 'GradleCompatible' } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/packages/react-native-session-replay/android/gradle.properties b/packages/react-native-session-replay/android/gradle.properties index 397e8a6d4..db8ea76ff 100644 --- a/packages/react-native-session-replay/android/gradle.properties +++ b/packages/react-native-session-replay/android/gradle.properties @@ -1,4 +1,4 @@ -DatadogSDKReactNativeSessionReplay_kotlinVersion=1.7.21 +DatadogSDKReactNativeSessionReplay_kotlinVersion=1.9.0 DatadogSDKReactNativeSessionReplay_compileSdkVersion=33 DatadogSDKReactNativeSessionReplay_buildToolsVersion=33.0.0 DatadogSDKReactNativeSessionReplay_targetSdkVersion=33 diff --git a/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties index 8cb39cca3..adb9032b8 100644 --- a/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip