Migrate AGP to 8.2.2 and fix some missing styling issues.

build.gradle.kts

@@ -66,12 +66,9 @@ subprojects {
                     disable("VectorPath")
                     disable("TrustAllX509TrustManager")
                 }
-                dexOptions {
-                    dexInProcess = true
-                }
                 compileOptions {
-                    sourceCompatibility = JavaVersion.VERSION_1_8
-                    targetCompatibility = JavaVersion.VERSION_1_8
+                    sourceCompatibility = JavaVersion.VERSION_17
+                    targetCompatibility = JavaVersion.VERSION_17
                 }
             }
         }

buildSrc/build.gradle.kts

@@ -5,7 +5,3 @@ repositories {
 plugins {
     `kotlin-dsl`
 }
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}

buildSrc/src/main/java/deps.kt

@@ -4,7 +4,7 @@ object deps {
         const val targetSdkVersion  = 33
         const val compileSdkVersion = 34
         const val minSdkVersion     = 23
-        const val buildToolsVersion = "30.0.2"
+        const val buildToolsVersion = "34.0.0"
     }
 
     object versions {
@@ -163,7 +163,7 @@ object deps {
     }
 
     object plugins {
-        const val android = "com.android.tools.build:gradle:7.4.2"
+        const val android = "com.android.tools.build:gradle:8.2.2"
         const val navigationSafeArgs = "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
     }
 }

gradle.properties

@@ -17,6 +17,3 @@ android.enableD8.desugaring=true
 # AndroidX
 android.useAndroidX=true
 android.enableJetifier=true
-
-# Copy native libraries coming from dynamic modules
-android.bundle.enableUncompressedNativeLibs=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 20 00:20:32 CET 2024
+#Thu Mar 21 23:45:39 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lemuroid-app-ext-free/build.gradle.kts

