Update project, dependencies, target sdk, build config & tools

Signed-off-by: Patryk Miś <foss@patrykmis.com>
NeoA11y · Jan 30, 2025 · 5634121 · 5634121
1 parent 91d0758
commit 5634121
Show file tree

Hide file tree

Showing 12 changed files with 848 additions and 984 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -29,7 +29,7 @@ val keystorePropertiesFile = rootProject.file("keystore.properties")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
         vendor.set(JvmVendorSpec.ADOPTIUM)
     }
 }
@@ -43,7 +43,7 @@ appVersion(VersionConfig.Type.DEV) {
 android {
     namespace = "com.neo.speaktouch"
     compileSdk = 35
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = "35.0.1"
 
     if (keystorePropertiesFile.canRead()) {
         signingConfigs {
@@ -64,15 +64,7 @@ android {
         configure<BasePluginExtension> { archivesName.set(rootProject.name) }
 
         minSdk = 22
-        targetSdk = 34
-
-        resourceConfigurations.addAll(
-            listOf(
-                "en",
-                "pl",
-                "pt"
-            )
-        )
+        targetSdk = 35
     }
 
     buildTypes {
@@ -98,6 +90,10 @@ android {
         buildConfig = true
     }
 
+    androidResources {
+        localeFilters += listOf("en", "pl", "pt")
+    }
+
     compileOptions {
         kotlinOptions.freeCompilerArgs += "-Xcontext-receivers"
     }

diff --git a/app/src/main/java/com/neo/speaktouch/di/module/ServiceModule.kt b/app/src/main/java/com/neo/speaktouch/di/module/ServiceModule.kt
@@ -70,7 +70,7 @@ object ServiceModule {
         @Binds
         @ServiceScoped
         abstract fun providesContext(
-            service: Service
-        ): Context
+            service: Service?
+        ): Context?
     }
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -31,5 +31,5 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.9.0")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-agp = "8.6.1"
+agp = "8.8.0"
 androidx-appcompat = "1.7.0"
-androidx-constraintlayout = "2.1.4"
-androidx-core = "1.13.1"
+androidx-constraintlayout = "2.2.0"
+androidx-core = "1.15.0"
 dagger = "2.52"
-kotlin = "2.0.20"
-ksp = "2.0.20-1.0.25"
+kotlin = "2.0.21"
+ksp = "2.0.21-1.0.28"
 material = "1.12.0"
-robolectric = "4.13"
+robolectric = "4.14.1"
 test-junit = "4.13.2"
 timber = "5.0.1"