Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standardise JVM target to be 1.8 #900

Merged
merged 5 commits into from Aug 25, 2022
Merged

Standardise JVM target to be 1.8 #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f13d6dd
standardise the jvm target to 1.8
aSemy Aug 24, 2022
b1783cf
rm unused versionName helper
aSemy Aug 24, 2022
9fc5cb4
formatting
aSemy Aug 25, 2022
5a9887a
add jdk8 to ci matrix #902
aSemy Aug 25, 2022
7d48dad
rm 1.8 from test matrix - Android requires jdk11
aSemy Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions buildSrc/src/main/kotlin/buildsrc/config/Deps.kt
View file
Open in desktop
@@ -1,11 +1,14 @@
package buildsrc.config

import org.gradle.api.JavaVersion
import org.gradle.api.Project

fun Project.kotlinVersion() = findProperty("kotlin.version")?.toString() ?: Deps.Versions.kotlinDefault

object Deps {
object Versions {
val jvmTarget = JavaVersion.VERSION_1_8

const val androidTools = "7.2.1"
const val dokka = "1.7.10"
const val kotlinDefault = "1.7.10"
Expand Down
7 changes: 4 additions & 3 deletions buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts
View file
Open in desktop
@@ -1,5 +1,6 @@
package buildsrc.convention

import buildsrc.config.Deps
import org.gradle.jvm.tasks.Jar

plugins {
Expand All @@ -18,7 +19,7 @@ android {
compileSdkVersion = "android-32"

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = Deps.Versions.jvmTarget.toString()
}

lint {
Expand All @@ -39,8 +40,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = Deps.Versions.jvmTarget
targetCompatibility = Deps.Versions.jvmTarget
}
}

Expand Down
8 changes: 5 additions & 3 deletions buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts
View file
Open in desktop
@@ -1,5 +1,7 @@
package buildsrc.convention

import buildsrc.config.Deps

plugins {
id("com.android.library")

Expand All @@ -16,7 +18,7 @@ android {
compileSdkVersion = "android-32"

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = Deps.Versions.jvmTarget.toString()
}

lint {
Expand All @@ -37,8 +39,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = Deps.Versions.jvmTarget
targetCompatibility = Deps.Versions.jvmTarget
}
}

Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts
View file
Open in desktop
@@ -1,5 +1,6 @@
package buildsrc.convention

import buildsrc.config.Deps
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -25,6 +26,7 @@ tasks.withType<JavaCompile>().configureEach {
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.apply {
freeCompilerArgs += listOf("-Xjsr305=strict")
jvmTarget = Deps.Versions.jvmTarget.toString()
apiVersion = "1.5"
languageVersion = "1.7"
}
Expand Down
6 changes: 6 additions & 0 deletions buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts
View file
Open in desktop
@@ -1,5 +1,6 @@
package buildsrc.convention

import buildsrc.config.Deps
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget

plugins {
Expand All @@ -21,6 +22,11 @@ kotlin {
}
}
targets.withType<KotlinJvmTarget>().configureEach {
compilations.configureEach {
kotlinOptions {
jvmTarget = Deps.Versions.jvmTarget.toString()
}
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down