@@ -6,8 +6,9 @@ plugins {
 
 android {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.swordfish.lemuroid.ext"
 }
 
 dependencies {

lemuroid-app-ext-free/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest package="com.swordfish.lemuroid.ext"
-    xmlns:tools="http://schemas.android.com/tools"
+<manifest xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingLeanbackLauncher">
 </manifest>

lemuroid-app-ext-play/build.gradle.kts

@@ -6,8 +6,9 @@ plugins {
 
 android {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.swordfish.lemuroid.ext"
 }
 
 dependencies {

lemuroid-app-ext-play/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.swordfish.lemuroid.ext"
     tools:ignore="MissingLeanbackLauncher,ImpliedTouchscreenHardware,MissingLeanbackSupport">
 
     <application>

lemuroid-app-ext-play/src/main/java/com/swordfish/lemuroid/ext/feature/savesync/SaveSyncManagerImpl.kt

@@ -25,7 +25,7 @@ class SaveSyncManagerImpl(
 ) : SaveSyncManager() {
     private var lastSyncTimestamp: Long by SharedPreferencesDelegates.LongDelegate(
         SharedPreferencesHelper.getSharedPreferences(appContext),
-        appContext.getString(R.string.pref_key_last_save_sync),
+        appContext.getString(com.swordfish.lemuroid.lib.R.string.pref_key_last_save_sync),
         0L,
     )
 

lemuroid-app/build.gradle.kts

@@ -12,6 +12,7 @@ android {
         versionName = "1.15.0" // Always remember to update Cores Tag!
         applicationId = "com.swordfish.lemuroid"
     }
+    flavorDimensions += listOf("opensource", "cores")
 
     if (usePlayDynamicFeatures()) {
         println("Building Google Play version. Bundling dynamic features.")
@@ -42,7 +43,6 @@ android {
     }
 
     // Since some dependencies are closed source we make a completely free as in free speech variant.
-    flavorDimensions("opensource", "cores")
 
     productFlavors {
 
@@ -65,11 +65,15 @@ android {
         }
     }
 
-    // Stripping created some issues with some libretro cores such as ppsspp
     packagingOptions {
-        doNotStrip("*/*/*_libretro_android.so")
-        exclude("META-INF/DEPENDENCIES")
-        exclude("META-INF/library_release.kotlin_module")
+        jniLibs {
+            // Stripping created some issues with some libretro cores such as ppsspp
+            keepDebugSymbols += setOf("*/*/*_libretro_android.so")
+            useLegacyPackaging = true
+        }
+        resources {
+            excludes += setOf("META-INF/DEPENDENCIES", "META-INF/library_release.kotlin_module")
+        }
     }
 
     signingConfigs {
@@ -105,15 +109,17 @@ android {
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.6"
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.swordfish.lemuroid"
 }
 
 dependencies {

lemuroid-app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.swordfish.lemuroid">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature
         android:name="android.software.leanback"

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/settings/general/SettingsViewModel.kt

@@ -47,7 +47,7 @@ class SettingsViewModel(
     val directoryScanInProgress = PendingOperationsMonitor(context).isDirectoryScanInProgress()
 
     val uiState =
-        sharedPreferences.getString(context.getString(R.string.pref_key_extenral_folder))
+        sharedPreferences.getString(context.getString(com.swordfish.lemuroid.lib.R.string.pref_key_extenral_folder))
             .asFlow()
             .flowOn(Dispatchers.IO)
             .stateIn(viewModelScope, SharingStarted.Lazily, "")

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/shared/NotificationsManager.kt

@@ -92,8 +92,16 @@ class NotificationsManager(private val applicationContext: Context) {
         val builder =
             NotificationCompat.Builder(applicationContext, DEFAULT_CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_lemuroid_tiny)
-                .setContentTitle(applicationContext.getString(R.string.installing_core_notification_title))
-                .setContentText(applicationContext.getString(R.string.installing_core_notification_message))
+                .setContentTitle(
+                    applicationContext.getString(
+                        com.swordfish.lemuroid.ext.R.string.installing_core_notification_title,
+                    ),
+                )
+                .setContentText(
+                    applicationContext.getString(
+                        com.swordfish.lemuroid.ext.R.string.installing_core_notification_message,
+                    ),
+                )
                 .setProgress(100, 0, true)
                 .setPriority(NotificationCompat.PRIORITY_LOW)
                 .addAction(

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt

@@ -1059,7 +1059,10 @@ abstract class BaseGameActivity : ImmersiveActivity() {
     private fun displayLoadingState(loadingState: GameLoader.LoadingState) {
         loadingMessageStateFlow.value =
             when (loadingState) {
-                is GameLoader.LoadingState.LoadingCore -> getString(R.string.game_loading_download_core)
+                is GameLoader.LoadingState.LoadingCore ->
+                    getString(
+                        com.swordfish.lemuroid.ext.R.string.game_loading_download_core,
+                    )
                 is GameLoader.LoadingState.LoadingGame -> getString(R.string.game_loading_preparing_game)
                 else -> ""
             }
@@ -1073,7 +1076,10 @@ abstract class BaseGameActivity : ImmersiveActivity() {
             when (gameError) {
                 is GameLoaderError.GLIncompatible -> getString(R.string.game_loader_error_gl_incompatible)
                 is GameLoaderError.Generic -> getString(R.string.game_loader_error_generic)
-                is GameLoaderError.LoadCore -> getString(R.string.game_loader_error_load_core)
+                is GameLoaderError.LoadCore ->
+                    getString(
+                        com.swordfish.lemuroid.ext.R.string.game_loader_error_load_core,
+                    )
                 is GameLoaderError.LoadGame -> getString(R.string.game_loader_error_load_game)
                 is GameLoaderError.Saves -> getString(R.string.game_loader_error_save)
                 is GameLoaderError.UnsupportedArchitecture ->

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/settings/StorageFrameworkPickerLauncher.kt

@@ -51,7 +51,7 @@ class StorageFrameworkPickerLauncher : RetrogradeActivity() {
 
         if (requestCode == REQUEST_CODE_PICK_FOLDER && resultCode == Activity.RESULT_OK) {
             val sharedPreferences = SharedPreferencesHelper.getLegacySharedPreferences(this)
-            val preferenceKey = getString(R.string.pref_key_extenral_folder)
+            val preferenceKey = getString(com.swordfish.lemuroid.lib.R.string.pref_key_extenral_folder)
 
             val currentValue: String? = sharedPreferences.getString(preferenceKey, null)
             val newValue = resultData?.data

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/channel/ChannelHandler.kt

@@ -180,8 +180,6 @@ class ChannelHandler(
                 null,
             )
 
-        appContext.getString(R.string.app_name)
-
         channels?.use {
             if (it.moveToFirst()) {
                 do {

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/favorites/TVFavoritesFragment.kt

@@ -40,7 +40,7 @@ class TVFavoritesFragment : VerticalGridSupportFragment() {
         val factory = TVFavoritesViewModel.Factory(retrogradeDb)
         val favoritesViewModel = ViewModelProvider(this, factory)[TVFavoritesViewModel::class.java]
 
-        val cardSize = resources.getDimensionPixelSize(R.dimen.card_size)
+        val cardSize = resources.getDimensionPixelSize(com.swordfish.lemuroid.lib.R.dimen.card_size)
         val pagingAdapter =
             PagingDataAdapter(
                 GamePresenter(cardSize, gameInteractor),

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/folderpicker/TVFolderPickerLauncher.kt

@@ -27,7 +27,7 @@ class TVFolderPickerLauncher : ImmersiveActivity() {
 
         if (requestCode == REQUEST_CODE_PICK_FOLDER && resultCode == Activity.RESULT_OK) {
             val sharedPreferences = SharedPreferencesHelper.getLegacySharedPreferences(this)
-            val preferenceKey = getString(R.string.pref_key_legacy_external_folder)
+            val preferenceKey = getString(com.swordfish.lemuroid.lib.R.string.pref_key_legacy_external_folder)
 
             val currentValue: String? = sharedPreferences.getString(preferenceKey, null)
             val newValue = resultData?.extras?.getString(TVFolderPickerActivity.RESULT_DIRECTORY_PATH)

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/games/TVGamesFragment.kt

@@ -44,7 +44,7 @@ class TVGamesFragment : VerticalGridSupportFragment() {
         val factory = TVGamesViewModel.Factory(retrogradeDb)
         val gamesViewModel = ViewModelProvider(this, factory)[TVGamesViewModel::class.java]
 
-        val cardSize = resources.getDimensionPixelSize(R.dimen.card_size)
+        val cardSize = resources.getDimensionPixelSize(com.swordfish.lemuroid.lib.R.dimen.card_size)
         val pagingAdapter =
             PagingDataAdapter(
                 GamePresenter(cardSize, gameInteractor),

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/home/SystemPresenter.kt

@@ -31,7 +31,7 @@ class SystemPresenter(private val cardSize: Int, private val cardPadding: Int) :
         val cardView = ImageCardView(parent.context)
         cardView.isFocusable = true
         cardView.isFocusableInTouchMode = true
-        (cardView.findViewById<View>(R.id.content_text) as TextView).setTextColor(Color.LTGRAY)
+        (cardView.findViewById<View>(androidx.leanback.R.id.content_text) as TextView).setTextColor(Color.LTGRAY)
         return ViewHolder(cardView)
     }
 

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/home/TVHomeFragment.kt

@@ -171,9 +171,15 @@ class TVHomeFragment : BrowseSupportFragment() {
         includeSystems: Boolean,
     ) {
         val result = ArrayObjectAdapter(ListRowPresenter())
-        val cardSize = resources.getDimensionPixelSize(R.dimen.card_size)
-        val systemsCardPadding = resources.getDimensionPixelSize(R.dimen.systems_card_padding)
-        val settingsCardPadding = resources.getDimensionPixelSize(R.dimen.settings_card_padding)
+        val cardSize = resources.getDimensionPixelSize(com.swordfish.lemuroid.lib.R.dimen.card_size)
+        val systemsCardPadding =
+            resources.getDimensionPixelSize(
+                com.swordfish.lemuroid.lib.R.dimen.systems_card_padding,
+            )
+        val settingsCardPadding =
+            resources.getDimensionPixelSize(
+                com.swordfish.lemuroid.lib.R.dimen.settings_card_padding,
+            )
 
         if (includeFavorites) {
             val presenter = ClassPresenterSelector()

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/search/TVSearchFragment.kt

@@ -80,7 +80,7 @@ class TVSearchFragment : SearchSupportFragment(), SearchSupportFragment.SearchRe
 
         val gamePresenter =
             GamePresenter(
-                resources.getDimensionPixelSize(R.dimen.card_size),
+                resources.getDimensionPixelSize(com.swordfish.lemuroid.lib.R.dimen.card_size),
                 gameInteractor,
             )
 

lemuroid-app/src/main/java/com/swordfish/lemuroid/app/tv/shared/GamePresenter.kt

@@ -34,7 +34,7 @@ class GamePresenter(
         val cardView = ImageCardView(parent.context)
         cardView.isFocusable = true
         cardView.isFocusableInTouchMode = true
-        (cardView.findViewById<View>(R.id.content_text) as TextView).setTextColor(Color.LTGRAY)
+        (cardView.findViewById<View>(androidx.leanback.R.id.content_text) as TextView).setTextColor(Color.LTGRAY)
         return ViewHolder(cardView)
     }
 

lemuroid-metadata-libretro-db/build.gradle.kts

@@ -20,6 +20,7 @@ dependencies {
 android {
     resourcePrefix("libretrodb_")
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.swordfish.lemuroid.metadata.libretrodb"
 }

lemuroid-metadata-libretro-db/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest package="com.swordfish.lemuroid.metadata.libretrodb"/>
+<manifest />

lemuroid-touchinput/build.gradle.kts

@@ -6,8 +6,9 @@ plugins {
 
 android {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.swordfish.touchinput.controller"
 }
 
 dependencies {

lemuroid-touchinput/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.swordfish.touchinput.controller" />
+<manifest />

retrograde-app-shared/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 
 android {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
@@ -61,8 +61,9 @@ android {
             }
         }
     }
+    namespace = "com.swordfish.lemuroid.lib"
     kotlinOptions {
         this as KotlinJvmOptions
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }

retrograde-app-shared/src/main/AndroidManifest.xml

@@ -19,6 +19,5 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<manifest package="com.swordfish.lemuroid.lib"
-    xmlns:tools="http://schemas.android.com/tools"
+<manifest xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingLeanbackLauncher,ImpliedTouchscreenHardware,MissingLeanbackSupport"/>

retrograde-util/build.gradle.kts

@@ -6,8 +6,9 @@ plugins {
 
 android {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.swordfish.lemuroid.common"
 }
 
 dependencies {

retrograde-util/src/main/AndroidManifest.xml

@@ -19,4 +19,4 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<manifest package="com.swordfish.lemuroid.common"/>
+<manifest />

settings.gradle.kts

@@ -1,4 +1,4 @@
-@Suppress("ktlint:standard:max-line-length")
+@file:Suppress("ktlint")
 
 include(
     ":retrograde-util",