Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade the used JDK in the project to v21 (#3582)

Browse source 
* Upgrade the used JDK in the project to v21

* Use it for CI too

* Centralise java language version

* Fix deprecations, tests and lint issues

* Fix coverage taking into account `@Preview` annotated code.

---------

Co-authored-by: Benoit Marty <benoit@matrix.org>
This commit is contained in:
Jorge Martin Espinosa 2024-10-03 11:38:03 +02:00 • committed by GitHub
parent 9f7e4d5022
commit f8fa218146
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 84 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/src/main/kotlin/Versions.kt
View file

@ -54,8 +54,11 @@ object Versions {
val versionName = "$versionMajor.$versionMinor.$versionPatch"
const val compileSdk = 34
const val targetSdk = 34
// When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
val minSdk = if (isEnterpriseBuild) 26 else 24
val javaCompileVersion = JavaVersion.VERSION_17
val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(11)
private const val JAVA_VERSION = 21
val javaVersion: JavaVersion = JavaVersion.toVersion(JAVA_VERSION)
val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(JAVA_VERSION)
}

5
plugins/src/main/kotlin/extension/CommonExtension.kt
View file

@ -11,7 +11,6 @@ import Versions
import com.android.build.api.dsl.CommonExtension
import isEnterpriseBuild
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import java.io.File
@ -28,8 +27,8 @@ fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = Versions.javaVersion
targetCompatibility = Versions.javaVersion
}
testOptions {

3
plugins/src/main/kotlin/extension/KoverExtension.kt
View file

@ -104,8 +104,7 @@ fun Project.setupKover() {
annotatedBy(
"androidx.compose.ui.tooling.preview.Preview",
"io.element.android.libraries.architecture.coverage.ExcludeFromCoverage",
"io.element.android.libraries.designsystem.preview.PreviewsDayNight",
"io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight",
"io.element.android.libraries.designsystem.preview.*",
)
}
}

6
plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
View file

@ -29,6 +29,12 @@ android {
}
}
kotlin {
jvmToolchain {
languageVersion = Versions.javaLanguageVersion
}
}
dependencies {
commonDependencies(libs)
composeDependencies(libs)

6
plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
View file

@ -29,6 +29,12 @@ android {
}
}
kotlin {
jvmToolchain {
languageVersion = Versions.javaLanguageVersion
}
}
dependencies {
commonDependencies(libs)
composeDependencies(libs)

6
plugins/src/main/kotlin/io.element.android-library.gradle.kts
View file

@ -26,6 +26,12 @@ android {
}
}
kotlin {
jvmToolchain {
languageVersion = Versions.javaLanguageVersion
}
}
dependencies {
commonDependencies(libs)
coreLibraryDesugaring(libs.android.desugar)