You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-09 12:50:35 +00:00
Update Android dependencies for the project
- Update Android gradle plugin version from 7.2.1 to 8.2.0 - Update gradle version from 7.4.2 to 8.2 - Update target SDK from 33 to 34 - Update build tools version from 33.0.2 to 34.0.0 - Update kotlin version from 1.7.0 to 1.9.20 - Update Android fragment version from 1.3.6 to 1.6.2 - Update AndroidX window version from 1.0.0 to 1.2.0
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.godotengine.godot"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
|
||||
|
||||
@@ -10,8 +10,7 @@ ext {
|
||||
apply from: "../scripts/publish-module.gradle"
|
||||
|
||||
dependencies {
|
||||
implementation libraries.kotlinStdLib
|
||||
implementation libraries.androidxFragment
|
||||
implementation "androidx.fragment:fragment:$versions.fragmentVersion"
|
||||
}
|
||||
|
||||
def pathToRootDir = "../../../../"
|
||||
@@ -39,6 +38,11 @@ android {
|
||||
jvmTarget = versions.javaVersion
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
aidl = true
|
||||
buildConfig = true
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
dev {
|
||||
initWith debug
|
||||
|
||||
@@ -210,21 +210,23 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
|
||||
}
|
||||
|
||||
override fun onScroll(
|
||||
originEvent: MotionEvent,
|
||||
originEvent: MotionEvent?,
|
||||
terminusEvent: MotionEvent,
|
||||
distanceX: Float,
|
||||
distanceY: Float
|
||||
): Boolean {
|
||||
if (scaleInProgress) {
|
||||
if (dragInProgress) {
|
||||
// Cancel the drag
|
||||
GodotInputHandler.handleMotionEvent(
|
||||
originEvent.source,
|
||||
MotionEvent.ACTION_CANCEL,
|
||||
originEvent.buttonState,
|
||||
originEvent.x,
|
||||
originEvent.y
|
||||
)
|
||||
if (originEvent != null) {
|
||||
// Cancel the drag
|
||||
GodotInputHandler.handleMotionEvent(
|
||||
originEvent.source,
|
||||
MotionEvent.ACTION_CANCEL,
|
||||
originEvent.buttonState,
|
||||
originEvent.x,
|
||||
originEvent.y
|
||||
)
|
||||
}
|
||||
dragInProgress = false
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user