From ee2d3b971df6d3630b8d935394fb4febcfa3a909 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Thu, 13 Apr 2023 15:29:18 -0700 Subject: [PATCH] fix(cli): remove buildSrc from Android project gitignored paths (#6702) --- .changes/android-buildsrc-gitignore.md | 6 ++++++ tooling/cli/templates/mobile/android/.gitignore | 2 -- .../mobile/android/buildSrc/src/main/kotlin/BuildTask.kt | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .changes/android-buildsrc-gitignore.md diff --git a/.changes/android-buildsrc-gitignore.md b/.changes/android-buildsrc-gitignore.md new file mode 100644 index 000000000..f4d1f07bb --- /dev/null +++ b/.changes/android-buildsrc-gitignore.md @@ -0,0 +1,6 @@ +--- +"cli.rs": patch +"cli.js": patch +--- + +Do not gitignore the Android project's `buildSrc` folder by default since we removed absolute paths from it. diff --git a/tooling/cli/templates/mobile/android/.gitignore b/tooling/cli/templates/mobile/android/.gitignore index 3679c40a3..6bb2f5ee8 100644 --- a/tooling/cli/templates/mobile/android/.gitignore +++ b/tooling/cli/templates/mobile/android/.gitignore @@ -9,8 +9,6 @@ /.idea/assetWizardSettings.xml .DS_Store build -/buildSrc/src/main/{{package-path}}/kotlin/BuildTask.kt -/buildSrc/src/main/{{package-path}}/kotlin/RustPlugin.kt /captures .externalNativeBuild .cxx diff --git a/tooling/cli/templates/mobile/android/buildSrc/src/main/kotlin/BuildTask.kt b/tooling/cli/templates/mobile/android/buildSrc/src/main/kotlin/BuildTask.kt index 2d4324d83..4dec3742c 100644 --- a/tooling/cli/templates/mobile/android/buildSrc/src/main/kotlin/BuildTask.kt +++ b/tooling/cli/templates/mobile/android/buildSrc/src/main/kotlin/BuildTask.kt @@ -25,7 +25,7 @@ open class BuildTask : DefaultTask() { val executable = """{{tauri-binary}}"""; try { runTauriCli(executable) - } catch (e: Exception){ + } catch (e: Exception) { if (Os.isFamily(Os.FAMILY_WINDOWS)) { runTauriCli("$executable.cmd") } else {