From a8da0bfcbf5fc921f67446404126db90e409116c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 28 Apr 2024 09:26:02 -0400 Subject: [PATCH] Re-added android module in IntelliJ --- settings.gradle | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/settings.gradle b/settings.gradle index 350dc81511..b74305dad2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,13 +4,6 @@ if(JavaVersion.current().ordinal() < JavaVersion.VERSION_16.ordinal()){ include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests' -def use = { ... names -> - for(String name : names){ - include(name) - project(name).projectDir = new File(settingsDir, "../${name.substring(1).replace(":", "/")}") - } -} - def hasSdk = System.getenv("ANDROID_HOME") != null if(new File(settingsDir, 'local.properties').exists()){ @@ -26,9 +19,7 @@ if(hasSdk){ //why? because IntelliJ chokes on the new version of the Android plugin //UPDATE: it no longer chokes on AGP with the latest version, but instead gives a completely different error. brilliant. - if(!System.getProperty("jna.tmpdir")?.contains("JetBrains")){ - include 'android' - } + include 'android' }else{ println("No Android SDK found. Skipping Android module.") }