From 46d33b0cfb69f541ca6a816cef70ea86391ebb25 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 28 Jul 2021 15:08:04 -0400
Subject: [PATCH] Update for AS Arctic Fox

(cherry picked from commit d019c5999bf5dcc15278db5d43949514274c2c87)

# Conflicts:
#	README.md
#	app/build.gradle.kts
---
 README.md                                |  7 +++----
 app/build.gradle.kts                     | 18 +++++++++---------
 buildSrc/src/main/kotlin/Dependencies.kt |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 75160c09e..bfc4c4be9 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@ Tachiyomi is a free and open source manga reader for Android 6.0 and above. This
 ## Features
 
 Features of Tachiyomi(original) 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
@@ -90,7 +90,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 93ad85a4b..e1f5acb55 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,13 +25,13 @@ if (!gradle.startParameter.taskRequests.toString().contains("Debug")) {
 shortcutHelper.setFilePath("./shortcuts.xml")
 
 android {
-    compileSdkVersion(AndroidConfig.compileSdk)
+    compileSdk = AndroidConfig.compileSdk
     ndkVersion = AndroidConfig.ndk
 
     defaultConfig {
         applicationId = "eu.kanade.tachiyomi.sy"
-        minSdkVersion(AndroidConfig.minSdk)
-        targetSdkVersion(AndroidConfig.targetSdk)
+        minSdk = AndroidConfig.minSdk
+        targetSdk = AndroidConfig.targetSdk
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         versionCode = 21
         versionName = "1.7.0"
@@ -46,10 +46,6 @@ android {
         }
     }
 
-    buildFeatures {
-        viewBinding = true
-    }
-
     buildTypes {
         named("debug") {
             versionNameSuffix = "-${getCommitCount()}"
@@ -100,7 +96,11 @@ android {
         includeInApk = false
     }
 
-    lintOptions {
+    buildFeatures {
+        viewBinding = true
+    }
+
+    lint {
         disable("MissingTranslation", "ExtraTranslation")
         isAbortOnError = false
         isCheckReleaseBuilds = false
@@ -133,7 +133,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 100755
--- 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