From 69dcd4b63b0e36663c054745a8db833bb1b6377b Mon Sep 17 00:00:00 2001 From: flamendless Date: Fri, 3 Feb 2023 20:57:42 +0800 Subject: [PATCH] Abstract configurable values to gradle.properties (#243) * Abstract configurable values to gradle.properties * Remove gms in AndroidManifest --- app/build.gradle | 12 ++++++++--- app/src/embed/AndroidManifest.xml | 36 +++++++++++++++++++++++++++++++ app/src/main/AndroidManifest.xml | 2 +- gradle.properties | 10 ++++++++- 4 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 app/src/embed/AndroidManifest.xml diff --git a/app/build.gradle b/app/build.gradle index 7b2e55db..05d6b46c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,11 +5,17 @@ android { buildToolsVersion '33.0.0' ndkVersion '23.2.8568313' defaultConfig { - applicationId 'org.love2d.android' - versionCode 30 - versionName '11.4' + applicationId project.properties["app.application_id"] + versionCode project.properties["app.version_code"].toInteger() + versionName project.properties["app.version_name"] minSdkVersion 16 targetSdk 33 + + manifestPlaceholders = [ + NAME:project.properties["app.name"], + ACTIVITY_NAME:project.properties["app.activity_name"], + ORIENTATION:project.properties["app.orientation"], + ] } buildTypes { release { diff --git a/app/src/embed/AndroidManifest.xml b/app/src/embed/AndroidManifest.xml new file mode 100644 index 00000000..d171f83a --- /dev/null +++ b/app/src/embed/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21f0e4ad..f0668c0a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,4 +46,4 @@ - + diff --git a/gradle.properties b/gradle.properties index 5465fec0..7e45964c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,10 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +org.gradle.daemon=false + +app.name=Love2D +app.activity_name=org.love2d.android.GameActivity +app.application_id=org.love2d.unique_game_name +app.orientation=landscape +app.version_code=30 +app.version_name=11.4