Skip to content

build: declare the Kotlin JVM toolchain explicitly #883

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

Merged
nickolas-dimitrakas merged 1 commit into from
Oct 7, 2026
Merged

build: declare the Kotlin JVM toolchain explicitly #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions android-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ android {
}
}

kotlin {
jvmToolchain(Integer.parseInt(JAVA_VERSION))
}

dependencies {
//noinspection GradleCompatible
compileOnly 'com.google.firebase:firebase-messaging:[10.2.1, )'
Expand Down
4 changes: 4 additions & 0 deletions android-kit-base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ android {
}
}

kotlin {
jvmToolchain(Integer.parseInt(JAVA_VERSION))
}

tasks.withType(Test).configureEach {
jvmArgs('--add-opens=java.base/java.lang=ALL-UNNAMED')
jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
Expand Down
7 changes: 4 additions & 3 deletions testutils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ android {
targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)
}

kotlinOptions {
jvmTarget = JAVA_VERSION
}
defaultConfig {
//This is set to 21 to avoid slow multidex.
minSdk 21
Expand Down Expand Up @@ -63,6 +60,10 @@ android {
}
}

kotlin {
jvmToolchain(Integer.parseInt(JAVA_VERSION))
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
compileOnly project(':android-core')
Expand Down
4 changes: 4 additions & 0 deletions tooling/android-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ apply plugin: 'mparticle.android.library.publish'
sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)
targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)

kotlin {
jvmToolchain(Integer.parseInt(JAVA_VERSION))
}

mparticleMavenPublish {
artifactId.set('android-plugin')
description.set('mParticle Gradle Plugin for managing Dataplanning functionality')
Expand Down
8 changes: 6 additions & 2 deletions tooling/custom-lint-rules/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ apply plugin: 'java-library'
apply plugin: 'kotlin'
apply plugin: 'com.android.lint'

sourceCompatibility = 17
targetCompatibility = 17
sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)
targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)

kotlin {
jvmToolchain(Integer.parseInt(JAVA_VERSION))
}

buildscript {
ext {
Expand Down
Loading