diff --git a/android/app/build.gradle b/android/app/build.gradle index e441fee0a..4b778a3e4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: "com.android.application" -apply plugin: "org.jetbrains.kotlin.android" +apply plugin: "org.jetbrains.kotlin.android" // TODO: Remove with gradle.properties flags android.builtInKotlin and android.newDsl once libs migrated to AGP 9 (before AGP 10) apply plugin: "com.facebook.react" /** @@ -102,7 +102,7 @@ android { // see https://reactnative.dev/docs/signed-apk-android. signingConfig signingConfigs.debug minifyEnabled enableProguardInReleaseBuilds - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" } } } diff --git a/android/gradle.properties b/android/gradle.properties index a6de6f68d..25b5af05d 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -42,3 +42,9 @@ hermesEnabled=true # This allows your app to draw behind system bars for an immersive UI. # Note: Only works with ReactActivity and should not be used with custom Activity. edgeToEdgeEnabled=true + +# Opt out of built-in kotlin and new DSL behavior that ships with AGP 9. +# Starting from AGP 10.x these opt outs will be removed. +# TODO: Remove both flags with app/build.gradle plugin org.jetbrains.kotlin.android once libs migrated to AGP 9 (before AGP 10) +android.builtInKotlin=false +android.newDsl=false diff --git a/package.json b/package.json index f6c134d42..3fad2c0b1 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "eslint-plugin-deprecation": "3.0.0", "eslint-plugin-detox": "1.0.0", "eslint-plugin-import": "2.32.0", - "eslint-plugin-jest": "29.5.0", + "eslint-plugin-jest": "29.15.4", "eslint-plugin-jsx-a11y": "6.10.2", "eslint-plugin-react": "7.37.5", "eslint-plugin-react-hooks": "7.0.1", diff --git a/yarn.lock b/yarn.lock index 62b253258..547e9dc95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10916,25 +10916,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:29.5.0": - version: 29.5.0 - resolution: "eslint-plugin-jest@npm:29.5.0" - dependencies: - "@typescript-eslint/utils": "npm:^8.0.0" - peerDependencies: - "@typescript-eslint/eslint-plugin": ^8.0.0 - eslint: ^8.57.0 || ^9.0.0 - jest: "*" - peerDependenciesMeta: - "@typescript-eslint/eslint-plugin": - optional: true - jest: - optional: true - checksum: 10/c3458f5b6780bc16ee27f859d067dc692576532999150a7b6098da57d9c2e2d8675bee534de6e714777ae3bf26162f27c5d5d4f69d60c1291bd68c7a420e5bb9 - languageName: node - linkType: hard - -"eslint-plugin-jest@npm:^29.0.1": +"eslint-plugin-jest@npm:29.15.4, eslint-plugin-jest@npm:^29.0.1": version: 29.15.4 resolution: "eslint-plugin-jest@npm:29.15.4" dependencies: @@ -17428,7 +17410,7 @@ __metadata: eslint-plugin-deprecation: "npm:3.0.0" eslint-plugin-detox: "npm:1.0.0" eslint-plugin-import: "npm:2.32.0" - eslint-plugin-jest: "npm:29.5.0" + eslint-plugin-jest: "npm:29.15.4" eslint-plugin-jsx-a11y: "npm:6.10.2" eslint-plugin-react: "npm:7.37.5" eslint-plugin-react-hooks: "npm:7.0.1"