875013e47f
Merge tag 'v25.2' into develop
...
# Conflicts:
# README.md
# app/build.gradle
# app/lint-baseline.xml
# app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
# app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt
# app/src/main/res/layout/activity_about.xml
# app/src/main/res/layout/item_emoji_pref.xml
# app/src/main/res/values-ar/strings.xml
# app/src/main/res/values-bg/strings.xml
# app/src/main/res/values-cy/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-gd/strings.xml
# app/src/main/res/values-gl/strings.xml
# app/src/main/res/values-hu/strings.xml
# app/src/main/res/values-is/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-ja/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values-oc/strings.xml
# app/src/main/res/values-pt-rBR/strings.xml
# app/src/main/res/values-pt-rPT/strings.xml
# app/src/main/res/values-ru/strings.xml
# app/src/main/res/values-si/strings.xml
# app/src/main/res/values-sv/strings.xml
# app/src/main/res/values-tr/strings.xml
# app/src/main/res/values-uk/strings.xml
# app/src/main/res/values-vi/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values/strings.xml
# fastlane/metadata/android/ru/full_description.txt
# fastlane/metadata/android/zh-Hans/full_description.txt
2026-01-02 18:27:41 +11:00
Nik Clayton
ca9b171868
Disable wildcard imports for Java and Kotlin files
...
Out-of-the-box Android Studio will perform wildcard imports if the import list is >= 3. This is a lint failure.
Adjust the default to 999 so that, in practice, wildcard imports never happen.
2023-04-10 14:26:10 +02:00
Goooler
3592318dc1
Modernize a bit ( #3171 )
...
* Remove redundant ignore file
* Add .gitattributes
* Generate new wrapper
* Apply plugins in `plugins`
* Adopt new dsl
* Enable stable config cache
* Ignore all build folders
* Enable build scan
* Disable buildFeatures flags by default
* Migrate to nonTransitive R class
* Tweak flags
* Bump AGP to 7.4.0
* Bump deps
* Run `ktlintFormat`
* Add an icon for IDEA to display
* Revert "Bump deps"
This reverts commit bc0d5b69d59f70289d5d5c4887a85e6af23cc662.
* Revert "Enable build scan"
This reverts commit 1568e5e84f1ee51064b3f426b1da0cf35fb67856.
* Remove com.android.library
* Enable Gradle cache
* Enable room incremental build
* Cleanups
* Cleanups
* Add .editorconfig
* Defer clean task
* Migrate `flavorDimensions`
* Merge instance-build.gradle into app's build.gradle
* Declare compileOptions & kotlinOptions
* Bump jvmTarget to 17
* Fix conflicts
* Xmx4g
* Rename output apks
* Revert "Bump jvmTarget to 17"
This reverts commit e4d1543bda65b6d2979ae0712bceee33fa8298a6.
2023-02-04 19:58:53 +01:00
