diff --git a/dependencies/extension-api/build.gradle b/dependencies/extension-api/build.gradle index fe526ccdb8..411c05cd0b 100644 --- a/dependencies/extension-api/build.gradle +++ b/dependencies/extension-api/build.gradle @@ -12,6 +12,7 @@ buildscript { apply plugin: 'com.android.library' android { + namespace 'org.haxe.extension' compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION diff --git a/dependencies/extension-api/src/main/AndroidManifest.xml b/dependencies/extension-api/src/main/AndroidManifest.xml index 5bc5fecfec..b2d3ea1235 100644 --- a/dependencies/extension-api/src/main/AndroidManifest.xml +++ b/dependencies/extension-api/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - - + diff --git a/templates/android/template/app/build.gradle b/templates/android/template/app/build.gradle index d2e5260d63..f6b9fad10a 100644 --- a/templates/android/template/app/build.gradle +++ b/templates/android/template/app/build.gradle @@ -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:: diff --git a/templates/android/template/app/src/main/AndroidManifest.xml b/templates/android/template/app/src/main/AndroidManifest.xml index 501db19f78..b083f1c222 100644 --- a/templates/android/template/app/src/main/AndroidManifest.xml +++ b/templates/android/template/app/src/main/AndroidManifest.xml @@ -1,9 +1,24 @@ - + - + + + + + + + + + + + + + + + + ::foreach ANDROID_PERMISSIONS:: ::end:: @@ -25,6 +40,20 @@ + + + + + + + + + + + + + + diff --git a/templates/extension/dependencies/android/build.gradle b/templates/extension/dependencies/android/build.gradle index 8b5014f91c..40f326da80 100644 --- a/templates/extension/dependencies/android/build.gradle +++ b/templates/extension/dependencies/android/build.gradle @@ -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 } diff --git a/templates/extension/dependencies/android/src/main/AndroidManifest.xml b/templates/extension/dependencies/android/src/main/AndroidManifest.xml index 698a1e3ce7..b2d3ea1235 100644 --- a/templates/extension/dependencies/android/src/main/AndroidManifest.xml +++ b/templates/extension/dependencies/android/src/main/AndroidManifest.xml @@ -1,6 +1,2 @@ - - - - - \ No newline at end of file + diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 7ab9433bd7..1b7d33575d 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -471,6 +471,7 @@ class AndroidPlatform extends PlatformTarget "android.permission.WAKE_LOCK", "android.permission.INTERNET", "android.permission.VIBRATE", + "android.permission.BLUETOOTH", "android.permission.ACCESS_NETWORK_STATE" ]); context.ANDROID_GRADLE_VERSION = project.config.getString("android.gradle-version", "7.4.2");