Skip to content

Commit 42eaf70

Browse files
committed
fix(android): remove workaround for trove4j
BREAKING CHANGE: `android/force-resolve-trove4j.gradle` has been removed. `org.jetbrains.trove4j:trove4j` has been uploaded to Maven Central: https://search.maven.org/artifact/org.jetbrains.trove4j/trove4j/20160824/jar
1 parent 593a0ba commit 42eaf70

File tree

8 files changed

+0
-31
lines changed

8 files changed

+0
-31
lines changed

.github/renovate.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
"matchPackageNames": ["hermes-engine"],
1111
"allowedVersions": "~0.5.0"
1212
},
13-
{
14-
"matchPackageNames": ["org.jetbrains.intellij.deps:trove4j"],
15-
"enabled": false
16-
},
1713
{
1814
"matchPackageNames": ["react"],
1915
"enabled": false

android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ repositories {
4444
}
4545
}
4646

47-
apply from: "$projectDir/../force-resolve-trove4j.gradle"
48-
4947
apply plugin: "com.android.application"
5048
apply plugin: "kotlin-android"
5149
apply plugin: "kotlin-kapt"

android/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript { scriptHandler ->
22
def buildscriptDir = buildscript.sourceFile.getParent()
33
apply from: "$buildscriptDir/dependencies.gradle"
4-
apply from: "$buildscriptDir/force-resolve-trove4j.gradle", to: scriptHandler
54

65
repositories {
76
google()

android/force-resolve-trove4j.gradle

Lines changed: 0 additions & 13 deletions
This file was deleted.

android/support/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ repositories {
88
mavenCentral()
99
}
1010

11-
def androidDir = "${buildscript.sourceFile.getParent()}/../"
12-
apply from: "$androidDir/force-resolve-trove4j.gradle"
13-
1411
apply plugin: "com.android.library"
1512

1613
android {

scripts/configure.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ const getConfig = (() => {
410410
"buildscript { scriptHandler ->",
411411
` def androidTestAppDir = "${testAppRelPath}/android"`,
412412
' apply from: "$androidTestAppDir/dependencies.gradle"',
413-
' apply from: "$androidTestAppDir/force-resolve-trove4j.gradle", to: scriptHandler',
414413
"",
415414
" repositories {",
416415
" google()",

test-app.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ def cliAndroidDir = findNodeModulesPath(rootDir, "@react-native-community/cli-pl
3939
apply from: "$cliAndroidDir/native_modules.gradle"
4040

4141
ext.applyTestAppSettings = { DefaultSettings defaultSettings ->
42-
buildscript { scriptHandler ->
43-
apply from: "$scriptDir/android/force-resolve-trove4j.gradle", to: scriptHandler
44-
}
45-
4642
apply(defaultSettings)
4743
applyNativeModulesSettingsGradle(defaultSettings)
4844
}

test/configure/__snapshots__/gatherConfig.test.js.snap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ Object {
6868
"android/build.gradle": "buildscript { scriptHandler ->
6969
def androidTestAppDir = \\"../../android\\"
7070
apply from: \\"$androidTestAppDir/dependencies.gradle\\"
71-
apply from: \\"$androidTestAppDir/force-resolve-trove4j.gradle\\", to: scriptHandler
7271
7372
repositories {
7473
google()
@@ -478,7 +477,6 @@ Object {
478477
"android/build.gradle": "buildscript { scriptHandler ->
479478
def androidTestAppDir = \\"../../android\\"
480479
apply from: \\"$androidTestAppDir/dependencies.gradle\\"
481-
apply from: \\"$androidTestAppDir/force-resolve-trove4j.gradle\\", to: scriptHandler
482480
483481
repositories {
484482
google()
@@ -644,7 +642,6 @@ Object {
644642
"android/build.gradle": "buildscript { scriptHandler ->
645643
def androidTestAppDir = \\"../../android\\"
646644
apply from: \\"$androidTestAppDir/dependencies.gradle\\"
647-
apply from: \\"$androidTestAppDir/force-resolve-trove4j.gradle\\", to: scriptHandler
648645
649646
repositories {
650647
google()

0 commit comments

Comments
 (0)