Add changes to comply with google requirement to target SDK 33 or higher for Android

main
Doug McLain 1 year ago
parent 84b7d459d3
commit 71eeb94fd0

@ -7,8 +7,8 @@ equals(QT_MAJOR_VERSION, 5){
unix:!ios:QT += serialport unix:!ios:QT += serialport
CONFIG += c++11 CONFIG += c++11
LFLAGS += LFLAGS +=
android:INCLUDEPATH += $$(HOME)/Android/android-build/include android:INCLUDEPATH += $$(HOME)/Android/local/include
LIBS += -limbe_vocoder # -lvocoder LIBS += -limbe_vocoder -lvocoder
!win32:LIBS += -ldl !win32:LIBS += -ldl
win32:QT += serialport win32:QT += serialport
win32:INCLUDEPATH += /mnt/data/src/winlibs/include win32:INCLUDEPATH += /mnt/data/src/winlibs/include

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="75" android:installLocation="auto"> <manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="76" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
@ -72,5 +72,5 @@
</activity> </activity>
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices --> <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
</application> </application>
<uses-sdk android:targetSdkVersion="31"/>
</manifest> </manifest>

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.0.0'
} }
} }
@ -37,7 +37,9 @@ android {
compileSdkVersion androidCompileSdkVersion.toInteger() compileSdkVersion androidCompileSdkVersion.toInteger()
buildToolsVersion '28.0.3' buildToolsVersion '28.0.3'
defaultConfig {
targetSdkVersion 34
}
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'

@ -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-6.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Loading…
Cancel
Save