Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-07-14 11:00:35 +03:00
Code Issues Projects Releases Wiki Activity

Re-added android module in IntelliJ

Browse Source
This commit is contained in:
Anuken 2024-04-28 09:26:02 -04:00
parent 5113f8770f
commit a8da0bfcbf
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
settings.gradle
View File

@ -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.")
}