@@ -5,7 +5,6 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
55import com.android.build.api.variant.ApplicationVariant
66import com.android.build.api.variant.VariantOutputConfiguration
77import com.android.build.gradle.AppPlugin
8- import com.android.ide.common.repository.GradleVersion
98import io.github.reactivecircus.appversioning.tasks.GenerateAppVersionInfo
109import io.github.reactivecircus.appversioning.tasks.PrintAppVersionInfo
1110import org.gradle.api.Plugin
@@ -15,19 +14,21 @@ import org.gradle.kotlin.dsl.getByType
1514import org.gradle.kotlin.dsl.withType
1615import org.gradle.language.nativeplatform.internal.BuildType
1716import java.io.File
17+ import java.lang.module.ModuleDescriptor.Version
1818import 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 */
2323class 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