diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4861b09b..3194eb83 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,16 +10,18 @@ plugins { } android { - compileSdkVersion(30) + compileSdk = 31 defaultConfig { applicationId = "com.vanced.manager" - minSdkVersion(21) - targetSdkVersion(30) + minSdk = 21 + targetSdk = 31 versionCode = 260 versionName = "2.6.0 (Crimson)" - vectorDrawables.useSupportLibrary = true + vectorDrawables { + useSupportLibrary = true + } buildConfigField("String[]", "MANAGER_LANGUAGES", "{$languages}") buildConfigField("Boolean", "ENABLE_CROWDIN_AUTH", "false") @@ -28,7 +30,7 @@ android { buildConfigField("String", "CROWDIN_CLIENT_SECRET", "\"${System.getenv("CROWDIN_CLIENT_SECRET")}\"") } - lintOptions { + lint { disable("MissingTranslation", "ExtraTranslation") } @@ -99,11 +101,11 @@ dependencies { implementation(kotlin("reflect")) // AndroidX - implementation("androidx.appcompat:appcompat:1.2.0") + implementation("androidx.appcompat:appcompat:1.3.1") implementation("androidx.browser:browser:1.3.0") - implementation("androidx.constraintlayout:constraintlayout:2.0.4") - implementation("androidx.core:core-ktx:1.3.2") - implementation("androidx.fragment:fragment-ktx:1.3.3") + implementation("androidx.constraintlayout:constraintlayout:2.1.1") + implementation("androidx.core:core-ktx:1.6.0") + implementation("androidx.fragment:fragment-ktx:1.3.6") implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1") implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.0.0") @@ -125,7 +127,7 @@ dependencies { // Appearance implementation("com.github.madrapps:pikolo:2.0.1") - implementation("com.google.android.material:material:1.3.0") + implementation("com.google.android.material:material:1.4.0") // JSON parser implementation("com.beust:klaxon:5.5") @@ -148,8 +150,8 @@ dependencies { implementation("com.google.android:flexbox:2.0.1") // Firebase - implementation("com.google.firebase:firebase-analytics-ktx:18.0.3") - implementation("com.google.firebase:firebase-crashlytics:17.4.1") - implementation("com.google.firebase:firebase-messaging:21.1.0") - implementation("com.google.firebase:firebase-perf:19.1.1") + implementation("com.google.firebase:firebase-analytics-ktx:19.0.2") + implementation("com.google.firebase:firebase-crashlytics:18.2.3") + implementation("com.google.firebase:firebase-messaging:22.0.0") + implementation("com.google.firebase:firebase-perf:20.0.3") } diff --git a/build.gradle.kts b/build.gradle.kts index 3b8338f3..d68f74e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - val kotlinVersion by extra("1.4.32") + val kotlinVersion by extra("1.5.30") repositories { google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.1.3") + classpath("com.android.tools.build:gradle:7.0.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") - classpath("com.google.gms:google-services:4.3.5") - classpath("com.google.firebase:perf-plugin:1.3.5") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2") - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5") + classpath("com.google.gms:google-services:4.3.10") + classpath("com.google.firebase:perf-plugin:1.4.0") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha10") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle.kts files diff --git a/core-presentation/build.gradle.kts b/core-presentation/build.gradle.kts index 85d1b3ca..bdf11e7b 100644 --- a/core-presentation/build.gradle.kts +++ b/core-presentation/build.gradle.kts @@ -9,8 +9,6 @@ android { defaultConfig { minSdkVersion(16) targetSdkVersion(30) - versionCode = 1 - versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts index 641084e1..3ec55480 100644 --- a/core-ui/build.gradle.kts +++ b/core-ui/build.gradle.kts @@ -9,8 +9,6 @@ android { defaultConfig { minSdkVersion(16) targetSdkVersion(30) - versionCode = 1 - versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/feature-home/build.gradle.kts b/feature-home/build.gradle.kts index af97f019..a31ec77f 100644 --- a/feature-home/build.gradle.kts +++ b/feature-home/build.gradle.kts @@ -9,10 +9,8 @@ android { defaultConfig { minSdkVersion(16) targetSdkVersion(30) - versionCode = 1 - versionName = "1.0" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6667917b..bfe8cf5d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/library-network/build.gradle.kts b/library-network/build.gradle.kts index 1c4c3b14..ffa9eaa2 100644 --- a/library-network/build.gradle.kts +++ b/library-network/build.gradle.kts @@ -9,8 +9,6 @@ android { defaultConfig { minSdkVersion(16) targetSdkVersion(30) - versionCode = 1 - versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro")