From 34164fdd3cc491648a22b5af01361697a4532106 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 10 Sep 2021 12:44:22 +0200 Subject: [PATCH] Updated build tools and libraries --- app/build.gradle | 7 ++----- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e54bb27b..112a6234 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { } } - ndkVersion "21.4.7075529" + //ndkVersion "21.4.7075529" ndk { // https://developer.android.com/ndk/guides/abis.html#sa abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' @@ -51,7 +51,6 @@ android { buildTypes { release { minifyEnabled = true - useProguard = true proguardFiles.add(file('proguard-rules.pro')) signingConfig signingConfigs.release buildConfigField "boolean", "PLAY_STORE_RELEASE", "false" @@ -60,7 +59,6 @@ android { } play { minifyEnabled = true - useProguard = true signingConfig signingConfigs.release proguardFiles.add(file('proguard-rules.pro')) buildConfigField "boolean", "PLAY_STORE_RELEASE", "true" @@ -69,7 +67,6 @@ android { } debug { minifyEnabled = true - useProguard = true proguardFiles.add(file('proguard-rules.pro')) buildConfigField "boolean", "PLAY_STORE_RELEASE", "false" buildConfigField "String", "HOSTS_FILE_URI", "\"https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts\"" @@ -87,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // https://developer.android.com/jetpack/androidx/releases/ - implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.preference:preference:1.1.1' diff --git a/build.gradle b/build.gradle index 34c7c653..5c4c8ec7 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { // http://tools.android.com/tech-docs/new-build-system/gradle-experimental // https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view // https://bintray.com/android/android-tools/com.google.gms.google-services/view - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d44ef938..0fd0725c 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-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip