Skip to content

Commit bf28359

Browse files
committed
Remove dependency from sdk-common.
1 parent b9e5d8d commit bf28359

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object versions {
66
const val agp = "7.3.1"
77
const val agpCommon = "30.3.1"
88
const val detekt = "1.21.0"
9-
const val junit = "4.13.1"
9+
const val junit = "4.13.2"
1010
const val truth = "1.1.3"
1111
}
1212

@@ -113,7 +113,6 @@ val fixtureAgpVersion = providers
113113
dependencies {
114114
compileOnly("com.android.tools.build:gradle:${versions.agp}")
115115
compileOnly("com.android.tools:common:${versions.agpCommon}")
116-
compileOnly("com.android.tools:sdk-common:${versions.agpCommon}")
117116
testImplementation("junit:junit:${versions.junit}")
118117
testImplementation("com.google.truth:truth:${versions.truth}")
119118
functionalTestImplementation("com.android.tools.build:gradle:${fixtureAgpVersion}")

src/main/kotlin/io/github/reactivecircus/appversioning/AppVersioningPlugin.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
55
import com.android.build.api.variant.ApplicationVariant
66
import com.android.build.api.variant.VariantOutputConfiguration
77
import com.android.build.gradle.AppPlugin
8-
import com.android.ide.common.repository.GradleVersion
98
import io.github.reactivecircus.appversioning.tasks.GenerateAppVersionInfo
109
import io.github.reactivecircus.appversioning.tasks.PrintAppVersionInfo
1110
import org.gradle.api.Plugin
@@ -15,19 +14,21 @@ import org.gradle.kotlin.dsl.getByType
1514
import org.gradle.kotlin.dsl.withType
1615
import org.gradle.language.nativeplatform.internal.BuildType
1716
import java.io.File
17+
import java.lang.module.ModuleDescriptor.Version
1818
import java.util.concurrent.atomic.AtomicBoolean
1919

2020
/**
2121
* A plugin that generates and sets the version code and version name for an Android app using the latest git tag.
2222
*/
2323
class AppVersioningPlugin : Plugin<Project> {
24+
2425
override fun apply(project: Project) {
25-
val gradleVersion = GradleVersion.parse(project.gradle.gradleVersion)
26-
check(gradleVersion >= GradleVersion.parse(MIN_GRADLE_VERSION)) {
26+
val gradleVersion = Version.parse(project.gradle.gradleVersion)
27+
check(gradleVersion >= Version.parse(MIN_GRADLE_VERSION)) {
2728
"Android App Versioning Gradle Plugin requires Gradle $MIN_GRADLE_VERSION or later. Detected Gradle version is $gradleVersion."
2829
}
29-
val agpVersion = GradleVersion.parseAndroidGradlePluginVersion(ANDROID_GRADLE_PLUGIN_VERSION)
30-
check(agpVersion >= GradleVersion.parseAndroidGradlePluginVersion(MIN_AGP_VERSION)) {
30+
val agpVersion = Version.parse(ANDROID_GRADLE_PLUGIN_VERSION)
31+
check(agpVersion >= Version.parse(MIN_AGP_VERSION)) {
3132
"Android App Versioning Gradle Plugin requires Android Gradle Plugin $MIN_AGP_VERSION or later. Detected AGP version is $agpVersion."
3233
}
3334
val androidAppPluginApplied = AtomicBoolean(false)

0 commit comments

Comments
 (0)