From 75d93d6b2885e0739f688da605f5c20623e36176 Mon Sep 17 00:00:00 2001 From: Yogev Ben David Date: Thu, 22 Dec 2022 11:23:24 +0200 Subject: [PATCH 1/3] Fix Windows gradle build --- lib/android/app/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/android/app/build.gradle b/lib/android/app/build.gradle index 9d9e3689d5f..21312a02512 100644 --- a/lib/android/app/build.gradle +++ b/lib/android/app/build.gradle @@ -1,5 +1,6 @@ import groovy.json.JsonSlurper import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.internal.os.OperatingSystem apply plugin: 'com.android.library' apply plugin: 'kotlin-android' @@ -173,7 +174,9 @@ task installBuildToolsAndRenameD8IfNeeded { def buildToolsDir = new File(sdkDir, "/build-tools/" + buildToolsVersion) if (!buildToolsDir.exists()) { - def command = sdkDir.absolutePath + "/cmdline-tools/latest/bin/sdkmanager build-tools;" + buildToolsVersion + OperatingSystem os = OperatingSystem.current(); + def buildToolsPath = os.isWindows() ? "/cmdline-tools/latest/bin/sdkmanager.bat build-tools;" : "/cmdline-tools/latest/bin/sdkmanager build-tools;" + def command = sdkDir.absolutePath + buildToolsPath + buildToolsVersion command.execute().waitForProcessOutput(System.out, System.err) } From 26477cfbee7bc08fa97fbadf76c1bb0517e34b5a Mon Sep 17 00:00:00 2001 From: Yogev Ben David Date: Sun, 25 Dec 2022 11:46:37 +0200 Subject: [PATCH 2/3] Remove build tools installation --- lib/android/app/build.gradle | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/lib/android/app/build.gradle b/lib/android/app/build.gradle index 21312a02512..4fc6258f478 100644 --- a/lib/android/app/build.gradle +++ b/lib/android/app/build.gradle @@ -168,29 +168,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()) { - OperatingSystem os = OperatingSystem.current(); - def buildToolsPath = os.isWindows() ? "/cmdline-tools/latest/bin/sdkmanager.bat build-tools;" : "/cmdline-tools/latest/bin/sdkmanager build-tools;" - def command = sdkDir.absolutePath + buildToolsPath + 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" From 3d1b0c87d3181fdb9916b257afd9865b9765ec61 Mon Sep 17 00:00:00 2001 From: Yogev Ben David Date: Mon, 26 Dec 2022 11:38:46 +0200 Subject: [PATCH 3/3] Update build.gradle --- lib/android/app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/android/app/build.gradle b/lib/android/app/build.gradle index 4fc6258f478..598c641c178 100644 --- a/lib/android/app/build.gradle +++ b/lib/android/app/build.gradle @@ -1,6 +1,5 @@ import groovy.json.JsonSlurper import org.gradle.api.tasks.testing.logging.TestExceptionFormat -import org.gradle.internal.os.OperatingSystem apply plugin: 'com.android.library' apply plugin: 'kotlin-android'