From 71eeb94fd002bbcc0055da5f6385a6a51a3f57ab Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Tue, 3 Oct 2023 15:33:18 -0400 Subject: [PATCH] Add changes to comply with google requirement to target SDK 33 or higher for Android --- DroidStar.pro | 4 ++-- android/AndroidManifest.xml | 4 ++-- android/build.gradle | 8 +++++--- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/DroidStar.pro b/DroidStar.pro index 752f36d..b0ac966 100644 --- a/DroidStar.pro +++ b/DroidStar.pro @@ -7,8 +7,8 @@ equals(QT_MAJOR_VERSION, 5){ unix:!ios:QT += serialport CONFIG += c++11 LFLAGS += -android:INCLUDEPATH += $$(HOME)/Android/android-build/include -LIBS += -limbe_vocoder # -lvocoder +android:INCLUDEPATH += $$(HOME)/Android/local/include +LIBS += -limbe_vocoder -lvocoder !win32:LIBS += -ldl win32:QT += serialport win32:INCLUDEPATH += /mnt/data/src/winlibs/include diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 66c380b..0fcef6a 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + - + diff --git a/android/build.gradle b/android/build.gradle index 7f78543..b7c11c4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.0.0' } } @@ -36,8 +36,10 @@ android { compileSdkVersion androidCompileSdkVersion.toInteger() - buildToolsVersion '28.0.3' - + buildToolsVersion '28.0.3' + defaultConfig { + targetSdkVersion 34 + } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 186b715..fbce071 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists