From 68658cb30ab9031d946b7c5d99dc9bca6f90e248 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 11 Aug 2022 18:13:58 -0700 Subject: [PATCH 1/4] Revert "[path_provider]: Bump gradle from 3.3.0 to 7.2.2 in /packages/path_provider/path_provider_android/android (#6189)" This reverts commit e9d8479a4d03b640300001b5e79af7d8833780c6. --- packages/path_provider/path_provider_android/CHANGELOG.md | 7 +------ .../path_provider_android/android/build.gradle | 4 ++-- packages/path_provider/path_provider_android/pubspec.yaml | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md index 0ea517ed9feb..c56d19f32afb 100644 --- a/packages/path_provider/path_provider_android/CHANGELOG.md +++ b/packages/path_provider/path_provider_android/CHANGELOG.md @@ -1,11 +1,6 @@ -## 2.0.19 - -* Bumps kotlin to 1.7.10 - ## 2.0.18 -* Bumps `androidx.annotation:annotation` version to 1.4.0. -* Bumps gradle version to 7.2.2. +* Bumps kotlin to 1.7.10 ## 2.0.17 diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index 53e39b17ceff..c2214b396b6a 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:3.3.0' } } @@ -53,7 +53,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.4.0' + implementation 'androidx.annotation:annotation:1.1.0' implementation 'com.google.guava:guava:28.1-android' testImplementation 'junit:junit:4.13.2' } diff --git a/packages/path_provider/path_provider_android/pubspec.yaml b/packages/path_provider/path_provider_android/pubspec.yaml index 94ff726c2d46..232e63cf714f 100644 --- a/packages/path_provider/path_provider_android/pubspec.yaml +++ b/packages/path_provider/path_provider_android/pubspec.yaml @@ -2,7 +2,7 @@ name: path_provider_android description: Android implementation of the path_provider plugin. repository: https://github.com/flutter/plugins/tree/main/packages/path_provider/path_provider_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22 -version: 2.0.19 +version: 2.0.18 environment: sdk: ">=2.14.0 <3.0.0" From 42c9546206cddacd5675d00d974e4fbef72f365f Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 11 Aug 2022 18:21:04 -0700 Subject: [PATCH 2/4] Bump version to 20 --- packages/path_provider/path_provider_android/CHANGELOG.md | 2 +- packages/path_provider/path_provider_android/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md index c56d19f32afb..6dcf9e650ffc 100644 --- a/packages/path_provider/path_provider_android/CHANGELOG.md +++ b/packages/path_provider/path_provider_android/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.18 +## 2.0.20 * Bumps kotlin to 1.7.10 diff --git a/packages/path_provider/path_provider_android/pubspec.yaml b/packages/path_provider/path_provider_android/pubspec.yaml index 232e63cf714f..c442d16a6889 100644 --- a/packages/path_provider/path_provider_android/pubspec.yaml +++ b/packages/path_provider/path_provider_android/pubspec.yaml @@ -2,7 +2,7 @@ name: path_provider_android description: Android implementation of the path_provider plugin. repository: https://github.com/flutter/plugins/tree/main/packages/path_provider/path_provider_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22 -version: 2.0.18 +version: 2.0.20 environment: sdk: ">=2.14.0 <3.0.0" From 9b851132b0cbbae654dfa8e99606138f254a9079 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 12 Aug 2022 09:17:57 -0700 Subject: [PATCH 3/4] Fix changelog --- .../path_provider/path_provider_android/CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md index 6dcf9e650ffc..1fdd6542de66 100644 --- a/packages/path_provider/path_provider_android/CHANGELOG.md +++ b/packages/path_provider/path_provider_android/CHANGELOG.md @@ -1,7 +1,16 @@ ## 2.0.20 +* Reverts changes in version 2.0.18. + +## 2.0.19 + * Bumps kotlin to 1.7.10 +## 2.0.18 + +* Bumps `androidx.annotation:annotation` version to 1.4.0. +* Bumps gradle version to 7.2.2. + ## 2.0.17 * Lower minimim version back to 2.8.1. From 0f09cef836618cd2ed833bfd44618a54f822065d Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 12 Aug 2022 12:38:39 -0700 Subject: [PATCH 4/4] Revert kotlin bump --- packages/path_provider/path_provider_android/CHANGELOG.md | 2 +- .../path_provider/path_provider_android/android/build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md index 1fdd6542de66..63a731acbd91 100644 --- a/packages/path_provider/path_provider_android/CHANGELOG.md +++ b/packages/path_provider/path_provider_android/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.0.20 -* Reverts changes in version 2.0.18. +* Reverts changes in versions 2.0.18 and 2.0.19. ## 2.0.19 diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index c2214b396b6a..4bfa738ac44c 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -2,7 +2,6 @@ group 'io.flutter.plugins.pathprovider' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.10' repositories { google() mavenCentral()