use JDK 11 to bump mockk

aws-amplify · Dec 13, 2023 · b5084ef · b5084ef
1 parent b71778b
commit b5084ef
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -91,8 +91,8 @@ block inside your app's `build.gradle`, as below:
 android {
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 ```

diff --git a/aws-auth-plugins-core/build.gradle.kts b/aws-auth-plugins-core/build.gradle.kts
@@ -24,6 +24,12 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 
 group = properties["POM_GROUP"].toString()
 
+android {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+}
+
 dependencies {
     implementation(project(":core"))
     implementation(project(":aws-core"))

diff --git a/aws-datastore/build.gradle.kts b/aws-datastore/build.gradle.kts
@@ -58,5 +58,5 @@ dependencies {
 }
 
 afterEvaluate {
-    android.kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    android.kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
 }
diff --git a/aws-geo-location/build.gradle.kts b/aws-geo-location/build.gradle.kts
@@ -40,5 +40,5 @@ dependencies {
 }
 
 afterEvaluate {
-    android.kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    android.kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
 }
diff --git a/aws-push-notifications-pinpoint-common/build.gradle.kts b/aws-push-notifications-pinpoint-common/build.gradle.kts
@@ -23,6 +23,12 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 
 group = properties["POM_GROUP"].toString()
 
+android {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+}
+
 dependencies {
     implementation(project(":annotations"))
     api(project(":common-core"))

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -156,8 +156,8 @@ fun Project.configureAndroid() {
 
         compileOptions {
             isCoreLibraryDesugaringEnabled = true
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
         }
 
         // Needed when running integration tests. The oauth2 library uses relies on two

diff --git a/canaries/example/app/build.gradle b/canaries/example/app/build.gradle
@@ -24,8 +24,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = '1.8'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,7 +34,7 @@ maplibre-annotations = "1.0.0"
 material = "1.8.0"
 mockito = "3.9.0"
 mockito-inline = "3.11.2"
-mockk = "1.12.3"
+mockk = "1.13.8"
 mockwebserver = "5.0.0-alpha.11"
 navigation = "2.3.4"
 oauth2 = "0.26.0"

diff --git a/maplibre-adapter/build.gradle.kts b/maplibre-adapter/build.gradle.kts
@@ -25,7 +25,7 @@ group = properties["POM_GROUP"].toString()
 
 android {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
     lint {
         disable += "GradleDependency"