Merge remote-tracking branch 'origin/develop' into native-mastodon-tr…

…anslation

.editorconfig

@@ -7,11 +7,13 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{java,kt}]
 # Disable wildcard imports
-[*.{java, kt}]
 ij_kotlin_name_count_to_use_star_import = 999
 ij_kotlin_name_count_to_use_star_import_for_members = 999
 ij_java_class_count_to_use_import_on_demand = 999
+# Enable trailing comma
+ktlint_disabled_rules=trailing-comma-on-call-site,trailing-comma-on-declaration-site
 
 [*.{yml,yaml}]
 indent_size = 2

CONTRIBUTING.md

@@ -22,8 +22,9 @@ We try to follow the [Guide to app architecture](https://developer.android.com/t
 
 ### Kotlin
 Tusky was originally written in Java, but is in the process of migrating to Kotlin. All new code must be written in Kotlin.
-We try to follow the [Kotlin Style Guide](https://developer.android.com/kotlin/style-guide) and make format the code according to the default [ktlint codestyle](https://github.com/pinterest/ktlint).
-You can check the codestyle by running `./gradlew ktlintCheck`.
+We try to follow the [Kotlin Style Guide](https://developer.android.com/kotlin/style-guide) and format the code according to the default [ktlint codestyle](https://github.com/pinterest/ktlint).
+You can check the codestyle by running `./gradlew ktlintCheck lint`. This will fail if you have any errors, and produces a detailed report which also lists warnings.
+We intentionally have very few hard linting errors, so that new contributors can focus on what they want to achieve instead of fighting the linter.
 
 ### Text
 All English text that will be visible to users must be put in `app/src/main/res/values/strings.xml` so it is translateable into other languages.

README.md

@@ -32,4 +32,4 @@ If you have any bug reports, feature requests or questions please open an issue
 We always welcome new contributors! Please read our [contribution guide](https://github.com/tuskyapp/Tusky/blob/develop/CONTRIBUTING.md) to get started.
 
 ### Development chatroom
-https://riot.im/app/#/room/#Tusky:matrix.org
+https://matrix.to/#/#Tusky:matrix.org

app/build.gradle

@@ -27,7 +27,7 @@ android {
     defaultConfig {
         applicationId APP_ID
         namespace "com.keylesspalace.tusky"
-        minSdk 23
+        minSdk 24
         targetSdk 33
         versionCode 113
         versionName "23.0"
@@ -99,12 +99,6 @@ android {
         includeInApk false
         includeInBundle false
     }
-    // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
-    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
             outputFileName = "Tusky_${variant.versionName}_${variant.versionCode}_${gitSha}_" +
@@ -189,7 +183,7 @@ dependencies {
 // Work around warnings of:
 // WARNING: Illegal reflective access by org.jetbrains.kotlin.kapt3.util.ModuleManipulationUtilsKt (file:/C:/Users/Andi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-annotation-processing-gradle/1.8.22/28dab7e0ee9ce62c03bf97de3543c911dc653700/kotlin-annotation-processing-gradle-1.8.22.jar) to constructor com.sun.tools.javac.util.Context()
 // See https://youtrack.jetbrains.com/issue/KT-30589/Kapt-An-illegal-reflective-access-operation-has-occurred
-tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask) {
+tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask).configureEach {
     kaptProcessJvmArgs.addAll([
         "--add-opens", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
         "--add-opens", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
@@ -202,18 +196,3 @@ tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask) {
         "--add-opens", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
         "--add-opens", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"])
 }
-
-tasks.register("newLintBaseline") {
-    description 'Deletes and then recreates the lint baseline'
-
-    // This task should always run, irrespective of caching
-    notCompatibleWithConfigurationCache("Is always out of date")
-    outputs.upToDateWhen { false }
-
-    doLast {
-        delete android.lint.baseline.path
-    }
-
-    // Regenerate the lint baseline
-    it.finalizedBy tasks.named("lintBlueDebug")
-}