Skip to content

Commit 46bb108

Browse files
authored
Merge pull request #13500 from woocommerce/build/update-gradle-to-8.12.1-and-agp-to-8.8
[Build] Update Gradle to 8.12.1 and AGP to 8.8
2 parents b483dbb + 92a2a6a commit 46bb108

File tree

10 files changed

+16
-7
lines changed

10 files changed

+16
-7
lines changed

WooCommerce-Wear/lint.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml version="1.0" encoding="UTF-8"?>
32
<lint>
43
<!-- WARNING -->
54

WooCommerce/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@
214214
<service
215215
android:name=".media.ProductImagesJobService"
216216
android:exported="false"
217-
android:permission="android.permission.BIND_JOB_SERVICE" />
217+
android:permission="android.permission.BIND_JOB_SERVICE"
218+
tools:ignore="NewApi" />
218219

219220
<!-- Provider for exposing file URIs on Android 7+ (required for camera) -->
220221
<provider

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/barcodescanner/BarcodeScanningViewModel.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.barcodescanner
22

33
import androidx.activity.compose.ManagedActivityResultLauncher
44
import androidx.annotation.StringRes
5+
import androidx.camera.core.ExperimentalGetImage
56
import androidx.camera.core.ImageProxy
67
import androidx.lifecycle.LiveData
78
import androidx.lifecycle.MutableLiveData
@@ -39,6 +40,7 @@ class BarcodeScanningViewModel @Inject constructor(
3940
fun startCodesRecognition() {
4041
frameChannel = createChannel()
4142
processingJob = launch {
43+
@ExperimentalGetImage
4244
for (frame in frameChannel) {
4345
codeScanner.recogniseCode(frame).let { status ->
4446
when (status) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/CodeScanner.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.woocommerce.android.ui.orders.creation
22

33
import android.os.Parcelable
4+
import androidx.camera.core.ExperimentalGetImage
45
import androidx.camera.core.ImageProxy
56
import com.woocommerce.android.ui.orders.creation.GoogleBarcodeFormatMapper.BarcodeFormat
67
import kotlinx.parcelize.Parcelize
78

89
interface CodeScanner {
10+
@ExperimentalGetImage
911
suspend fun recogniseCode(imageProxy: ImageProxy): CodeScannerStatus
1012
}
1113

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/GoogleMLKitCodeScanner.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.woocommerce.android.ui.orders.creation
22

3+
import androidx.camera.core.ExperimentalGetImage
34
import androidx.camera.core.ImageProxy
45
import com.google.mlkit.vision.barcode.BarcodeScanner
56
import com.google.mlkit.vision.barcode.common.Barcode
@@ -14,8 +15,8 @@ class GoogleMLKitCodeScanner @Inject constructor(
1415
private val barcodeFormatMapper: GoogleBarcodeFormatMapper,
1516
private val inputImageProvider: MediaImageProvider,
1617
) : CodeScanner {
18+
@ExperimentalGetImage
1719
override suspend fun recogniseCode(imageProxy: ImageProxy): CodeScannerStatus = suspendCoroutine { cont ->
18-
@androidx.camera.core.ExperimentalGetImage
1920
val image = inputImageProvider.provideImage(imageProxy)
2021

2122
val barcodeTask = barcodeScanner.process(image)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = '8.5.1'
2+
agp = '8.8.0'
33
android-billingclient = '5.0.0'
44
android-desugar = '2.1.3'
55
android-security-lint = '1.0.1'

gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum

gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

0 commit comments

Comments
 (0)