From d019c5999bf5dcc15278db5d43949514274c2c87 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 28 Jul 2021 15:08:04 -0400 Subject: [PATCH] Update for AS Arctic Fox --- README.md | 11 +++++------ app/build.gradle.kts | 10 +++++----- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f432cdece..ddc525e80 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ | Build | Stable | Weekly Preview | Contribute | Support Server | |-------|----------|---------|------------|---------| -| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) | +| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest preview build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) | # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi @@ -11,10 +11,10 @@ Tachiyomi is a free and open source manga reader for Android 6.0 and above. ## Features Features include: -* Online reading from [a variety of sources](https://github.com/tachiyomiorg/tachiyomi-extensions) -* Local reading of downloaded manga +* Online reading from a variety of sources +* Local reading of downloaded content * A configurable reader with multiple viewers, reading directions and other settings. -* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support +* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) * Categories to organize your library * Light and dark themes * Schedule updating your library for new chapters @@ -23,7 +23,7 @@ Features include: ## Download Get the app from our [releases page](https://github.com/tachiyomiorg/tachiyomi/releases). -If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/android-app-preview/releases). +If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/tachiyomi-preview/releases). ## Issues, Feature Requests and Contributing @@ -44,7 +44,6 @@ Please make sure to read the full guidelines. Your issue may be closed without w * Include steps to reproduce (if not obvious from description) * Include screenshot (if needed) * If it could be device-dependent, try reproducing on another device (if possible) -* For large logs use http://pastebin.com/ (or similar) * Don't group unrelated requests into one issue DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 169fe9aec..88e3eaa87 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,13 +21,13 @@ shortcutHelper.setFilePath("./shortcuts.xml") val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86") android { - compileSdkVersion(AndroidConfig.compileSdk) + compileSdk = AndroidConfig.compileSdk ndkVersion = AndroidConfig.ndk defaultConfig { applicationId = "eu.kanade.tachiyomi" - minSdkVersion(AndroidConfig.minSdk) - targetSdkVersion(AndroidConfig.targetSdk) + minSdk = AndroidConfig.minSdk + targetSdk = AndroidConfig.targetSdk testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" versionCode = 65 versionName = "0.11.1" @@ -109,7 +109,7 @@ android { viewBinding = true } - lintOptions { + lint { disable("MissingTranslation", "ExtraTranslation") isAbortOnError = false isCheckReleaseBuilds = false @@ -142,7 +142,7 @@ dependencies { implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03") implementation("androidx.browser:browser:1.3.0") implementation("androidx.cardview:cardview:1.0.0") - implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta02") + implementation("androidx.constraintlayout:constraintlayout:2.1.0-rc01") implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0") implementation("androidx.core:core-ktx:1.7.0-alpha01") implementation("androidx.core:core-splashscreen:1.0.0-alpha01") diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 83888d283..f24061f71 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,5 +1,5 @@ object BuildPluginsVersion { - const val AGP = "4.2.2" + const val AGP = "7.0.0" const val KOTLIN = "1.5.21" const val KOTLINTER = "3.4.5" const val VERSIONS_PLUGIN = "0.39.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643ee..69a971507 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists