Compare commits

...

3 Commits

Author SHA1 Message Date
e139398a5a Merge branch 'fix/build-errors-and-dependencies' into 'main'
Update Kotlin version to 2.1.0 for compatibility

See merge request foxixus/neomovies_mobile!7
2025-10-03 13:37:36 +00:00
factory-droid[bot]
3e664d726b Complete Kotlin compatibility fixes and dependency updates
- Update kotlinx-coroutines from 1.9.0 to 1.10.1 in all modules
- Add legacy settings.gradle file for CI compatibility
- Update kotlin-coroutines in app/build.gradle.kts
- Update kotlin-coroutines in torrentengine/build.gradle.kts

This resolves all remaining Kotlin version incompatibility issues:
- Main Kotlin plugin: 1.9.24 → 2.1.0 (done previously)
- Coroutines library: 1.9.0 → 1.10.1 (this commit)
- CI compatibility: added settings.gradle alongside settings.gradle.kts

Build now passes Kotlin compatibility checks and only fails on
NDK license issues which are environment-specific, not code issues.
2025-10-03 13:06:53 +00:00
7828b378d7 Merge branch 'fix/build-errors-and-dependencies' into 'main'
Fix build errors: resolve auto_route_generator version and syntax issues

See merge request foxixus/neomovies_mobile!6
2025-10-03 10:34:15 +00:00
3 changed files with 36 additions and 3 deletions

View File

@@ -48,7 +48,7 @@ dependencies {
implementation(project(":torrentengine"))
// Kotlin Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
// Gson для JSON сериализации
implementation("com.google.code.gson:gson:2.11.0")

33
android/settings.gradle Normal file
View File

@@ -0,0 +1,33 @@
// Legacy settings.gradle file for CI compatibility
// Main configuration is in settings.gradle.kts
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.7.3" apply false
id "com.android.library" version "8.7.3" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
}
include ":app"
project(":app").projectDir = file("app")
include ":torrentengine"
project(":torrentengine").projectDir = file("torrentengine")

View File

@@ -43,8 +43,8 @@ dependencies {
implementation("com.google.android.material:material:1.12.0")
// Coroutines for async operations
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
// Lifecycle components
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")