From f3c46944f5b136310da2f7fc19f56d2f182d66de Mon Sep 17 00:00:00 2001
From: iota9star <iota9star@foxmail.com>
Date: Sun, 25 Sep 2022 00:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20Release=20v1.0.0-RC34.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-GP.yml           | 3 ++-
 android/app/src/main/AndroidManifest.xml | 1 +
 linux/my_application.cc                  | 8 ++++----
 pubspec.yaml                             | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-GP.yml b/.github/workflows/build-GP.yml
index 4a632c6..8f44b7c 100644
--- a/.github/workflows/build-GP.yml
+++ b/.github/workflows/build-GP.yml
@@ -43,7 +43,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
       - name: Release to GP
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@v1.0.18
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: io.nichijou.flutter.mikan
@@ -52,3 +52,4 @@ jobs:
           inAppUpdatePriority: 3
           status: completed
           mappingFile: build/app/outputs/mapping/release/mapping.txt
+          changesNotSentForReview: true
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5fa5168..0c5ff06 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.nichijou.flutter.mikan">
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/linux/my_application.cc b/linux/my_application.cc
index decc63d..63b161d 100644
--- a/linux/my_application.cc
+++ b/linux/my_application.cc
@@ -6,7 +6,7 @@
 #endif
 
 #include "flutter/generated_plugin_registrant.h"
-#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
+//#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
 
 struct _MyApplication {
   GtkApplication parent_instance;
@@ -48,10 +48,10 @@ static void my_application_activate(GApplication* application) {
     gtk_window_set_title(window, "MikanProject");
   }
 
-  auto bdw = bitsdojo_window_from(window);
+//  auto bdw = bitsdojo_window_from(window);
 //  bdw->setCustomFrame(true);
-  //gtk_window_set_default_size(window, 1280, 720);
-  gtk_window_set_icon_from_file(GTK_WINDOW(window), "assets/mikan.png", NULL);
+  gtk_window_set_default_size(window, 1280, 720);
+  gtk_window_set_icon_from_file(GTK_WINDOW(window), "data/flutter_assets/assets/mikan.png", NULL);
   gtk_widget_show(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
diff --git a/pubspec.yaml b/pubspec.yaml
index d739a24..9eee2fa 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: mikan_flutter
 description: mikanani.me
 
-version: 1.0.0-RC33+55
+version: 1.0.0-RC34+56
 
 publish_to: none
 
@@ -49,6 +49,7 @@ dependencies:
   collection: ^1.16.0
   json_annotation: ^4.6.0
   path: ^1.8.2
+  cookie_jar: ^3.0.1
 
 
 dev_dependencies: