chore: fixed mockito version

googlemaps · Jan 10, 2024 · 8e6ed34 · 8e6ed34
1 parent 5a9d0a7
commit 8e6ed34
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,12 +39,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     namespace 'com.google.maps.android.ktx.demo'
 }

diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,8 @@ buildscript {
         'junit'            : '4.12',
         'kotlin'           : '1.8.21',
         'kotlinxCoroutines': '1.6.0',
-        'mockito'          : '3.0.0',
+        'mockito'          : '3.8.0',
+        'mockitoInline'    : '5.2.0',
         'mockitoKotlin'    : '2.2.0',
         'androidMapsSdk'     : '18.2.0',
         'volley'           : '1.2.0',
@@ -54,11 +55,13 @@ buildscript {
         'kotlin'           : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin",
         'kotlinxCoroutines': "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.kotlinxCoroutines",
         'mockito'          : "org.mockito:mockito-core:$versions.mockito",
+        'mockitoInline'          : "org.mockito:mockito-inline:$versions.mockitoInline",
         'mockitoKotlin'    : "com.nhaarman.mockitokotlin2:mockito-kotlin:$versions.mockitoKotlin",
         'playServices'     : [
             'maps' : "com.google.android.gms:play-services-maps:$versions.androidMapsSdk",
         ],
         'volley'           : "com.android.volley:volley:$versions.volley",
+
     ]
 
     repositories {

diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle
@@ -29,13 +29,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         viewBinding true
@@ -54,4 +54,5 @@ dependencies {
     testImplementation deps.junit
     testImplementation deps.mockito
     testImplementation deps.mockitoKotlin
+    testImplementation deps.mockitoInline
 }
diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle
@@ -34,13 +34,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         viewBinding true
@@ -58,4 +58,5 @@ dependencies {
     testImplementation deps.junit
     testImplementation deps.mockito
     testImplementation deps.mockitoKotlin
+
 }