Android: Fix Serial Issues

mavlink · Nov 7, 2024 · 80e38a2 · 80e38a2
1 parent b8d721e
commit 80e38a2
Show file tree

Hide file tree

Showing 13 changed files with 1,533 additions and 1,345 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
@@ -20,7 +20,7 @@ apply plugin: 'com.android.application'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation 'androidx.core:core:1.12.0'
-    implementation 'com.github.mik3y:usb-serial-for-android:3.8.0'
+    implementation 'com.github.mik3y:usb-serial-for-android:3.8.1'
 }
 
 def getTimestampStr() { return new Date().format('yyyyMMddHHmmss') }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/android/libs/qtandroidserialport/CMakeLists.txt b/android/libs/qtandroidserialport/CMakeLists.txt
@@ -27,3 +27,5 @@ target_link_libraries(qtandroidserialport
 )
 
 target_include_directories(qtandroidserialport PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+# target_compile_definitions(qtandroidserialport PUBLIC QIODEVICE_DEBUG)