asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #75205 from m4gr3d/bump_target_sdk_33_3x

Browse source 
[3.x] Bump the target SDK version to 33 (Android 13)
This commit is contained in:
Rémi Verschelde 2023-04-11 10:53:39 +02:00
commit 2c2ae757a8
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/android/export/export_plugin.cpp
View file

@ -226,7 +226,7 @@ static const char *APK_ASSETS_DIRECTORY = "res://android/build/assets";
static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/installTime/src/main/assets"; static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/installTime/src/main/assets";
static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk' static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
static const int DEFAULT_TARGET_SDK_VERSION = 32; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk' static const int DEFAULT_TARGET_SDK_VERSION = 33; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
#ifndef ANDROID_ENABLED #ifndef ANDROID_ENABLED
void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) { void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {

8
platform/android/java/app/config.gradle
View file

@ -1,9 +1,9 @@
ext.versions = [ ext.versions = [
androidGradlePlugin: '7.2.1', androidGradlePlugin: '7.3.0',
compileSdk : 32, compileSdk : 33,
minSdk : 19, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION' minSdk : 19, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
targetSdk : 32, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION' targetSdk : 33, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
buildTools : '32.0.0', buildTools : '33.0.2',
kotlinVersion : '1.7.0', kotlinVersion : '1.7.0',
fragmentVersion : '1.3.6', fragmentVersion : '1.3.6',
nexusPublishVersion: '1.1.0', nexusPublishVersion: '1.1.0',

2
platform/android/java/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

10
platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
View file

@ -239,8 +239,8 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
return true return true
} }
override fun onScale(detector: ScaleGestureDetector?): Boolean { override fun onScale(detector: ScaleGestureDetector): Boolean {
if (detector == null || !panningAndScalingEnabled || pointerCaptureInProgress) { if (!panningAndScalingEnabled || pointerCaptureInProgress) {
return false return false
} }
GodotLib.magnify( GodotLib.magnify(
@ -251,15 +251,15 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
return true return true
} }
override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean { override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
if (detector == null || !panningAndScalingEnabled || pointerCaptureInProgress) { if (!panningAndScalingEnabled || pointerCaptureInProgress) {
return false return false
} }
scaleInProgress = true scaleInProgress = true
return true return true
} }
override fun onScaleEnd(detector: ScaleGestureDetector?) { override fun onScaleEnd(detector: ScaleGestureDetector) {
scaleInProgress = false scaleInProgress = false
} }
} }