From ed76f816e6aa64ec164857e794d3255616bff7f0 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Tue, 20 May 2025 07:59:20 +0200 Subject: [PATCH] Android: Avoid deprecation warnings (Space-assignment syntax) Space-assignment syntax in Groovy DSL has been deprecated. This is scheduled to be removed in Gradle 10.0. Pick-to: 6.9 Change-Id: I2029af79b25351337c32db96053548ce5f4f47ae Reviewed-by: Assam Boudjelthia --- src/android/jar/build.gradle | 4 ++-- src/android/templates/build.gradle | 6 +++--- src/network/android/jar/build.gradle | 2 +- src/plugins/networkinformation/android/jar/build.gradle | 2 +- .../platform/android_legacy_packaging/testdata/build.gradle | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index 3085db75bc1..2ab607b62ea 100644 --- a/src/android/jar/build.gradle +++ b/src/android/jar/build.gradle @@ -24,7 +24,7 @@ repositories { android { compileSdk 35 - namespace "org.qtproject.qt.android" + namespace = "org.qtproject.qt.android" defaultConfig { minSdkVersion 28 @@ -55,7 +55,7 @@ android { android { lintOptions { - abortOnError true + abortOnError = true } } } diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index 7de813a8089..05aeda79284 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -38,10 +38,10 @@ android { * Changing them manually might break the compilation! *******************************************************/ - namespace androidPackageName + namespace = androidPackageName compileSdkVersion androidCompileSdkVersion buildToolsVersion androidBuildToolsVersion - ndkVersion androidNdkVersion + ndkVersion = androidNdkVersion sourceSets { main { @@ -66,7 +66,7 @@ android { } lintOptions { - abortOnError false + abortOnError = false } // Do not compress Qt binary resources file diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle index 73658c68b12..99e835c6d43 100644 --- a/src/network/android/jar/build.gradle +++ b/src/network/android/jar/build.gradle @@ -45,7 +45,7 @@ android { android { lintOptions { - abortOnError true + abortOnError = true } } } diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle index 73658c68b12..99e835c6d43 100644 --- a/src/plugins/networkinformation/android/jar/build.gradle +++ b/src/plugins/networkinformation/android/jar/build.gradle @@ -45,7 +45,7 @@ android { android { lintOptions { - abortOnError true + abortOnError = true } } } diff --git a/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle b/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle index d2c8dcd1ce9..0df74ec2635 100644 --- a/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle +++ b/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle @@ -36,10 +36,10 @@ android { * Changing them manually might break the compilation! *******************************************************/ - namespace androidPackageName + namespace = androidPackageName compileSdkVersion androidCompileSdkVersion buildToolsVersion androidBuildToolsVersion - ndkVersion androidNdkVersion + ndkVersion = androidNdkVersion // Extract native libraries from the APK packagingOptions.jniLibs.useLegacyPackaging true @@ -67,7 +67,7 @@ android { } lintOptions { - abortOnError false + abortOnError = false } // Do not compress Qt binary resources file