From b4e16f3d8e51d05c1f338edf5a86b2fcde91198b Mon Sep 17 00:00:00 2001 From: Lorenzo Rizzotti Date: Wed, 10 Jul 2024 13:26:06 +0200 Subject: [PATCH] fix(android): fix Android Studio project plugin link (#10235) * add plugin resolution to gradle settings This is needed to make Android Studio able to link to the project * reflect codegen edit in the plugin example --- .../android/settings.gradle | 29 +++++++++++++++++++ .../templates/plugin/android/settings.gradle | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/examples/api/src-tauri/tauri-plugin-sample/android/settings.gradle b/examples/api/src-tauri/tauri-plugin-sample/android/settings.gradle index 14a752e43..d7782a40d 100644 --- a/examples/api/src-tauri/tauri-plugin-sample/android/settings.gradle +++ b/examples/api/src-tauri/tauri-plugin-sample/android/settings.gradle @@ -1,2 +1,31 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + google() + } + resolutionStrategy { + eachPlugin { + switch (requested.id.id) { + case "com.android.library": + useVersion("8.0.2") + break + case "org.jetbrains.kotlin.android": + useVersion("1.8.20") + break + } + } + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + google() + + } +} + include ':tauri-android' project(':tauri-android').projectDir = new File('./.tauri/tauri-api') diff --git a/tooling/cli/templates/plugin/android/settings.gradle b/tooling/cli/templates/plugin/android/settings.gradle index 14a752e43..d7782a40d 100644 --- a/tooling/cli/templates/plugin/android/settings.gradle +++ b/tooling/cli/templates/plugin/android/settings.gradle @@ -1,2 +1,31 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + google() + } + resolutionStrategy { + eachPlugin { + switch (requested.id.id) { + case "com.android.library": + useVersion("8.0.2") + break + case "org.jetbrains.kotlin.android": + useVersion("1.8.20") + break + } + } + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + google() + + } +} + include ':tauri-android' project(':tauri-android').projectDir = new File('./.tauri/tauri-api')