diff --git a/build.gradle.kts b/build.gradle.kts index f328fcb..3828635 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { plugins { id("com.gradle.plugin-publish") version "0.14.0" `kotlin-dsl` - kotlin("jvm") version "1.4.32" + kotlin("jvm") version "1.5.10" groovy id("io.gitlab.arturbosch.detekt") version "1.11.0" jacoco @@ -27,18 +27,19 @@ repositories { } dependencies { - compileOnly("com.android.tools.build:gradle:4.2.0") // Compile only to not force a specific AGP version + compileOnly("com.android.tools.build:gradle:7.0.0-beta03") // Compile only to not force a specific AGP version + compileOnly("com.android.tools:common:30.0.0-beta03") detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.0.0-RC12") - implementation("com.github.triplet.gradle:android-publisher:3.4.0-agp4.2") - implementation("com.github.triplet.gradle:play-publisher:3.4.0-agp4.2") + implementation("com.github.triplet.gradle:android-publisher:3.4.0-agp7.0") + implementation("com.github.triplet.gradle:play-publisher:3.4.0-agp7.0") implementation("com.google.apis:google-api-services-androidpublisher:v3-rev20200526-1.30.9") - implementation("com.google.firebase:firebase-appdistribution-gradle:2.0.1") + implementation("com.google.firebase:firebase-appdistribution-gradle:2.1.2") implementation("com.google.guava:guava:29.0-jre") - testImplementation("com.android.tools.build:gradle:4.1.0") - testImplementation( "org.mockito:mockito-inline:3.5.15") + testImplementation("com.android.tools.build:gradle:7.0.0-alpha14") + testImplementation( "org.mockito:mockito-inline:3.11.0") testImplementation("junit:junit:4.13.2") testImplementation("org.assertj:assertj-core:3.11.1") testImplementation("org.eclipse.jgit:org.eclipse.jgit:3.5.0.201409260305-r") @@ -51,7 +52,7 @@ jacoco { } group = "com.xmartlabs" -version = "2.3.0" +version = "2.4.0-SNAPSHOT" gradlePlugin { plugins { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..0f80bbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt b/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt index 062d092..ee3eff2 100644 --- a/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt +++ b/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt @@ -18,7 +18,7 @@ import java.io.File internal object PlayPublisherPluginHelper { private const val PLAY_EXTENSION_NAME = "play" private val MIN_GRADLE_VERSION = GradleVersion.version("6.5") - private val MIN_AGP_VERSION = VersionNumber.parse("4.2.0") + private val MIN_AGP_VERSION = VersionNumber.parse("7.0.0-beta01") private const val GENERATE_RESOURCES_TASK_NAME = "generate%sPlayResources" private const val PUBLISH_APK_TASK_NAME = "publish%sApk" diff --git a/src/main/kotlin/com/xmartlabs/snapshotpublisher/task/PrepareFirebaseAppDistributionReleaseTask.kt b/src/main/kotlin/com/xmartlabs/snapshotpublisher/task/PrepareFirebaseAppDistributionReleaseTask.kt index 53cd045..4ac651c 100644 --- a/src/main/kotlin/com/xmartlabs/snapshotpublisher/task/PrepareFirebaseAppDistributionReleaseTask.kt +++ b/src/main/kotlin/com/xmartlabs/snapshotpublisher/task/PrepareFirebaseAppDistributionReleaseTask.kt @@ -18,7 +18,7 @@ open class PrepareFirebaseAppDistributionReleaseTask : DefaultTask() { @TaskAction fun action() { val firebaseConfig = project.snapshotReleaseExtension.firebaseAppDistribution - with(releaseTask.appDistributionProperties) { + with(releaseTask.appDistributionProperties.get()) { appId = firebaseConfig.appId serviceCredentialsFile = project.file(requireNotNull(firebaseConfig.serviceAccountCredentials)).absolutePath testers = firebaseConfig.distributionEmails