Skip to content

Fix Windows gradle build #7658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yogevbd merged 5 commits into from
Dec 26, 2022
+0 −21
Merged

Fix Windows gradle build #7658

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75d93d6
Fix Windows gradle build
yogevbd Dec 22, 2022
b0c7bf4
Merge branch 'master' into fixWindowsBuild
yogevbd Dec 22, 2022
26477cf
Remove build tools installation
yogevbd Dec 25, 2022
6f6c700
Merge branch 'fixWindowsBuild' of github.com:wix/react-native-navigat…
yogevbd Dec 25, 2022
3d1b0c8
Update build.gradle
yogevbd Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions lib/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,27 +167,6 @@ List reactNativeVersionComponents(rnPackageJsonFile) {
return reactNativeVersion.tokenize('-')[0].tokenize('.')
}

task installBuildToolsAndRenameD8IfNeeded {
def buildToolsVersion = android.getBuildToolsVersion()
def sdkDir = android.sdkDirectory
def buildToolsDir = new File(sdkDir, "/build-tools/" + buildToolsVersion)

if (!buildToolsDir.exists()) {
def command = sdkDir.absolutePath + "/cmdline-tools/latest/bin/sdkmanager build-tools;" + buildToolsVersion
command.execute().waitForProcessOutput(System.out, System.err)
}

def d8File = new File(buildToolsDir, "d8")
def dxFile = new File(buildToolsDir, "dx")
d8File.renameTo(dxFile)

def buildToolsLibDir = new File(buildToolsDir, "lib")
d8File = new File(buildToolsLibDir, "d8.jar")
dxFile = new File(buildToolsLibDir, "dx.jar")
d8File.renameTo(dxFile)
}
build.dependsOn installBuildToolsAndRenameD8IfNeeded

dependencies {

implementation "androidx.core:core-ktx:1.6.0"
Expand Down