移动目录、降级 AGP 和修复 Type mismatch

fhraise · Apr 20, 2024 · 7803a22 · 7803a22
1 parent b174084
commit 7803a22
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 5 deletions.
diff --git a/...xfqlittlefan/fhraise/DataStore.android.kt → ...c/androidMain/kotlin/DataStore.android.kt b/...xfqlittlefan/fhraise/DataStore.android.kt → ...c/androidMain/kotlin/DataStore.android.kt
diff --git a/.../xyz/xfqlittlefan/fhraise/MainActivity.kt → ...pp/src/androidMain/kotlin/MainActivity.kt b/.../xyz/xfqlittlefan/fhraise/MainActivity.kt → ...pp/src/androidMain/kotlin/MainActivity.kt
diff --git a/...in/xyz/xfqlittlefan/fhraise/Permission.kt → ...-app/src/androidMain/kotlin/Permission.kt b/...in/xyz/xfqlittlefan/fhraise/Permission.kt → ...-app/src/androidMain/kotlin/Permission.kt
diff --git a/...lefan/fhraise/activity/FhraiseActivity.kt → ...idMain/kotlin/activity/FhraiseActivity.kt b/...lefan/fhraise/activity/FhraiseActivity.kt → ...idMain/kotlin/activity/FhraiseActivity.kt
diff --git a/...tlefan/fhraise/browser/BrowserActivity.kt → ...oidMain/kotlin/browser/BrowserActivity.kt b/...tlefan/fhraise/browser/BrowserActivity.kt → ...oidMain/kotlin/browser/BrowserActivity.kt
diff --git a/...qlittlefan/fhraise/browser/BrowserFlow.kt → ...androidMain/kotlin/browser/BrowserFlow.kt b/...qlittlefan/fhraise/browser/BrowserFlow.kt → ...androidMain/kotlin/browser/BrowserFlow.kt
diff --git a/...hraise/compositionLocals/LocalActivity.kt → ...kotlin/compositionLocals/LocalActivity.kt b/...hraise/compositionLocals/LocalActivity.kt → ...kotlin/compositionLocals/LocalActivity.kt
diff --git a/...ittlefan/fhraise/link/DeepLinkActivity.kt → ...droidMain/kotlin/link/DeepLinkActivity.kt b/...ittlefan/fhraise/link/DeepLinkActivity.kt → ...droidMain/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/...aise/oauth/Microsoft.commonJvm.android.kt → ...tlin/oauth/Microsoft.commonJvm.android.kt b/...aise/oauth/Microsoft.commonJvm.android.kt → ...tlin/oauth/Microsoft.commonJvm.android.kt
diff --git a/...fhraise/oauth/OAuthApplication.android.kt → .../kotlin/oauth/OAuthApplication.android.kt b/...fhraise/oauth/OAuthApplication.android.kt → .../kotlin/oauth/OAuthApplication.android.kt
diff --git a/.../fhraise/platform/Notification.android.kt → ...n/kotlin/platform/Notification.android.kt b/.../fhraise/platform/Notification.android.kt → ...n/kotlin/platform/Notification.android.kt
diff --git a/...an/fhraise/platform/Permission.android.kt → ...ain/kotlin/platform/Permission.android.kt b/...an/fhraise/platform/Permission.android.kt → ...ain/kotlin/platform/Permission.android.kt
diff --git a/...xfqlittlefan/fhraise/platform/Platform.kt → ...c/androidMain/kotlin/platform/Platform.kt b/...xfqlittlefan/fhraise/platform/Platform.kt → ...c/androidMain/kotlin/platform/Platform.kt
diff --git a/...littlefan/fhraise/platform/Url.android.kt → ...ndroidMain/kotlin/platform/Url.android.kt b/...littlefan/fhraise/platform/Url.android.kt → ...ndroidMain/kotlin/platform/Url.android.kt
diff --git a/...tlefan/fhraise/platform/Window.android.kt → ...oidMain/kotlin/platform/Window.android.kt b/...tlefan/fhraise/platform/Window.android.kt → ...oidMain/kotlin/platform/Window.android.kt
diff --git a/...littlefan/fhraise/service/OAuthService.kt → ...ndroidMain/kotlin/service/OAuthService.kt b/...littlefan/fhraise/service/OAuthService.kt → ...ndroidMain/kotlin/service/OAuthService.kt
diff --git a/.../xfqlittlefan/fhraise/ui/Theme.android.kt → ...rc/androidMain/kotlin/ui/Theme.android.kt b/.../xfqlittlefan/fhraise/ui/Theme.android.kt → ...rc/androidMain/kotlin/ui/Theme.android.kt
diff --git a/...ittlefan/fhraise/ui/WindowSize.android.kt → ...droidMain/kotlin/ui/WindowSize.android.kt b/...ittlefan/fhraise/ui/WindowSize.android.kt → ...droidMain/kotlin/ui/WindowSize.android.kt
diff --git a/...raise/ui/composables/Scrollbar.android.kt → ...otlin/ui/composables/Scrollbar.android.kt b/...raise/ui/composables/Scrollbar.android.kt → ...otlin/ui/composables/Scrollbar.android.kt
diff --git 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"