update gradle version

Razeeman · Nov 16, 2024 · 8a8144b · 8a8144b
1 parent de472e9
commit 8a8144b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt
@@ -112,8 +112,6 @@ object Deps {
             "junit:junit:${Versions.junit}"
         const val mockito =
             "org.mockito:mockito-core:${Versions.mockito}"
-        const val mockitoInline =
-            "org.mockito:mockito-inline:${Versions.mockito}"
         const val coroutines =
             "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutinesTest}"
     }

diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt
@@ -1,8 +1,8 @@
 package com.example.util.simpletimetracker
 
 object Versions {
-    const val gradle = "8.2.0"
-    const val kotlin = "1.8.22"
+    const val gradle = "8.4.0"
+    const val kotlin = "1.9.25"
     const val ktlint = "12.1.0"
 
     const val coroutines = "1.6.4"
@@ -12,7 +12,7 @@ object Versions {
     const val appcompat = "1.7.0"
     const val constraintLayout = "2.1.4"
     const val recyclerView = "1.1.0"
-    const val room = "2.4.3"
+    const val room = "2.6.1"
     const val dagger = "2.52"
     const val viewpager2 = "1.0.0"
     const val flexBox = "3.0.0"
@@ -36,7 +36,7 @@ object Versions {
     const val compose_icons = "1.6.1"
     const val wear_compose_tooling_preview = "1.0.0"
     const val horologist = "0.2.7"
-    const val compose_kotlin_compiler = "1.4.8"
+    const val compose_kotlin_compiler = "1.5.15"
     const val compose_hilt = "1.0.0"
     const val wear_complications = "1.2.1"
     const val wear_ongoing = "1.0.0"
@@ -45,6 +45,6 @@ object Versions {
     const val junit = "4.13"
     const val junitUi = "1.1.4"
     const val espresso = "3.5.0"
-    const val mockito = "5.2.0"
+    const val mockito = "5.14.2"
     const val coroutinesTest = "1.7.1"
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -42,5 +42,4 @@ dependencies {
 
     testImplementation(Deps.Test.junit)
     testImplementation(Deps.Test.mockito)
-    testImplementation(Deps.Test.mockitoInline)
 }
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {
@@ -18,5 +18,4 @@ dependencies {
 
     testImplementation(Deps.Test.junit)
     testImplementation(Deps.Test.mockito)
-    testImplementation(Deps.Test.mockitoInline)
 }
diff --git a/gradle/android_library.gradle b/gradle/android_library.gradle
@@ -11,12 +11,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_21.toString()
     }
 
     buildFeatures {

diff --git a/gradle/android_wear_library.gradle b/gradle/android_wear_library.gradle
@@ -11,12 +11,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_21.toString()
     }
 
     buildFeatures {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip