Merge pull request #13500 from woocommerce/build/update-gradle-to-8.1…

…2.1-and-agp-to-8.8 [Build] Update Gradle to 8.12.1 and AGP to 8.8
woocommerce · Feb 11, 2025 · 46bb108 · 46bb108
2 parents b483dbb + 92a2a6a
commit 46bb108
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 7 deletions.
diff --git a/WooCommerce-Wear/lint.xml b/WooCommerce-Wear/lint.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml version="1.0" encoding="UTF-8"?>
 <lint>
     <!-- WARNING -->
 

diff --git a/WooCommerce/src/main/AndroidManifest.xml b/WooCommerce/src/main/AndroidManifest.xml
@@ -214,7 +214,8 @@
         <service
             android:name=".media.ProductImagesJobService"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            tools:ignore="NewApi" />
 
         <!-- Provider for exposing file URIs on Android 7+ (required for camera) -->
         <provider

diff --git a/...rce/src/main/kotlin/com/woocommerce/android/ui/barcodescanner/BarcodeScanningViewModel.kt b/...rce/src/main/kotlin/com/woocommerce/android/ui/barcodescanner/BarcodeScanningViewModel.kt
@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.barcodescanner
 
 import androidx.activity.compose.ManagedActivityResultLauncher
 import androidx.annotation.StringRes
+import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageProxy
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -39,6 +40,7 @@ class BarcodeScanningViewModel @Inject constructor(
     fun startCodesRecognition() {
         frameChannel = createChannel()
         processingJob = launch {
+            @ExperimentalGetImage
             for (frame in frameChannel) {
                 codeScanner.recogniseCode(frame).let { status ->
                     when (status) {

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/CodeScanner.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/CodeScanner.kt
@@ -1,11 +1,13 @@
 package com.woocommerce.android.ui.orders.creation
 
 import android.os.Parcelable
+import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageProxy
 import com.woocommerce.android.ui.orders.creation.GoogleBarcodeFormatMapper.BarcodeFormat
 import kotlinx.parcelize.Parcelize
 
 interface CodeScanner {
+    @ExperimentalGetImage
     suspend fun recogniseCode(imageProxy: ImageProxy): CodeScannerStatus
 }
 

diff --git a/...erce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/GoogleMLKitCodeScanner.kt b/...erce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/GoogleMLKitCodeScanner.kt
@@ -1,5 +1,6 @@
 package com.woocommerce.android.ui.orders.creation
 
+import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageProxy
 import com.google.mlkit.vision.barcode.BarcodeScanner
 import com.google.mlkit.vision.barcode.common.Barcode
@@ -14,8 +15,8 @@ class GoogleMLKitCodeScanner @Inject constructor(
     private val barcodeFormatMapper: GoogleBarcodeFormatMapper,
     private val inputImageProvider: MediaImageProvider,
 ) : CodeScanner {
+    @ExperimentalGetImage
     override suspend fun recogniseCode(imageProxy: ImageProxy): CodeScannerStatus = suspendCoroutine { cont ->
-        @androidx.camera.core.ExperimentalGetImage
         val image = inputImageProvider.provideImage(imageProxy)
 
         val barcodeTask = barcodeScanner.process(image)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = '8.5.1'
+agp = '8.8.0'
 android-billingclient = '5.0.0'
 android-desugar = '2.1.3'
 android-security-lint = '1.0.1'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################