diff --git a/README.md b/README.md index 739c28ff3f86..14d01811b5d8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- +Ankidroid Mobile Promo Banner

release @@ -41,14 +41,17 @@ Install
+ Get it on Google Play + Get it on F-Droid + Get it on Amazon app store diff --git a/build.gradle.kts b/build.gradle.kts index efa7082a586c..91aafd28d6f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,9 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.internal.jvm.Jvm import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.ByteArrayOutputStream +import java.util.Properties import kotlin.math.max +import kotlin.system.exitProcess // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { @@ -20,11 +22,11 @@ plugins { alias(libs.plugins.keeper) apply false } -val localProperties = java.util.Properties() +val localProperties = Properties() if (project.rootProject.file("local.properties").exists()) { localProperties.load(project.rootProject.file("local.properties").inputStream()) } -val fatalWarnings = !(localProperties["fatal_warnings"] == "false") +val fatalWarnings = localProperties["fatal_warnings"] != "false" // Here we extract per-module "best practices" settings to a single top-level evaluation subprojects { @@ -95,19 +97,30 @@ subprojects { val jvmVersion = Jvm.current().javaVersion?.majorVersion if (jvmVersion != "17" && jvmVersion != "21") { - println("\n\n\n") - println("**************************************************************************************************************") - println("\n\n\n") - println("ERROR: AnkiDroid builds with JVM version 17 or 21.") - println(" Incompatible major version detected: '" + jvmVersion + "'") - println("\n\n\n") - println(" If you receive this error because you want to use a newer JDK, we may accept PRs to support new versions.") - println(" Edit the main build.gradle file, find this message in the file, and add support for the new version.") - println(" Please make sure the `jacocoTestReport` target works on an emulator with our minSdkVersion (currently 23).") - println("\n\n\n") - println("**************************************************************************************************************") - println("\n\n\n") - System.exit(1) + println( + """ + + + + ***************************************************** + + + ERROR: AnkiDroid builds with JVM version 17 or 21. + Incompatible major version detected: '$jvmVersion' + + + If you receive this error because you want to use a newer JDK, we may accept PRs to support it. + Edit the main build.gradle file, find this message in the file, and add support for the newer version. + Please make sure the `jacocoTestReport` target works on an emulator with our minSdkVersion. + + + ***************************************************** + + + + """.trimIndent() + ) + exitProcess(1) } val ciBuild by extra(System.getenv("CI") == "true") // works for Travis CI or Github Actions