Skip to content

Commit 67921b7

Browse files
committed
fix 2.15.6 build to run for my setup
1 parent 58c5bd1 commit 67921b7

File tree

5 files changed

+157
-127
lines changed

5 files changed

+157
-127
lines changed

AnkiDroid/build.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
plugins {
2-
// Gradle plugin portal
3-
id 'com.github.triplet.play' version '3.4.0-agp4.2'
4-
}
5-
61
apply plugin: 'com.android.application'
72
apply plugin: 'app.brant.amazonappstorepublisher'
83
apply plugin: 'idea'
@@ -27,7 +22,7 @@ android {
2722
compileSdkVersion 29 // change .travis.yml build tools at same time
2823

2924
defaultConfig {
30-
applicationId "com.ichi2.anki"
25+
applicationId "com.ichi2.anki.debug"
3126

3227
// The version number is of the form:
3328
// <major>.<minor>.<maintenance>[dev|alpha<build>|beta<build>|]
@@ -201,10 +196,6 @@ android {
201196
ndkVersion "22.0.7026061"
202197
}
203198

204-
play {
205-
serviceAccountCredentials.set(file("${homePath}/src/AnkiDroid-GCP-Publish-Credentials.json"))
206-
track.set('beta')
207-
}
208199
amazon {
209200
securityProfile = file("${homePath}/src/AnkiDroid-Amazon-Publish-Security-Profile.json")
210201
applicationId = "amzn1.devportal.mobileapp.524a424d314931494c55383833305539"

build.gradle

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:4.2.0'
13+
classpath 'com.android.tools.build:gradle:7.0.0'
1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files
1616
classpath "app.brant:amazonappstorepublisher:0.1.0"
@@ -20,17 +20,7 @@ buildscript {
2020
ext {
2121

2222
jvmVersion = Jvm.current().javaVersion.majorVersion
23-
if (jvmVersion != "8" && jvmVersion != "11" && jvmVersion != "14") {
24-
println "\n\n\n"
25-
println "**************************************************************************************************************"
26-
println "\n\n\n"
27-
println "ERROR: AnkiDroid builds with JVM LTS and current releases (currently major version 8, 11, or 14)."
28-
println " Incompatible major version detected: '" + jvmVersion + "'"
29-
println "\n\n\n"
30-
println "**************************************************************************************************************"
31-
println "\n\n\n"
32-
System.exit(1)
33-
}
23+
3424
ciBuild = System.getenv("CI") == "true" // works for Travis CI or Github Actions
3525
// allows for -Dpre-dex=false to be set
3626
preDexEnabled = "true" == System.getProperty("pre-dex", "true")

gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
3+
distributionUrl = https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 153 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)