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

Update AGP to version 8.2.1 or newer #2680

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update AGP to version 8.2.1 or newer #2680

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
12 changes: 0 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,10 @@ ext.rustTargets += ext.nativeRustTarget
subprojects {
apply plugin: 'maven-publish'


// Kotlin settings applicable to all modules.
afterEvaluate {
if (it.hasProperty('android')) {
android {
// This shouldn't be needed anymore with AGP 8.1.0+
// https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
compileOptions {
sourceCompatibility rootProject.ext.build.jvmTargetCompatibility
targetCompatibility rootProject.ext.build.jvmTargetCompatibility
}
}
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions.allWarningsAsErrors = true
kotlin.jvmToolchain(rootProject.ext.build.jvmTargetCompatibility)
}
}

Expand Down
5 changes: 5 additions & 0 deletions glean-core/android-native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
import groovy.json.JsonOutput

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'org.mozilla.rust-android-gradle.rust-android'

kotlin {
jvmToolchain(rootProject.ext.build.jvmTargetCompatibility)
}

android {
namespace "mozilla.telemetry.glean_native"

Expand Down
4 changes: 4 additions & 0 deletions glean-core/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ File GLEAN_PING_SCHEMA_PATH = file("$rootDir/glean.1.schema.json")
ext.allowGleanInternal = true
ext.gleanNamespace = "mozilla.telemetry.glean"

kotlin {
jvmToolchain(rootProject.ext.build.jvmTargetCompatibility)
}

android {
compileSdkVersion rootProject.ext.build.compileSdkVersion
namespace "mozilla.telemetry.glean"
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ libLicense=MPL-2.0
libLicenseUrl=https://www.mozilla.org/en-US/MPL/2.0/

android.useAndroidX=true
android.experimental.lint.version=8.3.0
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[versions]
# AGP
android-plugin = "8.0.2"
android-plugin = "8.6.0"

# Kotlin
kotlin-compiler = "1.9.24"
Expand Down
4 changes: 4 additions & 0 deletions samples/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlinx-serialization'

kotlin {
jvmToolchain(rootProject.ext.build.jvmTargetCompatibility)
}

android {
namespace "org.mozilla.samples.gleancore"
compileSdkVersion rootProject.ext.build.compileSdkVersion
Expand Down
Loading