From e17f8b1c9abbabc2b625d8d927a2a080bf230cdb Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Fri, 14 Apr 2023 07:14:30 -0400
Subject: [PATCH] [shared_preferences] Fix Android Java version issue

Sets the compile version to 1.8, which is required by some features
added in the switch to Pigeon. This is a standard part of the current
Android plugin template, but this plugin predates that template change.

Fixes https://github.com/flutter/flutter/issues/124839
---
 .../shared_preferences_android/CHANGELOG.md                  | 4 ++++
 .../shared_preferences_android/android/build.gradle          | 5 +++++
 .../shared_preferences_android/pubspec.yaml                  | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
index 9ba3e781ba4..def89d10128 100644
--- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
+++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.2
+
+* Sets the required Java compile version to 1.8 for new features used in 2.1.1.
+
 ## 2.1.1
 
 * Updates minimum Flutter version to 3.0.
diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle
index e7396887cff..e2e68582c45 100644
--- a/packages/shared_preferences/shared_preferences_android/android/build.gradle
+++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle
@@ -32,6 +32,11 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/packages/shared_preferences/shared_preferences_android/pubspec.yaml b/packages/shared_preferences/shared_preferences_android/pubspec.yaml
index 570f9931257..a6608a66ca6 100644
--- a/packages/shared_preferences/shared_preferences_android/pubspec.yaml
+++ b/packages/shared_preferences/shared_preferences_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: shared_preferences_android
 description: Android implementation of the shared_preferences plugin
 repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
-version: 2.1.1
+version: 2.1.2
 
 environment:
   sdk: ">=2.17.0 <4.0.0"