From 7349e758c6dc9d531e44c66dfea9c5db5f16e34a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 21:07:19 +0000 Subject: [PATCH 1/6] [in_app_pur]: Bump androidx.annotation:annotation Bumps androidx.annotation:annotation from 1.5.0 to 1.6.0. --- updated-dependencies: - dependency-name: androidx.annotation:annotation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../in_app_purchase_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index 95a744d08eea..d030d263ef60 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.annotation:annotation:1.6.0' implementation 'com.android.billingclient:billing:5.1.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20230227' From f7fab0fe78c731aaad8f7055e3d0ab68155a74d0 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Tue, 21 Mar 2023 14:17:30 -0700 Subject: [PATCH 2/6] Update CHANGELOG.md --- packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md index 6b63b1c7ce57..e278b6c15fc4 100644 --- a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.4+4 + +* Updates androidx.annotation:annotation from 1.5.0 to 1.6.0. + ## 0.2.4+3 * Clarifies explanation of endorsement in README. From ab05ac12abc3b3226705476a75bffc57c070d8e7 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Tue, 21 Mar 2023 14:17:43 -0700 Subject: [PATCH 3/6] Update pubspec.yaml --- packages/in_app_purchase/in_app_purchase_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml index 0504ff625e98..c69df6b9635e 100644 --- a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase_android description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs. repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.2.4+3 +version: 0.2.4+4 environment: sdk: ">=2.17.0 <3.0.0" From 0563853b5497089334a4c94058cf999c9b3d5251 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Mon, 10 Apr 2023 14:27:33 -0700 Subject: [PATCH 4/6] testing line to fix build issues --- .../in_app_purchase/in_app_purchase_android/android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index d030d263ef60..798e77d434fc 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -52,6 +52,7 @@ android { dependencies { implementation 'androidx.annotation:annotation:1.6.0' + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) implementation 'com.android.billingclient:billing:5.1.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20230227' From 7945a10a74b735a560beb7ca60e42c7f145f3a2c Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:28:19 -0700 Subject: [PATCH 5/6] Update build.gradle to accept review comments --- .../in_app_purchase_android/android/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index c31a59ec32ff..ea983fd87913 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -55,6 +55,8 @@ android { dependencies { implementation 'androidx.annotation:annotation:1.6.0' + // org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions. + // See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7 implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) implementation 'com.android.billingclient:billing:5.1.0' testImplementation 'junit:junit:4.13.2' From b999b5c7e3812aabc793e0562773da7567ba4f1e Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:48:15 -0700 Subject: [PATCH 6/6] Update pubspec.yaml --- packages/in_app_purchase/in_app_purchase_android/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml index 8e7d68511b44..1945d79f092c 100644 --- a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase_android description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs. repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.2.5+1 +version: 0.2.5+2 environment: sdk: ">=2.18.0 <4.0.0"