Skip to content

Commit 0977cee

Browse files
Merge pull request #1011 from DataDog/marcosaia/RUM-11847/rn-82-support
[RUM-11847] [RN 0.82] Full support for React Native 0.82+
2 parents e771304 + 3810a0e commit 0977cee

File tree

21 files changed

+1007
-389
lines changed

21 files changed

+1007
-389
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"send": "0.19.0",
9696
"serve-static": "1.16.0",
9797
"formidable": "3.5.3",
98-
"snyk": "^1.1297.3",
98+
"snyk": "^1.1298.3",
9999
"form-data": "4.0.4",
100100
"on-headers": "1.1.0",
101101
"tmp": "0.2.4"

packages/core/android/build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import java.nio.file.Paths
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

4+
apply plugin: "io.gitlab.arturbosch.detekt"
5+
46
buildscript {
57
// Buildscript is evaluated before everything else so we can't use getExtOrDefault
68
def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['DdSdkReactNative_kotlinVersion']
@@ -16,7 +18,7 @@ buildscript {
1618
// noinspection DifferentKotlinGradleVersion
1719
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1820
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1"
19-
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.0"
21+
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
2022
classpath 'com.github.bjoernq:unmockplugin:0.7.9'
2123
// Uncomment here and in settings.gradle for getting rid of IDE errors for new architecture:
2224
// classpath "com.facebook.react:react-native-gradle-plugin"
@@ -36,7 +38,7 @@ if (isNewArchitectureEnabled()) {
3638
}
3739
apply plugin: 'kotlin-android'
3840
apply plugin: 'org.jlleitschuh.gradle.ktlint'
39-
apply plugin: "io.gitlab.arturbosch.detekt"
41+
4042

4143
/**
4244
* Finds the path of the installed npm package with the given name using Node's
@@ -96,6 +98,7 @@ def getExtOrIntegerDefault(name) {
9698
}
9799

98100
android {
101+
compileSdk getExtOrIntegerDefault('compileSdkVersion')
99102
compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
100103
buildToolsVersion getExtOrDefault('buildToolsVersion')
101104

@@ -122,6 +125,7 @@ android {
122125
}
123126

124127
defaultConfig {
128+
compileSdk getExtOrIntegerDefault('compileSdkVersion')
125129
minSdkVersion getExtOrIntegerDefault('minSdkVersion')
126130
targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
127131
versionCode 1
@@ -222,6 +226,8 @@ dependencies {
222226
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
223227

224228
unmock 'org.robolectric:android-all:4.4_r1-robolectric-r2'
229+
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8"
230+
detektPlugins "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.8"
225231
}
226232

227233
unMock {

0 commit comments

Comments
 (0)