orastron/tibia
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android/ios fix target version handling

Browse Source
This commit is contained in:
Stefano D'Angelo 2025-04-17 12:17:19 +02:00
parent 402df416f8
commit a5727492cd
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/android-make/vars.mk
View File

@ -20,6 +20,7 @@
BUNDLE_NAME := {{=it.product.bundleName}} BUNDLE_NAME := {{=it.product.bundleName}}
JAVA_PACKAGE_NAME := {{=it.android.javaPackageName}} JAVA_PACKAGE_NAME := {{=it.android.javaPackageName}}
ANDROID_VERSION := {{=it.android.androidVersion}}
{{?(it.android_make?.commonDir || it.make?.commonDir)}} {{?(it.android_make?.commonDir || it.make?.commonDir)}}
COMMON_DIR := {{=it.android_make?.commonDir ?? (it.make?.commonDir ?? "")}} COMMON_DIR := {{=it.android_make?.commonDir ?? (it.make?.commonDir ?? "")}}

2
templates/android/data/AndroidManifest.xml
View File

@ -8,7 +8,7 @@
{{??}} {{??}}
<uses-sdk android:minSdkVersion="26" /> <!-- for androidx core and AAudio --> <uses-sdk android:minSdkVersion="26" /> <!-- for androidx core and AAudio -->
{{?}} {{?}}
<uses-sdk android:targetSdkVersion="34" /> <uses-sdk android:targetSdkVersion="{{=it.android.androidVersion}}" />
<application android:label="{{=it.product.name}}"> <application android:label="{{=it.product.name}}">
<activity android:name=".MainActivity" android:label="{{=it.product.name}}" android:exported="true"> <activity android:name=".MainActivity" android:label="{{=it.product.name}}" android:exported="true">
<intent-filter> <intent-filter>

3
test/android.json
View File

@ -1,5 +1,6 @@
{ {
"android": { "android": {
"javaPackageName": "com.example.tibia_test" "javaPackageName": "com.example.tibia_test",
"androidVersion": "36"
} }
} }

2
test/ios-make.json
View File

@ -1,6 +1,6 @@
{ {
"ios_make": { "ios_make": {
"headerSearchPaths": [ "../../../../../miniaudio" ], "headerSearchPaths": [ "../../../../../miniaudio" ],
"deploymentTarget": 16.6 "deploymentTarget": "16.6"
} }
} }

1
test/vars-pre.mk
View File

@ -57,7 +57,6 @@ ifeq ($(TEMPLATE), android)
KOTLIN_DIR := $(HOME)/Android/kotlin KOTLIN_DIR := $(HOME)/Android/kotlin
NDK_VERSION := 28.0.13004108 NDK_VERSION := 28.0.13004108
BUILD_TOOLS_VERSION := 36.0.0 BUILD_TOOLS_VERSION := 36.0.0
ANDROID_VERSION := 36
ANDROIDX_CORE_VERSION := 1.16.0 ANDROIDX_CORE_VERSION := 1.16.0
ANDROIDX_LIFECYCLE_COMMON_VERSION := 2.8.7 ANDROIDX_LIFECYCLE_COMMON_VERSION := 2.8.7
ANDROIDX_VERSIONEDPARCELABLE_VERSION := 1.2.1 ANDROIDX_VERSIONEDPARCELABLE_VERSION := 1.2.1