kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into DeprecatedGradleFeatures

Browse Source
This commit is contained in:
Joseph Cloutier
2022-06-12 10:00:23 -04:00
parent 5ffbfd7f3a 89158a9b7f
commit 9a81ae8798
16 changed files with 126 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/CommandLineTools.hx
View File

@@ -1072,6 +1072,7 @@ class CommandLineTools
Log.println(" \x1b[1m--haxelib\x1b[0;3m=value\x1b[0m -- Add an additional <haxelib/> value");
Log.println(" \x1b[1m--haxelib-\x1b[0;3mname=value\x1b[0m -- Override the path to a haxelib");
Log.println(" \x1b[1m--source\x1b[0;3m=value\x1b[0m -- Add an additional <source/> value");
Log.println(" \x1b[1m--template\x1b[0;3m=value\x1b[0m -- Add an additional <template/> value");
Log.println(" \x1b[1m--certificate-\x1b[0;3moption=value\x1b[0m -- Override a project <certificate/> setting");
}

2
tools/platforms/AndroidPlatform.hx
View File

@@ -450,7 +450,7 @@ class AndroidPlatform extends PlatformTarget
context.CPP_DIR = targetDirectory + "/obj";
context.OUTPUT_DIR = targetDirectory;
context.ANDROID_INSTALL_LOCATION = project.config.getString("android.install-location", "auto");
context.ANDROID_MINIMUM_SDK_VERSION = project.config.getInt("android.minimum-sdk-version", 16);
context.ANDROID_MINIMUM_SDK_VERSION = project.config.getInt("android.minimum-sdk-version", 21);
context.ANDROID_TARGET_SDK_VERSION = project.config.getInt("android.target-sdk-version", 30);
context.ANDROID_EXTENSIONS = project.config.getArrayString("android.extension");
context.ANDROID_PERMISSIONS = project.config.getArrayString("android.permission", [