From 3dc9cc5bc042a3ab09d579a4c2468e73e2e1becd Mon Sep 17 00:00:00 2001 From: Nikolay Kochetkov Date: Wed, 13 Sep 2023 14:34:47 +0200 Subject: [PATCH] Java compatibility --- .github/workflows/check.yml | 4 ++-- .github/workflows/release.yaml | 4 ++-- cache/build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- commonMock/build.gradle.kts | 2 +- composeview/build.gradle | 4 ++-- coroutines/build.gradle.kts | 2 +- disklrucache/build.gradle | 8 ++++---- kserializer/build.gradle | 8 ++++---- lce/build.gradle.kts | 2 +- rx/build.gradle | 8 ++++---- sample/build.gradle | 6 +++--- utils/build.gradle.kts | 2 +- viewmodel/build.gradle | 6 +++--- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 63795c7f..12f801a9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,10 +16,10 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: set up JDK 1.11 + - name: set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.11 + java-version: 17 - name: Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bf24ee82..c2b808c8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,10 +14,10 @@ jobs: with: fetch-depth: 0 ref: refs/remotes/origin/master - - name: set up JDK 1.11 + - name: set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.11 + java-version: 17 - name: Cache uses: actions/cache@v2 with: diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index b8f91a78..d0da92b2 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -36,7 +36,7 @@ kotlin { jvm { compilations.all { kotlinOptions { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", "-module-name", "rxlcemodel-${project.name}" diff --git a/common/build.gradle.kts b/common/build.gradle.kts index cbd611dc..346e957e 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -40,7 +40,7 @@ kotlin { jvm { compilations.all { kotlinOptions { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", "-module-name", "rxlcemodel-${project.name}" diff --git a/commonMock/build.gradle.kts b/commonMock/build.gradle.kts index 9d84d771..179b8463 100644 --- a/commonMock/build.gradle.kts +++ b/commonMock/build.gradle.kts @@ -30,7 +30,7 @@ kotlin { jvm { compilations.all { kotlinOptions { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", "-module-name", "rxlcemodel-${project.name}" diff --git a/composeview/build.gradle b/composeview/build.gradle index 61cf8f80..a86ec262 100644 --- a/composeview/build.gradle +++ b/composeview/build.gradle @@ -30,8 +30,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts index 6614595d..37216ee8 100644 --- a/coroutines/build.gradle.kts +++ b/coroutines/build.gradle.kts @@ -40,7 +40,7 @@ kotlin { jvm { compilations.all { kotlinOptions { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", "-module-name", "rxlcemodel-${project.name}" diff --git a/disklrucache/build.gradle b/disklrucache/build.gradle index 5573b279..fe8baae5 100644 --- a/disklrucache/build.gradle +++ b/disklrucache/build.gradle @@ -5,17 +5,17 @@ apply plugin: 'signing' compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs += ['-module-name', "rxlcemodel-${project.name}"] } } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 project.sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/kserializer/build.gradle b/kserializer/build.gradle index 78fa62ab..a6059ef9 100644 --- a/kserializer/build.gradle +++ b/kserializer/build.gradle @@ -16,17 +16,17 @@ buildscript { compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs += ['-module-name', "rxlcemodel-${project.name}"] } } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 project.sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/lce/build.gradle.kts b/lce/build.gradle.kts index 0ae29095..b75ea68f 100644 --- a/lce/build.gradle.kts +++ b/lce/build.gradle.kts @@ -36,7 +36,7 @@ kotlin { jvm { compilations.all { kotlinOptions { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", "-module-name", "rxlcemodel-${project.name}" diff --git a/rx/build.gradle b/rx/build.gradle index 12ef449e..d1d034c7 100644 --- a/rx/build.gradle +++ b/rx/build.gradle @@ -23,17 +23,17 @@ project.sourceSets { compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs += ['-module-name', "rxlcemodel-${project.name}"] } } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) diff --git a/sample/build.gradle b/sample/build.gradle index 541900e8..b3bfacb1 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -19,12 +19,12 @@ android { compileOptions { coreLibraryDesugaringEnabled true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } defaultConfig { diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts index 23e21407..34723b46 100644 --- a/utils/build.gradle.kts +++ b/utils/build.gradle.kts @@ -33,7 +33,7 @@ kotlin { jvm { compilations.all { kotlinOptions { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.RequiresOptIn", "-module-name", "rxlcemodel-${project.name}" diff --git a/viewmodel/build.gradle b/viewmodel/build.gradle index 660fe796..c569d0cb 100644 --- a/viewmodel/build.gradle +++ b/viewmodel/build.gradle @@ -30,12 +30,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" } defaultConfig {