From b68374a34b18ed0d98756faf2d69282d7ad4226e Mon Sep 17 00:00:00 2001 From: Maksim Karasev Date: Wed, 29 Jun 2022 20:11:03 +0300 Subject: [PATCH] Update dependencies and targetSdk --- app/build.gradle | 18 +++++++++--------- app/release/output-metadata.json | 20 ++++++++++++++++++++ app/src/main/AndroidManifest.xml | 3 ++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 app/release/output-metadata.json diff --git a/app/build.gradle b/app/build.gradle index 58c598b..bd6f0b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,17 +4,17 @@ plugins { } android { - compileSdk 30 + compileSdk 32 defaultConfig { applicationId "ru.karasevm.privatednstoggle" minSdk 21 - targetSdk 30 - versionCode 1 + targetSdk 32 + versionCode 2 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - targetSdkVersion 30 + targetSdkVersion 32 minSdkVersion 28 } buildFeatures { @@ -37,11 +37,11 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..45a0364 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "ru.karasevm.privatednstoggle", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 712035b..1701206 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:name=".DnsTileService" android:icon="@drawable/ic_auto_black_24dp" android:label="@string/tile_name" - android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> + android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" + android:exported="false"> diff --git a/build.gradle b/build.gradle index 2b4077b..62916c7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7dfaa76..8d1a8cf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Aug 16 15:36:35 MSK 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME