From ff15e2384ab65d5f408cee4c9b62639ddfaf5272 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Sun, 5 Mar 2023 22:26:19 -0800 Subject: Configure maven central snapshot versions for the Godot Android library A snapshot version is a version that has not yet been released which allows us to deploy the same transient version incrementally, without requiring projects to upgrade the artifact version they're consuming. Those projects can use the same version to get an updated snapshot version. (cherry picked from commit a5fdc955158502d99fca4865aa2dffa4d832312d) --- platform/android/java/lib/build.gradle | 1 - 1 file changed, 1 deletion(-) (limited to 'platform/android/java/lib') diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle index 841656a240..38133ddd51 100644 --- a/platform/android/java/lib/build.gradle +++ b/platform/android/java/lib/build.gradle @@ -4,7 +4,6 @@ plugins { } ext { - PUBLISH_VERSION = getGodotPublishVersion() PUBLISH_ARTIFACT_ID = 'godot' } -- cgit v1.2.3 From 5f9990e25d2569ef1577e25a9b320abbe1d4192c Mon Sep 17 00:00:00 2001 From: lewiji Date: Thu, 9 Mar 2023 17:04:13 +0000 Subject: Add "filesRoot" path to Android provider paths xml (cherry picked from commit ac04ff7becfa31388c8bcfe725d71f0c7ec65c94) --- platform/android/java/lib/res/xml/godot_provider_paths.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'platform/android/java/lib') diff --git a/platform/android/java/lib/res/xml/godot_provider_paths.xml b/platform/android/java/lib/res/xml/godot_provider_paths.xml index 1255f576bf..8ad16da879 100644 --- a/platform/android/java/lib/res/xml/godot_provider_paths.xml +++ b/platform/android/java/lib/res/xml/godot_provider_paths.xml @@ -1,6 +1,10 @@ + + -- cgit v1.2.3 From dc100cbebb5ebe557fc23e1902a4288d509dda97 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Tue, 21 Mar 2023 18:54:04 -0700 Subject: Bump the target SDK version to 33 (Android 13) (cherry picked from commit 845ca33c7608a8df7e7aaf87f38c1dfaf724fad2) --- .../lib/src/org/godotengine/godot/input/GodotGestureHandler.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'platform/android/java/lib') diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt index 1be009b6dc..af1f38f89c 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt @@ -239,8 +239,8 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi return true } - override fun onScale(detector: ScaleGestureDetector?): Boolean { - if (detector == null || !panningAndScalingEnabled || pointerCaptureInProgress) { + override fun onScale(detector: ScaleGestureDetector): Boolean { + if (!panningAndScalingEnabled || pointerCaptureInProgress) { return false } GodotLib.magnify( @@ -251,15 +251,15 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi return true } - override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean { - if (detector == null || !panningAndScalingEnabled || pointerCaptureInProgress) { + override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { + if (!panningAndScalingEnabled || pointerCaptureInProgress) { return false } scaleInProgress = true return true } - override fun onScaleEnd(detector: ScaleGestureDetector?) { + override fun onScaleEnd(detector: ScaleGestureDetector) { scaleInProgress = false } } -- cgit v1.2.3