From 8c352ec3de068ef8c42dfd343408afae234b9812 Mon Sep 17 00:00:00 2001 From: lukstbit <52494258+lukstbit@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:18:46 +0300 Subject: [PATCH] Remove "app.brant.amazonappstorepublisher" plugin The plugin hasn't been updated for quite some time and it currently breaks the build and apk publishing. This PR removes it along its configuration and any additional setup code. The plugin was already removed from the publishing process as it didn't work anymore. See https://github.com/ankidroid/Anki-Android/issues/14161 --- AnkiDroid/build.gradle | 8 -------- build.gradle.kts | 14 -------------- gradle/libs.versions.toml | 3 --- settings.gradle.kts | 9 --------- 4 files changed, 34 deletions(-) diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle index f1ff6eaa9c..631685de46 100644 --- a/AnkiDroid/build.gradle +++ b/AnkiDroid/build.gradle @@ -2,7 +2,6 @@ plugins { // Gradle plugin portal alias(libs.plugins.tripletPlay) alias(libs.plugins.android.application) - alias(libs.plugins.amazonappstorepublisher) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) @@ -269,13 +268,6 @@ play { track.set('alpha') } -amazon { - securityProfile = file("${homePath}/src/AnkiDroid-Amazon-Publish-Security-Profile.json") - applicationId = "amzn1.devportal.mobileapp.524a424d314931494c55383833305539" - pathToApks = [ file("./build/outputs/apk/amazon/release/AnkiDroid-amazon-universal-release.apk") ] - replaceEdit = true -} - // Install Git pre-commit hook for Ktlint tasks.register('installGitHook', Copy) { from new File(rootProject.rootDir, 'pre-commit') diff --git a/build.gradle.kts b/build.gradle.kts index aac49d2ddb..59a5d76150 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,20 +8,6 @@ import java.io.ByteArrayOutputStream import kotlin.math.max // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - configurations.configureEach { - resolutionStrategy.eachDependency { - val version = requested.version - if (requested.group == "org.jetbrains.kotlinx" - && requested.name.contains("kotlinx-serialization-runtime") - && (version != null && version.contains("0.11.0")) - ) { - useVersion("0.14.0") - } - } - } -} - plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6c04dd0857..38c3af7a1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,6 @@ compileSdk = "34" minSdk = "23" # also in testlib/build.gradle.kts targetSdk = "34" # also in ../robolectricDownloader.gradle acra = '5.11.3' -amazonappstorepublisher = "0.1.0" androidGradlePlugin = "8.5.1" androidxActivity = "1.9.0" androidxAnnotation = "1.8.0" @@ -162,8 +161,6 @@ cashapp-turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } -amazonappstorepublisher = { id = "app.brant.amazonappstorepublisher", version.ref = "amazonappstorepublisher" } - tripletPlay = { id = "com.github.triplet.play", version.ref = "triplet" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 082d401dba..2f64680e40 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,15 +3,6 @@ pluginManagement { google() gradlePluginPortal() mavenCentral() - maven(url = "https://jitpack.io") // only needed for the "amazonappstorepublisher" plugin - } - resolutionStrategy { - // TODO try to find another plugin for this functionality? - eachPlugin { - if (requested.id.id == "app.brant.amazonappstorepublisher") { - useModule("com.github.BrantApps.gradle-amazon-app-store-publisher:amazonappstorepublisher:master-SNAPSHOT") - } - } } }