Update to target SDK 34, update dependencies (#1873)

app/build.gradle.kts

@@ -40,7 +40,7 @@ android {
  defaultConfig {
  applicationId = "io.github.fate_grand_automata"
  minSdk = 24
- targetSdk = 33
+ targetSdk = 34
  versionCode = System.getenv("FGA_VERSION_CODE")?.toInt() ?: 1
  versionName = System.getenv("FGA_VERSION_NAME") ?: System.getenv("FGA_VERSION_CODE") ?: "0.1.0"
  }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
  <uses-permission android:name="android.permission.VIBRATE" />
  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

app/src/main/java/io/github/fate_grand_automata/imaging/MediaProjectionScreenshotService.kt

@@ -2,6 +2,7 @@ package io.github.fate_grand_automata.imaging
 
 import android.annotation.SuppressLint
 import android.graphics.PixelFormat
+import android.hardware.display.VirtualDisplay
 import android.media.ImageReader
 import android.media.projection.MediaProjection
 import io.github.fate_grand_automata.util.StorageProvider
@@ -31,7 +32,13 @@ class MediaProjectionScreenshotService(
 
  @SuppressLint("WrongConstant")
  private val imageReader = ImageReader.newInstance(imageSize.width, imageSize.height, PixelFormat.RGBA_8888, 2)
- private val virtualDisplay = mediaProjection.createVirtualDisplay(
+ private val virtualDisplay = mediaProjection.apply {
+ this.registerCallback(object : MediaProjection.Callback() {
+ override fun onStop() {
+ close()
+ }
+ }, null)
+ }.createVirtualDisplay(
  "ScreenCapture",
  imageSize.width, imageSize.height, screenDensity,
  0, imageReader.surface, null, null

app/src/main/java/io/github/fate_grand_automata/runner/ScriptRunnerNotification.kt

@@ -6,6 +6,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
@@ -112,7 +113,18 @@ class ScriptRunnerNotification @Inject constructor(
  fun show() {
  val builder = startBuildNotification()
 
- service.startForeground(Ids.foregroundNotification, builder.build())
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ service.startForeground(
+ Ids.foregroundNotification,
+ builder.build(),
+ ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION
+ )
+ } else {
+ service.startForeground(
+ Ids.foregroundNotification,
+ builder.build()
+ )
+ }
  }
 
  fun message(msg: String) {
@@ -135,17 +147,17 @@ class ScriptRunnerNotification @Inject constructor(
  vibrate(100.milliseconds)
  }
 
- private fun vibrate(Duration: Duration) {
+ private fun vibrate(duration: Duration) {
  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
  vibrator.vibrate(
  VibrationEffect.createOneShot(
- Duration.inWholeMilliseconds,
+ duration.inWholeMilliseconds,
  VibrationEffect.DEFAULT_AMPLITUDE
  )
  )
  } else {
  @Suppress("DEPRECATION")
- vibrator.vibrate(Duration.inWholeMilliseconds)
+ vibrator.vibrate(duration.inWholeMilliseconds)
  }
  }
 

gradle/libs.versions.toml

@@ -1,38 +1,38 @@
 [versions]
-appcompat_version = "1.6.1"
-assertk_version = "0.28.0"
+appcompat_version = "1.7.0"
+assertk_version = "0.28.1"
 constraintlayout_version = "2.1.4"
-core_ktx_version = "1.12.0"
+core_ktx_version = "1.13.1"
 documentfile_version = "1.0.1"
 flow_preferences_version = "1.9.1"
 hilt_navigation_compose_version = "1.2.0"
-kotlinx_coroutines_core_version = "1.8.0"
-lifecycle_version = "2.7.0"
+kotlinx_coroutines_core_version = "1.8.1"
+lifecycle_version = "2.8.4"
 hilt_version = "2.51.1"
-gson_version = "2.10.1"
+gson_version = "2.11.0"
 
 
 kotlin_version = "2.0.0"
-ksp_version = "2.0.0-1.0.21"
+ksp_version = "2.0.0-1.0.24"
 
-gradle_version = "8.4.1"
+gradle_version = "8.4.2"
 
 
 ben-manes_versions = "0.51.0"
 accompanist_version = "0.34.0"
 
 google_android_play_version = "2.1.0"
 
-activity_version = "1.8.2"
-mockk_version = "1.13.10"
+activity_version = "1.9.1"
+mockk_version = "1.13.12"
 navigation_compose_version = "2.7.7"
 opencv_android_version = "4.8.1r2"
 recyclerview_version = "1.3.2"
 tesseract4android_version = "4.7.0"
 
 timber_version = "5.0.1"
 
-compose_bom_version = "2024.03.00"
+compose_bom_version = "2024.06.00"
 
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
- id("com.gradle.enterprise") version("3.16.2")
+ id("com.gradle.enterprise") version("3.17.6")
 }
 gradleEnterprise {
  buildScan {