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

Merge branch 'develop' into 8.2.0-Dev

Browse Source
This commit is contained in:
Josh Tynjala
2024-07-01 08:53:48 -07:00
parent d27aaebc01 5f7e63425e
commit e257b7ebe4
17 changed files with 98 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/android/template/app/build.gradle
View File

@@ -13,6 +13,7 @@ System.setProperty('java.awt.headless','false')
} */
android {
namespace "::APP_PACKAGE::"
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
::if (ANDROID_GRADLE_PLUGIN>="4.0")::ndkPath '::ANDROID_NDK_ROOT_ESCAPED::'::end::

2
templates/android/template/app/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="::APP_PACKAGE::" android:versionCode="::APP_BUILD_NUMBER::" android:versionName="::APP_VERSION::" android:installLocation="::ANDROID_INSTALL_LOCATION::">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="::APP_BUILD_NUMBER::" android:versionName="::APP_VERSION::" android:installLocation="::ANDROID_INSTALL_LOCATION::">
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />

1
templates/extension/dependencies/android/build.gradle
View File

@@ -12,6 +12,7 @@ buildscript {
apply plugin: 'com.android.library'
android {
namespace "org.haxe.extension.::extensionLowerCase::"
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
}

6
templates/extension/dependencies/android/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.haxe.extension.::extensionLowerCase::" >
</manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />