From d52bbd26da7ff38f15c98110aaf34f8e4af47a62 Mon Sep 17 00:00:00 2001
From: Ryotaro Onoue <73390859+YumNumm@users.noreply.github.com>
Date: Sat, 6 Apr 2024 02:38:51 +0900
Subject: [PATCH] =?UTF-8?q?Android=E3=81=AEApp=E5=86=85=E8=AA=B2=E9=87=91?=
 =?UTF-8?q?=E3=81=AE=E5=AE=9F=E8=A3=85=20(#622)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: import

* fix: import

* add: api key
---
 app/android/app/build.gradle                         | 8 ++++----
 app/lib/feature/donation/data/donation_notifier.dart | 6 ++++--
 app/lib/main.dart                                    | 1 +
 app/pubspec.yaml                                     | 1 +
 pubspec.lock                                         | 4 ++--
 pubspec.yaml                                         | 1 +
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index dfc4adc8d..1a1d5a875 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -30,12 +30,12 @@ android {
 
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
@@ -45,7 +45,7 @@ android {
     defaultConfig {
         applicationId 'net.yumnumm.eqmonitor'
         minSdkVersion 26
-        targetSdkVersion 34
+        targetSdk 34
         multiDexEnabled true
         versionCode localProperties.getProperty('flutter.versionCode').toInteger()
         versionName localProperties.getProperty('flutter.versionName')
diff --git a/app/lib/feature/donation/data/donation_notifier.dart b/app/lib/feature/donation/data/donation_notifier.dart
index 03a01e0e6..db0ceced9 100644
--- a/app/lib/feature/donation/data/donation_notifier.dart
+++ b/app/lib/feature/donation/data/donation_notifier.dart
@@ -9,9 +9,11 @@ Future<void> initInAppPurchase() async {
     kDebugMode ? LogLevel.debug : LogLevel.warn,
   );
 
+  // Public App-specific API Keys
   final configuration = switch (defaultTargetPlatform) {
-    // TODO(YumNumm): Android側の設定やる
-    TargetPlatform.android => throw UnimplementedError(),
+    TargetPlatform.android => PurchasesConfiguration(
+        'goog_aEcAyBNviKgaKzmCwAOXSiXwHIb',
+      ),
     TargetPlatform.iOS => PurchasesConfiguration(
         'appl_BUymtTPkwhhVuihBlVOddLxOBaQ',
       ),
diff --git a/app/lib/main.dart b/app/lib/main.dart
index f8b7a923e..616d0d4a8 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -13,6 +13,7 @@ import 'package:eqmonitor/core/provider/kmoni_observation_points/provider/kyoshi
 import 'package:eqmonitor/core/provider/log/talker.dart';
 import 'package:eqmonitor/core/provider/package_info.dart';
 import 'package:eqmonitor/core/provider/shared_preferences.dart';
+import 'package:eqmonitor/feature/donation/data/donation_notifier.dart';
 import 'package:eqmonitor/firebase_options.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 575b308d9..40c0ab11e 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -50,6 +50,7 @@ dependencies:
   group_button: ^5.3.4
   hooks_riverpod: ^3.0.0-dev.3
   image: ^4.1.7
+  in_app_review: ^2.0.9
   integration_test:
     sdk: flutter
   intl: ^0.18.1
diff --git a/pubspec.lock b/pubspec.lock
index dc075d414..bec882cbd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -149,10 +149,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.11.0"
   mustache_template:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index ab546328c..ff0a49747 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,5 +4,6 @@ version: 1.0.0
 
 environment:
   sdk: ^3.3.0
+
 dependencies:
   melos: ^4.1.0