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

Preferred toolchain use #1392

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Preferred toolchain use #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
199110e
Change to toolchain and remove `KotlinCompile`.
Jaehwa-Noh Apr 19, 2024
f46635f
Add plugins
Jaehwa-Noh Apr 19, 2024
e3fb617
Move lines.
Jaehwa-Noh Apr 19, 2024
f4dfdf1
Remove JavaVersion 11
Jaehwa-Noh Apr 23, 2024
1eedad1
Rename to configureToolChain, and set toolchain 11
Jaehwa-Noh Apr 23, 2024
2f4b76a
Change java to kotlin extension.
Jaehwa-Noh Apr 23, 2024
54d017c
Set toolchain 17
Jaehwa-Noh Apr 23, 2024
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
12 changes: 2 additions & 10 deletions build-logic/convention/build.gradle.kts
View file
Open in desktop
Expand Up @@ -14,8 +14,6 @@
* limitations under the License.
*/

import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`kotlin-dsl`
}
Expand All @@ -24,14 +22,8 @@ group = "com.google.samples.apps.nowinandroid.buildlogic"

// Configure the build-logic plugins to target JDK 17
// This matches the JDK used to build the project, and is not related to what is running on device.
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}
kotlin {
jvmToolchain(17)
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import com.google.samples.apps.nowinandroid.configureKotlinJvm
import com.google.samples.apps.nowinandroid.configureToolChain
import org.gradle.api.Plugin
import org.gradle.api.Project

Expand All @@ -25,7 +25,7 @@ class JvmLibraryConventionPlugin : Plugin<Project> {
apply("org.jetbrains.kotlin.jvm")
apply("nowinandroid.android.lint")
}
configureKotlinJvm()
configureToolChain()
}
}
}
23 changes: 8 additions & 15 deletions build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
View file
Open in desktop
Expand Up @@ -17,9 +17,9 @@
package com.google.samples.apps.nowinandroid

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.provideDelegate
Expand All @@ -40,30 +40,25 @@ internal fun Project.configureKotlinAndroid(
}

compileOptions {
// Up to Java 11 APIs are available through desugaring
// https://developer.android.com/studio/write/java11-minimal-support-table
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
isCoreLibraryDesugaringEnabled = true
}
}

configureKotlin()
configureToolChain()

dependencies {
add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
}
}

/**
* Configure base Kotlin options for JVM (non-Android)
* Configure Toolchain and [configureKotlin]
*/
internal fun Project.configureKotlinJvm() {
extensions.configure<JavaPluginExtension> {
// Up to Java 11 APIs are available through desugaring
// https://developer.android.com/studio/write/java11-minimal-support-table
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
internal fun Project.configureToolChain() {
configure<JavaPluginExtension> {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

configureKotlin()
Expand All @@ -76,8 +71,6 @@ private fun Project.configureKotlin() {
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
// Set JVM target to 11
jvmTarget = JavaVersion.VERSION_11.toString()
// Treat all Kotlin warnings as errors (disabled by default)
// Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
val warningsAsErrors: String? by project
Expand Down
13 changes: 2 additions & 11 deletions lint/build.gradle.kts
View file
Open in desktop
Expand Up @@ -14,25 +14,16 @@
* limitations under the License.
*/

import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`java-library`
kotlin("jvm")
alias(libs.plugins.nowinandroid.android.lint)
}

java {
kotlin {
// Up to Java 11 APIs are available through desugaring
// https://developer.android.com/studio/write/java11-minimal-support-table
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}
jvmToolchain(11)
}

dependencies {
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Expand Up @@ -23,6 +23,10 @@ pluginManagement {
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
Expand Down