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
This commit is contained in:
2025-10-03 13:37:36 +00:00
4 changed files with 38 additions and 5 deletions

View File

@@ -8,7 +8,7 @@ plugins {
android { android {
namespace = "com.neo.neomovies_mobile" namespace = "com.neo.neomovies_mobile"
compileSdk = flutter.compileSdkVersion compileSdk = flutter.compileSdkVersion
ndkVersion = "27.0.12077973" // ndkVersion = "27.0.12077973" // Commented out to avoid license issues
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
@@ -48,7 +48,7 @@ dependencies {
implementation(project(":torrentengine")) implementation(project(":torrentengine"))
// Kotlin Coroutines // Kotlin Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
// Gson для JSON сериализации // Gson для JSON сериализации
implementation("com.google.code.gson:gson:2.11.0") 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

@@ -28,7 +28,7 @@ plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.3" apply false id("com.android.application") version "8.7.3" apply false
id("com.android.library") version "8.7.3" apply false id("com.android.library") version "8.7.3" apply false
id("org.jetbrains.kotlin.android") version "1.9.24" apply false id("org.jetbrains.kotlin.android") version "2.1.0" apply false
} }
include(":app") include(":app")

View File

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