From 7803a2208800db6894108b9fda022551c68bc341 Mon Sep 17 00:00:00 2001
From: LTFan <xfqwdsj@qq.com>
Date: Sat, 20 Apr 2024 18:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=9B=AE=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E9=99=8D=E7=BA=A7=20AGP=20=E5=92=8C=E4=BF=AE=E5=A4=8D=20Type?=
 =?UTF-8?q?=20mismatch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{xyz/xfqlittlefan/fhraise => }/DataStore.android.kt   | 0
 .../kotlin/{xyz/xfqlittlefan/fhraise => }/MainActivity.kt | 0
 .../kotlin/{xyz/xfqlittlefan/fhraise => }/Permission.kt   | 0
 .../xfqlittlefan/fhraise => }/activity/FhraiseActivity.kt | 0
 .../xfqlittlefan/fhraise => }/browser/BrowserActivity.kt  | 0
 .../{xyz/xfqlittlefan/fhraise => }/browser/BrowserFlow.kt | 0
 .../fhraise => }/compositionLocals/LocalActivity.kt       | 0
 .../xfqlittlefan/fhraise => }/link/DeepLinkActivity.kt    | 8 ++++----
 .../fhraise => }/oauth/Microsoft.commonJvm.android.kt     | 0
 .../fhraise => }/oauth/OAuthApplication.android.kt        | 0
 .../fhraise => }/platform/Notification.android.kt         | 0
 .../fhraise => }/platform/Permission.android.kt           | 0
 .../{xyz/xfqlittlefan/fhraise => }/platform/Platform.kt   | 0
 .../xfqlittlefan/fhraise => }/platform/Url.android.kt     | 0
 .../xfqlittlefan/fhraise => }/platform/Window.android.kt  | 0
 .../xfqlittlefan/fhraise => }/service/OAuthService.kt     | 0
 .../{xyz/xfqlittlefan/fhraise => }/ui/Theme.android.kt    | 0
 .../xfqlittlefan/fhraise => }/ui/WindowSize.android.kt    | 0
 .../fhraise => }/ui/composables/Scrollbar.android.kt      | 0
 gradle/libs.versions.toml                                 | 2 +-
 20 files changed, 5 insertions(+), 5 deletions(-)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/DataStore.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/MainActivity.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/Permission.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/activity/FhraiseActivity.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/browser/BrowserActivity.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/browser/BrowserFlow.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/compositionLocals/LocalActivity.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/link/DeepLinkActivity.kt (90%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/oauth/Microsoft.commonJvm.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/oauth/OAuthApplication.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/platform/Notification.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/platform/Permission.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/platform/Platform.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/platform/Url.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/platform/Window.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/service/OAuthService.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/ui/Theme.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/ui/WindowSize.android.kt (100%)
 rename compose-app/src/androidMain/kotlin/{xyz/xfqlittlefan/fhraise => }/ui/composables/Scrollbar.android.kt (100%)

diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/DataStore.android.kt b/compose-app/src/androidMain/kotlin/DataStore.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/DataStore.android.kt
rename to compose-app/src/androidMain/kotlin/DataStore.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/MainActivity.kt b/compose-app/src/androidMain/kotlin/MainActivity.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/MainActivity.kt
rename to compose-app/src/androidMain/kotlin/MainActivity.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/Permission.kt b/compose-app/src/androidMain/kotlin/Permission.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/Permission.kt
rename to compose-app/src/androidMain/kotlin/Permission.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/activity/FhraiseActivity.kt b/compose-app/src/androidMain/kotlin/activity/FhraiseActivity.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/activity/FhraiseActivity.kt
rename to compose-app/src/androidMain/kotlin/activity/FhraiseActivity.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/browser/BrowserActivity.kt b/compose-app/src/androidMain/kotlin/browser/BrowserActivity.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/browser/BrowserActivity.kt
rename to compose-app/src/androidMain/kotlin/browser/BrowserActivity.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/browser/BrowserFlow.kt b/compose-app/src/androidMain/kotlin/browser/BrowserFlow.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/browser/BrowserFlow.kt
rename to compose-app/src/androidMain/kotlin/browser/BrowserFlow.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/compositionLocals/LocalActivity.kt b/compose-app/src/androidMain/kotlin/compositionLocals/LocalActivity.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/compositionLocals/LocalActivity.kt
rename to compose-app/src/androidMain/kotlin/compositionLocals/LocalActivity.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/link/DeepLinkActivity.kt b/compose-app/src/androidMain/kotlin/link/DeepLinkActivity.kt
similarity index 90%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/link/DeepLinkActivity.kt
rename to compose-app/src/androidMain/kotlin/link/DeepLinkActivity.kt
index d265e4a..fe6ee8e 100644
--- a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/link/DeepLinkActivity.kt
+++ b/compose-app/src/androidMain/kotlin/link/DeepLinkActivity.kt
@@ -29,14 +29,14 @@ class DeepLinkActivity : FhraiseActivity() {
         handleDeepLink(intent)
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         handleDeepLink(intent)
     }
 
-    private fun handleDeepLink(intent: Intent?) {
-        val data = intent?.data
-        if (intent == null || data == null) {
+    private fun handleDeepLink(intent: Intent) {
+        val data = intent.data
+        if (data == null) {
             launchMain()
             return
         }
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/oauth/Microsoft.commonJvm.android.kt b/compose-app/src/androidMain/kotlin/oauth/Microsoft.commonJvm.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/oauth/Microsoft.commonJvm.android.kt
rename to compose-app/src/androidMain/kotlin/oauth/Microsoft.commonJvm.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/oauth/OAuthApplication.android.kt b/compose-app/src/androidMain/kotlin/oauth/OAuthApplication.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/oauth/OAuthApplication.android.kt
rename to compose-app/src/androidMain/kotlin/oauth/OAuthApplication.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Notification.android.kt b/compose-app/src/androidMain/kotlin/platform/Notification.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Notification.android.kt
rename to compose-app/src/androidMain/kotlin/platform/Notification.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Permission.android.kt b/compose-app/src/androidMain/kotlin/platform/Permission.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Permission.android.kt
rename to compose-app/src/androidMain/kotlin/platform/Permission.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Platform.kt b/compose-app/src/androidMain/kotlin/platform/Platform.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Platform.kt
rename to compose-app/src/androidMain/kotlin/platform/Platform.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Url.android.kt b/compose-app/src/androidMain/kotlin/platform/Url.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Url.android.kt
rename to compose-app/src/androidMain/kotlin/platform/Url.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Window.android.kt b/compose-app/src/androidMain/kotlin/platform/Window.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/platform/Window.android.kt
rename to compose-app/src/androidMain/kotlin/platform/Window.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/service/OAuthService.kt b/compose-app/src/androidMain/kotlin/service/OAuthService.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/service/OAuthService.kt
rename to compose-app/src/androidMain/kotlin/service/OAuthService.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/ui/Theme.android.kt b/compose-app/src/androidMain/kotlin/ui/Theme.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/ui/Theme.android.kt
rename to compose-app/src/androidMain/kotlin/ui/Theme.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/ui/WindowSize.android.kt b/compose-app/src/androidMain/kotlin/ui/WindowSize.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/ui/WindowSize.android.kt
rename to compose-app/src/androidMain/kotlin/ui/WindowSize.android.kt
diff --git a/compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/ui/composables/Scrollbar.android.kt b/compose-app/src/androidMain/kotlin/ui/composables/Scrollbar.android.kt
similarity index 100%
rename from compose-app/src/androidMain/kotlin/xyz/xfqlittlefan/fhraise/ui/composables/Scrollbar.android.kt
rename to compose-app/src/androidMain/kotlin/ui/composables/Scrollbar.android.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bc09d5f..0fb8576 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ kotlinx-atomicfu = "0.23.2"
 kotlinx-coroutines = "1.8.0"
 kotlinx-datetime = "0.5.0"
 kotlinx-serilization = "1.6.3"
-agp = "8.3.2"
+agp = "8.2.2"
 androidx-core-splashscreen = "1.0.1"
 androidx-window = "1.2.0"
 androidx-activity-compose = "1.9.0"