third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-24 04:40:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flamingo' into 'develop'

Browse Source 
Sets compileJava target to 17 to work with Flamingo

See merge request
This commit is contained in:
birdbird 2023-04-20 06:37:03 +00:00
commit 76eb89f5eb
5 changed files with 9 additions and 9 deletions

2
.idea/compiler.xml generated

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="17" />
</component>
</project>

4
build.gradle

@ -40,7 +40,7 @@ allprojects {
// Set Kotlin JVM target to the same for all subprojects
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}
}
@ -48,4 +48,4 @@ allprojects {
wrapper {
gradleVersion(libs.versions.gradle.get())
distributionType("all")
}
}

4
gradle_scripts/android-module-bootstrap.gradle

@ -16,8 +16,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
sourceSets {

2
gradle_scripts/code_quality.gradle

@ -29,6 +29,6 @@ if (isCodeQualityEnabled) {
config = files("${rootProject.projectDir}/detekt-config.yml")
}
}
tasks.detekt.jvmTarget = "11"
tasks.detekt.jvmTarget = "17"
}
}

6
ultrasonic/build.gradle

@ -50,7 +50,7 @@ android {
}
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
buildFeatures {
@ -59,8 +59,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kapt {