Skip to content

Commit

Permalink
Remove "app.brant.amazonappstorepublisher" plugin
Browse files Browse the repository at this point in the history
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 #14161
  • Loading branch information
lukstbit authored and mikehardy committed Jul 19, 2024
1 parent 336736f commit 8c352ec
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 34 deletions.
8 changes: 0 additions & 8 deletions AnkiDroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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')
Expand Down
14 changes: 0 additions & 14 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" }

Expand Down
9 changes: 0 additions & 9 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
}

Expand Down

0 comments on commit 8c352ec

Please sign in to comment.