From 0e6a39552c8ffaf6f8495b22afced176792d1950 Mon Sep 17 00:00:00 2001 From: Teddysun Date: Fri, 26 Feb 2021 21:53:53 +0900 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 18 ++++++++---------- build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6ee3b2a..f47ebc8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,11 +15,9 @@ val currentFlavor get() = gradle.startParameter.taskRequests.toString().let { ta } } -val minSdk = 21 - android { val javaVersion = JavaVersion.VERSION_1_8 - compileSdkVersion(29) + compileSdkVersion(30) compileOptions { sourceCompatibility = javaVersion targetCompatibility = javaVersion @@ -27,8 +25,8 @@ android { kotlinOptions.jvmTarget = javaVersion.toString() defaultConfig { applicationId = "com.github.shadowsocks.plugin.v2ray" - minSdkVersion(minSdk) - targetSdkVersion(29) + minSdkVersion(23) + targetSdkVersion(30) versionCode = 1080000 versionName = "1.8.0" testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" @@ -56,7 +54,7 @@ tasks.register("goBuild") { println("Warning: Building on Windows is not supported") } else { executable("/bin/bash") - args("go-build.bash", minSdk) + args("go-build.bash", 23) environment("ANDROID_HOME", android.sdkDirectory) environment("ANDROID_NDK_HOME", android.ndkDirectory) } @@ -71,11 +69,11 @@ tasks.whenTaskAdded { dependencies { implementation(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString())) implementation("androidx.preference:preference:1.1.1") - implementation("com.github.shadowsocks:plugin:1.3.4") + implementation("com.github.shadowsocks:plugin:2.0.0") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") - testImplementation("junit:junit:4.13") - androidTestImplementation("androidx.test:runner:1.2.0") - androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test:runner:1.3.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") } val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4) diff --git a/build.gradle.kts b/build.gradle.kts index 8e0bec1..551667d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.github.ben-manes.versions") version "0.28.0" + id("com.github.ben-manes.versions") version "0.36.0" } buildscript { - val kotlinVersion = "1.3.72" + val kotlinVersion = "1.4.30" extra.set("kotlinVersion", kotlinVersion) repositories { @@ -13,8 +13,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.0.0-rc01") - classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") + classpath("com.android.tools.build:gradle:4.1.2") + classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb8b2fc..2a56324 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-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists