diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index e39012b715..e6c21d9379 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -8,16 +8,16 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4.2.2 with: submodules: recursive - - name: set up JDK 17 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v3.14.1 with: java-version: '17' distribution: 'adopt' @@ -25,5 +25,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Run ktlint tests + + - name: Run ktlint check run: ./gradlew assembleDebug ktlintCheck diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b1f7faed83..27048d35f6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4.2.2 with: submodules: recursive - - name: set up JDK 17 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v3.14.1 with: java-version: '17' distribution: 'adopt' @@ -35,7 +36,7 @@ jobs: run: ./gradlew assembleFreeDynamic - name: Upload Artifact - uses: actions/upload-artifact@v3.1.0 + uses: actions/upload-artifact@v4.6.2 with: name: apk path: lemuroid-app/build/outputs/apk/freeDynamic/release/lemuroid-app-free-dynamic-release.apk @@ -47,7 +48,7 @@ jobs: steps: - name: Download Artifact - uses: actions/download-artifact@v3.0.0 + uses: actions/download-artifact@v4.3.0 with: name: apk diff --git a/buildSrc/src/main/java/deps.kt b/buildSrc/src/main/java/deps.kt index 6f72ca88de..61e390c6d1 100644 --- a/buildSrc/src/main/java/deps.kt +++ b/buildSrc/src/main/java/deps.kt @@ -163,7 +163,7 @@ object deps { } object plugins { - const val android = "com.android.tools.build:gradle:8.4.0" + const val android = "com.android.tools.build:gradle:8.11.1" const val navigationSafeArgs = "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}" const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8248c47fc5..9ac2a47e74 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 29 12:03:14 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/home/HomeViewModel.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/home/HomeViewModel.kt index d79a22b411..b13c1f3d68 100644 --- a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/home/HomeViewModel.kt +++ b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/home/HomeViewModel.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.launch class HomeViewModel( appContext: Context, retrogradeDb: RetrogradeDatabase, - private val coresSelection: CoresSelection + private val coresSelection: CoresSelection, ) : ViewModel() { companion object { const val CAROUSEL_MAX_ITEMS = 10 @@ -105,8 +105,9 @@ class HomeViewModel( selectedCores: List, ): UIState { val noGames = recentGames.isEmpty() && favoritesGames.isEmpty() && discoveryGames.isEmpty() - val coreCanUseMicrophone = selectedCores - .any { it.coreConfig.supportsMicrophone } + val coreCanUseMicrophone = + selectedCores + .any { it.coreConfig.supportsMicrophone } return UIState( favoritesGames = favoritesGames, diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt index 4659a2e615..eb880457d1 100644 --- a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt +++ b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt @@ -1075,10 +1075,11 @@ abstract class BaseGameActivity : ImmersiveActivity() { val enableRumble = settingsManager.enableRumble() val directLoad = settingsManager.allowDirectGameLoad() - val hasMicrophonePermission = ContextCompat.checkSelfPermission( - this, - android.Manifest.permission.RECORD_AUDIO - ) == PackageManager. PERMISSION_GRANTED + val hasMicrophonePermission = + ContextCompat.checkSelfPermission( + this, + android.Manifest.permission.RECORD_AUDIO, + ) == PackageManager.PERMISSION_GRANTED val enableMicrophone = systemCoreConfig.supportsMicrophone && hasMicrophonePermission @@ -1107,7 +1108,7 @@ abstract class BaseGameActivity : ImmersiveActivity() { filter, lowLatencyAudio, systemCoreConfig.rumbleSupported && enableRumble, - enableMicrophone + enableMicrophone, ) } } diff --git a/retrograde-util/src/main/java/com/swordfish/lemuroid/common/coroutines/FlowUtils.kt b/retrograde-util/src/main/java/com/swordfish/lemuroid/common/coroutines/FlowUtils.kt index 830aa69da4..e2d12ab93f 100644 --- a/retrograde-util/src/main/java/com/swordfish/lemuroid/common/coroutines/FlowUtils.kt +++ b/retrograde-util/src/main/java/com/swordfish/lemuroid/common/coroutines/FlowUtils.kt @@ -52,17 +52,18 @@ fun combine( flow4: Flow, flow5: Flow, flow6: Flow, - transform: suspend (T1, T2, T3, T4, T5, T6) -> R -): Flow = kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> -> - transform( - args[0] as T1, - args[1] as T2, - args[2] as T3, - args[3] as T4, - args[4] as T5, - args[5] as T6, - ) -} + transform: suspend (T1, T2, T3, T4, T5, T6) -> R, +): Flow = + kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> -> + transform( + args[0] as T1, + args[1] as T2, + args[2] as T3, + args[3] as T4, + args[4] as T5, + args[5] as T6, + ) + } fun combine( flow: Flow, @@ -72,15 +73,16 @@ fun combine( flow5: Flow, flow6: Flow, flow7: Flow, - transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R -): Flow = kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7) { args: Array<*> -> - transform( - args[0] as T1, - args[1] as T2, - args[2] as T3, - args[3] as T4, - args[4] as T5, - args[5] as T6, - args[6] as T7, - ) -} + transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R, +): Flow = + kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7) { args: Array<*> -> + transform( + args[0] as T1, + args[1] as T2, + args[2] as T3, + args[3] as T4, + args[4] as T5, + args[5] as T6, + args[6] as T7, + ) + }