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

Revert 'com.android.library' support #105

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Revert 'com.android.library' support #105

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
2 changes: 2 additions & 0 deletions src/functionalTest/kotlin/kotlinx/validation/test/AndroidLibraryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ package kotlinx.validation.test

import kotlinx.validation.api.*
import org.junit.Assume
import org.junit.Ignore
import org.junit.Test
import java.io.File

@Ignore
internal class AndroidLibraryTest : BaseKotlinGradleTest() {

// region Kotlin Android Library
Expand Down
15 changes: 7 additions & 8 deletions src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,14 @@ class BinaryCompatibilityValidatorPlugin : Plugin<Project> {
project: Project,
extension: ApiValidationExtension
) {
val kotlinPluginPresent = project.plugins
.withType(KotlinAndroidPluginWrapper::class.java)
.isEmpty().not()
// val kotlinPluginPresent = project.pluginManager.hasPlugin("kotlin-android")
// if (kotlinPluginPresent) {
// configureAndroidPluginForKotlinLibrary(project, extension)
// } else {
// configureAndroidPluginForJavaLibrary(project, extension)
// }
configureAndroidPluginForKotlinLibrary(project, extension)

if (kotlinPluginPresent) {
configureAndroidPluginForKotlinLibrary(project, extension)
} else {
configureAndroidPluginForJavaLibrary(project, extension)
}
}

private fun configureAndroidPluginForKotlinLibrary(
Expand Down