Update dependencies

This commit is contained in:
Teddysun 2021-02-26 21:53:53 +09:00
parent e56afcf52c
commit 0e6a39552c
No known key found for this signature in database
GPG key ID: 09BD4C080AD6C46D
3 changed files with 13 additions and 15 deletions

View file

@ -15,11 +15,9 @@ val currentFlavor get() = gradle.startParameter.taskRequests.toString().let { ta
} }
} }
val minSdk = 21
android { android {
val javaVersion = JavaVersion.VERSION_1_8 val javaVersion = JavaVersion.VERSION_1_8
compileSdkVersion(29) compileSdkVersion(30)
compileOptions { compileOptions {
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
@ -27,8 +25,8 @@ android {
kotlinOptions.jvmTarget = javaVersion.toString() kotlinOptions.jvmTarget = javaVersion.toString()
defaultConfig { defaultConfig {
applicationId = "com.github.shadowsocks.plugin.v2ray" applicationId = "com.github.shadowsocks.plugin.v2ray"
minSdkVersion(minSdk) minSdkVersion(23)
targetSdkVersion(29) targetSdkVersion(30)
versionCode = 1080000 versionCode = 1080000
versionName = "1.8.0" versionName = "1.8.0"
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
@ -56,7 +54,7 @@ tasks.register<Exec>("goBuild") {
println("Warning: Building on Windows is not supported") println("Warning: Building on Windows is not supported")
} else { } else {
executable("/bin/bash") executable("/bin/bash")
args("go-build.bash", minSdk) args("go-build.bash", 23)
environment("ANDROID_HOME", android.sdkDirectory) environment("ANDROID_HOME", android.sdkDirectory)
environment("ANDROID_NDK_HOME", android.ndkDirectory) environment("ANDROID_NDK_HOME", android.ndkDirectory)
} }
@ -71,11 +69,11 @@ tasks.whenTaskAdded {
dependencies { dependencies {
implementation(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString())) implementation(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString()))
implementation("androidx.preference:preference:1.1.1") 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") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
testImplementation("junit:junit:4.13") testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test:runner:1.2.0") androidTestImplementation("androidx.test:runner:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.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) val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4)

View file

@ -1,11 +1,11 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.github.ben-manes.versions") version "0.28.0" id("com.github.ben-manes.versions") version "0.36.0"
} }
buildscript { buildscript {
val kotlinVersion = "1.3.72" val kotlinVersion = "1.4.30"
extra.set("kotlinVersion", kotlinVersion) extra.set("kotlinVersion", kotlinVersion)
repositories { repositories {
@ -13,8 +13,8 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:4.0.0-rc01") classpath("com.android.tools.build:gradle:4.1.2")
classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
} }
} }

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists