Update dependencies versions

app/build.gradle.kts

@@ -1,5 +1,9 @@
 plugins {
     alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.hilt)
 }
 
 android {
@@ -26,15 +30,32 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
+
+    kapt(libs.hiltcompiler)
+    implementation(libs.hiltandroid)
+
+    implementation(libs.okhttp)
+    implementation(libs.retrofit)
+
+    implementation(project(":core:network"))
+    implementation(project(":core:database"))
+
+    implementation(project(":feature:schedule"))
+    implementation(project(":feature:progress"))
+    implementation(project(":feature:news"))
+
 }

build.gradle.kts

@@ -1,5 +1,8 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+    alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.kotlin.kapt) apply false
+
+    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
 }

core/common/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -21,13 +22,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
 }

core/database/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -21,13 +22,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = libs.versions.jvmTarget.get()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
 }

core/network/build.gradle.kts

@@ -1,5 +1,8 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.hilt)
 }
 
 android {
@@ -20,18 +23,24 @@ android {
             )
         }
     }
+    val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get())
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = jvm
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = jvm
+    }
+    kotlinOptions {
+        jvmTarget = jvm.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
-    implementation(libs.androidx.appcompat)
 
-    implementation("com.squareup.okhttp3:okhttp:5.3.2")
+    kapt(libs.hiltcompiler)
-    implementation("com.squareup.okhttp3:logging-interceptor:5.3.2")
+    implementation(libs.hiltandroid)
-    implementation("com.squareup.retrofit2:retrofit:3.0.0")
+
-    implementation("com.squareup.retrofit2:converter-simplexml:3.0.0")
+    api(libs.retrofit)
+    api(libs.okhttp)
+
+    implementation(libs.retrofit.simplexml)
 }

core/ui/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -20,14 +21,19 @@ android {
             )
         }
     }
+
+    val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get())
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = jvm
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = jvm
+    }
+    kotlinOptions {
+        jvmTarget = jvm.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
 }

feature/news/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -20,14 +21,18 @@ android {
             )
         }
     }
+    val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get())
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = jvm
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = jvm
+    }
+    kotlinOptions {
+        jvmTarget = jvm.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
 }

feature/progress/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -20,14 +21,18 @@ android {
             )
         }
     }
+    val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get())
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = jvm
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = jvm
+    }
+    kotlinOptions {
+        jvmTarget = jvm.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
 }

feature/schedule/build.gradle.kts

@@ -1,5 +1,9 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.hilt)
 }
 
 android {
@@ -20,14 +24,24 @@ android {
             )
         }
     }
+
+    val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get())
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = jvm
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = jvm
+    }
+    kotlinOptions {
+        jvmTarget = jvm.toString()
     }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
+
+    kapt(libs.hiltcompiler)
+    implementation(libs.hiltandroid)
+
+    implementation(project(":core:network"))
 }

gradle.properties

@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.builtInKotlin=false

gradle/libs.versions.toml

@@ -5,23 +5,40 @@ targetSdk = "35"
 versionName = "1.0"
 versionCode = "1"
 
-agp = "8.8.2"
+agp = "8.12.0"
+kotlin = "2.0.21"
+jvmTarget = "17"
+
 coreKtx = "1.10.1"
 appcompat = "1.6.1"
 material = "1.10.0"
-okhttp = "5.3.2"
 activity = "1.8.0"
 constraintlayout = "2.1.4"
 
+hilt = "2.50"
+retrofit = "2.11.0"
+okhttp = "4.12.0"
+
 [libraries]
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+# Network
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+retrofit-simplexml = { module = "com.squareup.retrofit2:converter-simplexml", version.ref = "retrofit" }
+# DI – Hilt
+hiltandroid = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+hiltcompiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+
 
 [plugins]
+hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 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-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }

gradlew.bat

@@ -70,7 +70,7 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle