Merge pull request #67 from SimonSchubert/jules_wip_17832790256258923177

Jules wip 17832790256258923177

Author: SimonSchubert

android/build.gradle.kts

@@ -1,15 +1,11 @@
 plugins {
-    id("com.android.application")
-    kotlin("android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
 
 group = "com.inspiredandroid.linuxcommandbibliotheca"
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     implementation(project(":common"))
     implementation(libs.androidx.activity.compose)
@@ -79,10 +75,6 @@ android {
         abortOnError = false
     }
     namespace = "com.inspiredandroid.linuxcommandbibliotheca"
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.kotlin.get()
-    }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsScreen.kt

@@ -56,7 +56,6 @@ fun BasicGroupsScreen(
         ) { basicGroup ->
             BasicGroupColumn(
                 basicGroup = basicGroup,
-                // Assuming isGroupCollapsed(id) == true means content is hidden
                 isExpanded = !viewModel.isGroupCollapsed(basicGroup.id),
                 onToggleCollapse = { viewModel.toggleCollapse(basicGroup.id) },
                 onNavigate = onNavigate,
@@ -101,7 +100,6 @@ private fun ExpandedGroupContent(basicGroup: BasicGroup, onNavigate: (String) ->
     val commands = remember(basicGroup.id) {
         databaseHelper.getBasicCommands(basicGroup.id).toImmutableList()
     }
-    // Consider adding some padding or a Column wrapper if needed for layout consistency
     commands.forEach { basicCommand ->
         CommandView(
             command = basicCommand.command,

build.gradle.kts

@@ -1,33 +1,18 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.52.0"
-    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.ben.manes.versions) apply false
     alias(libs.plugins.spotless)
-}
-
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath(libs.kotlin.gradle.plugin)
-        classpath(libs.gradle)
-        classpath(libs.gradle.plugin)
-    }
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.sqldelight) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 group = "com.inspiredandroid"
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
 tasks.withType<DependencyUpdatesTask> {
     rejectVersionIf {
         isNonStable(candidate.version)

common/build.gradle.kts

@@ -1,13 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-repositories {
-    google()
-}
-
 plugins {
-    kotlin("multiplatform")
-    id("com.android.library")
-    id("app.cash.sqldelight")
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.sqldelight)
 }
 
 group = "com.linuxcommandlibrary"

gradle/libs.versions.toml

@@ -1,12 +1,11 @@
 [versions]
+agp = "8.10.1"
 appVersion = "3.3.12"
 androidVersionCode = "106"
 kotlin = "2.1.21"
-kotlinGradlePlugin = "2.1.21"
 accompanistAppcompatTheme = "0.36.0"
 activityCompose = "1.10.1"
 foundation = "1.8.2"
-gradle = "8.10.1"
 json = "20250517"
 koinCore = "4.0.4"
 kotlinxCoroutinesCore = "1.10.2"
@@ -19,7 +18,8 @@ preference = "1.2.1"
 sqldelight = "2.1.0"
 uiToolingPreview = "1.8.2"
 spotless = "7.0.4"
-kotlinxCollectionsImmutable = "0.3.7"
+kotlinxCollectionsImmutable = "0.4.0"
+benManesVersions = "0.52.0"
 
 
 [libraries]
@@ -36,21 +36,24 @@ androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", versi
 androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "uiToolingPreview" }
 androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "uiToolingPreview" }
 androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 json = { module = "org.json:json", version.ref = "json" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinCore" }
 koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCore" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koinCore" }
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-html-jvm = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinxHtmlJvm" }
-gradle-plugin = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
 runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" }
 sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
 sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
 
 
 [plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "benManesVersions" }

settings.gradle.kts

@@ -5,6 +5,15 @@ pluginManagement {
         mavenCentral()
     }
 }
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) // Enforce centralized repositories
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 rootProject.name = "Linux Command Library"
 
 include(":android", ":common", ":desktop", ":cli")