diff --git a/README.md b/README.md index 9d7b0f7e90..6235f50d0d 100644 --- 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 index 5c5a568869..3647004ae6 100644 --- 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 index b7625cbb34..7a81ce2fd0 100644 --- 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 index 0f1e7b251e..a8d67b2ecf 100644 --- 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 index 04a9ccbbbb..7baeca672c 100644 --- 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 index 58e401444b..bf9cece45f 100644 --- 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 index 0ca33b10f7..7982e131f9 100644 --- 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 index 46a1474009..75b28eb8a4 100644 --- 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 index 84888a2557..b642a6f74c 100644 --- 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"