Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,23 @@ 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'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Run ktlint tests

- name: Run ktlint check
run: ./gradlew assembleDebug ktlintCheck
11 changes: 6 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -105,8 +105,9 @@ class HomeViewModel(
selectedCores: List<SelectedCore>,
): 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -1107,7 +1108,7 @@ abstract class BaseGameActivity : ImmersiveActivity() {
filter,
lowLatencyAudio,
systemCoreConfig.rumbleSupported && enableRumble,
enableMicrophone
enableMicrophone,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,18 @@ fun <T1, T2, T3, T4, T5, T6, R> combine(
flow4: Flow<T4>,
flow5: Flow<T5>,
flow6: Flow<T6>,
transform: suspend (T1, T2, T3, T4, T5, T6) -> R
): Flow<R> = 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<R> =
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 <T1, T2, T3, T4, T5, T6, T7, R> combine(
flow: Flow<T1>,
Expand All @@ -72,15 +73,16 @@ fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
flow5: Flow<T5>,
flow6: Flow<T6>,
flow7: Flow<T7>,
transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R
): Flow<R> = 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<R> =
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,
)
}
Loading