From aece812fb7dbe9bf7ad6218740a23d4d93decbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Haider=20Forse=CC=81n?= Date: Thu, 1 Aug 2019 16:08:39 +0200 Subject: [PATCH] fix: corrects sourcedir to be compatible with kotlin projects Resolves #600 --- packages/platform-android/native_modules.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/platform-android/native_modules.gradle b/packages/platform-android/native_modules.gradle index f2b972fa4..4e3983a09 100644 --- a/packages/platform-android/native_modules.gradle +++ b/packages/platform-android/native_modules.gradle @@ -229,11 +229,12 @@ ext.applyNativeModulesSettingsGradle = { DefaultSettings defaultSettings, String ext.applyNativeModulesAppBuildGradle = { Project project, String root = ".." -> autoModules.applyBuildGradle(project, root) - def generatedSrcDir = new File(buildDir, "generated/rncli/src/main/java/com/facebook/react") + def generatedSrcDir = "generated/rncli/src/main/java" + def generatedCodeDir = new File(buildDir, "$generatedSrcDir/com/facebook/react") task generatePackageList { doLast { - autoModules.generatePackagesFile(generatedSrcDir, generatedFileName, generatedFileContentsTemplate) + autoModules.generatePackagesFile(generatedCodeDir, generatedFileName, generatedFileContentsTemplate) } } @@ -243,7 +244,7 @@ ext.applyNativeModulesAppBuildGradle = { Project project, String root = ".." -> sourceSets { main { java { - srcDirs += generatedSrcDir + srcDirs += "build/$generatedSrcDir" } } }