From 3e7f6ed6531ee9631206f89300ca15205af271ef Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 8 Oct 2023 00:43:21 +0530 Subject: [PATCH] 14: Bump to JavaVersion.VERSION_17 * AOSP android-14.0.0_r1 bumped Kotlin to 1.8.10 which requires this Change-Id: I91f51abbf0b303f3db88c5f4f81c570dd85a6510 --- app/build.gradle | 8 ++++---- contactsbackup/build.gradle | 6 +++--- storage/demo/build.gradle | 6 +++--- storage/lib/build.gradle | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6f2c7dfff..16a602a8c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,12 +45,12 @@ android { abortOnError true } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - languageVersion = "1.7" + jvmTarget = JavaVersion.VERSION_17.toString() + languageVersion = "1.8" } testOptions { unitTests.all { diff --git a/contactsbackup/build.gradle b/contactsbackup/build.gradle index a3d885a23..c00a4b40d 100644 --- a/contactsbackup/build.gradle +++ b/contactsbackup/build.gradle @@ -22,12 +22,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } testOptions { diff --git a/storage/demo/build.gradle b/storage/demo/build.gradle index ead579ac3..130a49d67 100644 --- a/storage/demo/build.gradle +++ b/storage/demo/build.gradle @@ -32,11 +32,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" } lint { diff --git a/storage/lib/build.gradle b/storage/lib/build.gradle index 861ca2ab8..447b28495 100644 --- a/storage/lib/build.gradle +++ b/storage/lib/build.gradle @@ -33,12 +33,12 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - languageVersion = "1.7" + jvmTarget = JavaVersion.VERSION_17.toString() + languageVersion = "1.8" freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn' freeCompilerArgs += '-Xexplicit-api=strict' }