Skip to content

chore(all): Fix building in Android Studio Ladybug #204

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
merged 1 commit into from
Dec 3, 2024
Merged

chore(all): Fix building in Android Studio Ladybug #204

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 build-logic/plugins/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ ktlint {
android.set(true)
}

kotlin {
jvmToolchain(17)
}

dependencies {
compileOnly(libs.plugin.android.gradle)
compileOnly(libs.plugin.binary.compatibility)
Expand Down
14 changes: 4 additions & 10 deletions build-logic/plugins/src/main/kotlin/AndroidLibraryConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

/**
Expand Down Expand Up @@ -57,10 +58,8 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
maxHeapSize = "4g"
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}
configure<KotlinProjectExtension> {
jvmToolchain(17)
}
}
}
Expand Down Expand Up @@ -105,16 +104,11 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
disable += listOf("GradleDependency", "NewerVersionAvailable", "AndroidGradlePluginVersion")
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

// Needed when running integration tests. The oauth2 library uses relies on two
// dependencies (Apache's httpcore and httpclient), both of which include
// META-INF/DEPENDENCIES. Tried a couple other options to no avail.
packaging {
resources.excludes.add("META-INF/DEPENDENCIES")
resources.excludes += setOf("META-INF/DEPENDENCIES", "META-INF/LICENSE*")
}

buildFeatures {
Expand Down
Loading